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
diff --git a/qpid/cpp/.gitignore b/qpid/cpp/.gitignore
deleted file mode 100644
index 63a3f41..0000000
--- a/qpid/cpp/.gitignore
+++ /dev/null
@@ -1,19 +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.
-#
-
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake
deleted file mode 100644
index afef898..0000000
--- a/qpid/cpp/BuildInstallSettings.cmake
+++ /dev/null
@@ -1,189 +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.
-#
-
-# Settings related to the Qpid build and install CMake/CTest/CPack procedure.
-# These are used by both the C++ and WCF components.
-
-# When doing installs, there are a number of components that the item can
-# be associated with. Since there may be different sets of components desired
-# for the various platforms, the component names are defined here. When
-# setting the COMPONENT in an install directive, use these to ensure that
-# the item is installed correctly.
-
-if (WIN32)
-  # Install types; these defines the component sets that are installed.
-  # Each component (below) indicates which of these install type(s) it is
-  # included in. The user can refine the components at install time.
-  set (CPACK_ALL_INSTALL_TYPES Broker Development Full)
-
-  set (QPID_COMPONENT_COMMON Common)
-  set (CPACK_COMPONENT_COMMON_INSTALL_TYPES Broker Development Full)
-  set (CPACK_COMPONENT_COMMON_DISPLAY_NAME "Required common runtime items")
-  set (CPACK_COMPONENT_COMMON_DESCRIPTION
-    "Run-time library common to all runtime components in Qpid.\nThis item is required by both broker and client components.")
-
-  set (QPID_COMPONENT_BROKER Broker)
-  set (CPACK_COMPONENT_BROKER_DEPENDS Common)
-  set (CPACK_COMPONENT_BROKER_INSTALL_TYPES Broker Full)
-  set (CPACK_COMPONENT_BROKER_DISPLAY_NAME "Broker")
-  set (CPACK_COMPONENT_BROKER_DESCRIPTION
-    "Messaging broker; controls message flow within the system.\nAt least one broker is required to run any messaging application.")
-
-  set (QPID_COMPONENT_CLIENT Client)
-  set (CPACK_COMPONENT_CLIENT_DEPENDS Common)
-  set (CPACK_COMPONENT_CLIENT_INSTALL_TYPES Development Full)
-  set (CPACK_COMPONENT_CLIENT_DISPLAY_NAME "Client runtime libraries")
-  set (CPACK_COMPONENT_CLIENT_DESCRIPTION
-    "Runtime library components required to build and execute a client application.")
-
-  set (QPID_COMPONENT_CLIENT_INCLUDE ClientInclude)
-  set (CPACK_COMPONENT_CLIENTINCLUDE_INSTALL_TYPES Development Full)
-  set (CPACK_COMPONENT_CLIENTINCLUDE_DISPLAY_NAME
-    "Client programming header files")
-  set (CPACK_COMPONENT_CLIENTINCLUDE_DESCRIPTION
-    "C++ header files required to build any Qpid messaging application.")
-
-  set (QPID_COMPONENT_EXAMPLES Examples)
-  set (CPACK_COMPONENT_EXAMPLES_INSTALL_TYPES Development Full)
-  set (CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "C++ Client programming examples")
-  set (CPACK_COMPONENT_EXAMPLES_DESCRIPTION
-    "Example source code for using the C++ Client.")
-
-  set (QPID_COMPONENT_QMF QMF)
-  set (CPACK_COMPONENT_QMF_INSTALL_TYPES Development Full)
-  set (CPACK_COMPONENT_QMF_DISPLAY_NAME
-    "Qpid Management Framework (QMF)")
-  set (CPACK_COMPONENT_QMF_DESCRIPTION
-    "QMF Agent allows you to embed QMF management in your program.\nQMF Console allows you to build management programs using QMF.")
-
-  set (QPID_INSTALL_BINDIR bin CACHE STRING
-    "Directory to install user executables")
-  set (QPID_INSTALL_CONFDIR conf CACHE STRING
-    "Directory to install configuration files")
-  set (QPID_INSTALL_SASLDIR conf CACHE STRING
-    "Directory to install SASL configuration files")
-  set (QPID_INSTALL_DATADIR conf CACHE STRING
-    "Directory to install read-only arch.-independent data root")
-  set (QPID_INSTALL_EXAMPLESDIR examples CACHE STRING
-    "Directory to install programming examples in")
-  set (QPID_INSTALL_DOCDIR docs CACHE STRING
-    "Directory to install documentation")
-  set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
-    "Directory to install programming header files")
-  set (QPID_INSTALL_LIBDIR lib CACHE STRING
-    "Directory to install library files")
-  set (QPID_INSTALL_MANDIR docs CACHE STRING
-    "Directory to install manual files")
-  set (QPID_INSTALL_SBINDIR bin CACHE STRING
-    "Directory to install system admin executables")
-  set (QPID_INSTALL_TESTDIR bin CACHE STRING
-    "Directory for test executables")
-  set (QPIDC_MODULE_DIR plugins/client CACHE STRING
-    "Directory to load client plug-in modules from")
-  set (QPIDD_MODULE_DIR plugins/broker CACHE STRING
-    "Directory to load broker plug-in modules from")
-
-  # function to get absolute path from a variable that may be relative to the
-  # install prefix - For Windows we can never know the absolute install prefix
-  # as this is decided at install time so this just returns the input path
-  function(set_absolute_install_path var input)
-    set (${var} ${input} PARENT_SCOPE)
-  endfunction(set_absolute_install_path)
-endif (WIN32)
-
-if (UNIX)
-  # function to get absolute path from a variable that may be relative to the
-  # install prefix
-  function(set_absolute_install_path var input)
-    if (${input} MATCHES "^/.*")
-      set (${var} ${input} PARENT_SCOPE)
-    else ()
-      set (${var} ${CMAKE_INSTALL_PREFIX}/${input} PARENT_SCOPE)
-    endif ()
-  endfunction(set_absolute_install_path)
-
-  # Figure out the default library suffix
-  if (NOT DEFINED LIB_SUFFIX)
-    get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-    if (${LIB64} STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
-      set(LIB_SUFFIX 64)
-    else()
-      set(LIB_SUFFIX "")
-    endif()
-  endif()
-
-  # In rpm builds the build sets some variables with absolute paths:
-  #  CMAKE_INSTALL_PREFIX - this is a standard cmake variable
-  #  INCLUDE_INSTALL_DIR
-  #  LIB_INSTALL_DIR
-  #  SYSCONF_INSTALL_DIR
-  #  SHARE_INSTALL_DIR
-  # So make these cached variables and the specific variables non cached and
-  # derived from them.
-  set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
-  set (LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Library object file directory")
-  set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory")
-  set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
-  set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory")
-  mark_as_advanced(INCLUDE_INSTALL_DIR LIB_INSTALL_DIR SYSCONF_INSTALL_DIR SHARE_INSTALL_DIR DOC_INSTALL_DIR)
-
-  set (QPID_COMPONENT_BROKER broker)
-  set (QPID_COMPONENT_CLIENT runtime)
-  set (QPID_COMPONENT_COMMON runtime)
-  set (CPACK_COMPONENT_RUNTIME_DISPLAY_NAME
-    "Items required to run broker and/or client programs")
-  set (QPID_COMPONENT_CLIENT_INCLUDE development)
-  set (QPID_COMPONENT_EXAMPLES development)
-  set (QPID_COMPONENT_QMF development)
-  set (CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME
-    "Items required to build new C++ Qpid client programs")
-
-  # These are always relative to $CMAKE_INSTALL_PREFIX
-  set (QPID_INSTALL_BINDIR bin)
-  set (QPID_INSTALL_SBINDIR sbin)
-  set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test executables
-  set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid)
-  set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/rc.d/init.d)
-  set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2)
-  set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid)
-  set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/qpid/examples)
-  set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install documentation
-  set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR})
-  set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR})
-  set (QPID_INSTALL_MANDIR share/man) # Directory to install manual files
-
-  set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from
-  set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from
-
-  #----
-  # Set RPATH so that installe executables can run without setting
-  # LD_LIBRARY_PATH or running ldconfig
-  # (based on http://www.cmake.org/Wiki/CMake_RPATH_handling)
-
-  # Add the automatically determined parts of the RPATH
-  # which point to directories outside the build tree to the install RPATH
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-  # The RPATH to be used when installing, but only if it's not a system directory
-  set_absolute_install_path (QPID_LIB_DIR ${QPID_INSTALL_LIBDIR})
-  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${QPID_LIB_DIR}" isSystemDir)
-  if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${QPID_LIB_DIR}")
-  endif("${isSystemDir}" STREQUAL "-1")
-endif (UNIX)
diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
deleted file mode 100644
index 796f587..0000000
--- a/qpid/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,232 +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(qpid-cpp)
-
-cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
-
-if (CMAKE_CONFIGURATION_TYPES)
-  # There is no single "build type"...
-  message(STATUS "Build types are ${CMAKE_CONFIGURATION_TYPES}")
-else (CMAKE_CONFIGURATION_TYPES)
-  # There is a single build configuration
-  # If the build type is not set then set the default
-  if (NOT CMAKE_BUILD_TYPE)
-  set (CMAKE_BUILD_TYPE RelWithDebInfo CACHE string
-       "Build type: Debug, Release, RelWithDebInfo or MinSizeRel (default RelWithDebInfo)" FORCE)
-  endif ()
-
-  if (CMAKE_BUILD_TYPE MATCHES "Deb")
-    set (has_debug_symbols " (has debug symbols)")
-  endif (CMAKE_BUILD_TYPE MATCHES "Deb")
-  message(STATUS "Build type is \"${CMAKE_BUILD_TYPE}\"${has_debug_symbols}")
-endif (CMAKE_CONFIGURATION_TYPES)
-
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
-
-file(READ VERSION.txt QPID_VERSION)
-string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\1" QPID_VERSION_MAJOR "${QPID_VERSION}")
-string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)\n" "\\2" QPID_VERSION_MINOR "${QPID_VERSION}")
-set (QPID_VERSION_FULL "${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}")
-
-set (qpidc_version ${QPID_VERSION_FULL})
-
-include(BuildInstallSettings.cmake)
-
-find_package(PythonInterp REQUIRED)
-
-enable_testing()
-include (CTest)
-configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
-
-if (MSVC)
-  # Chaxnge warning C4996 from level 1 to level 4. These are real and shouldn't
-  # be completely ignored, but they're pretty well checked out and will throw
-  # a run-time error if violated.
-  # "warning C4996: 'std::equal': Function call with parameters that may
-  # be unsafe..."
-  add_definitions(/w44996)
-endif (MSVC)
-
-# Overall packaging/install options.
-# This section also has all the setup for various packaging-specific options.
-set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
-if (WIN32)
-  # Include installing the MSVCRT library
-  set (CMAKE_INSTALL_DEBUG_LIBRARIES ON)
-  include(InstallRequiredSystemLibraries)
-  set (CPACK_GENERATOR "NSIS")
-  set (CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico")
-  set (CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-icon.ico")
-  set (CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/NSIS\\\\qpid-install-banner.bmp")
-  set (CPACK_NSIS_URL_INFO_ABOUT "http://qpid.apache.org/")
-  # Needs this to correctly set up Start menu links later.
-  set (CPACK_PACKAGE_EXECUTABLES "")
-endif (WIN32)
-
-set_absolute_install_path (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf)
-set_absolute_install_path (QPIDD_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidd.conf)
-
-install(FILES  LICENSE.txt NOTICE.txt DESTINATION ${QPID_INSTALL_DOCDIR})
-install(FILES  include/qmf/qmf2.i
-        DESTINATION ${QPID_INSTALL_INCLUDEDIR}/qmf)
-
-if (WIN32)
-   set (CMAKE_DEBUG_POSTFIX "d")
-endif (WIN32)
-
-# set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CPACK_SET_DESTDIR ON)
-set(CPACK_PACKAGE_NAME "qpid-cpp")
-set(CPACK_PACKAGE_VENDOR "Apache Software Foundation")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Qpid C++")
-set(CPACK_PACKAGE_VERSION "${qpidc_version}")
-set(CPACK_PACKAGE_VERSION_MAJOR "${QPID_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${QPID_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "qpidc-${qpidc_version}")
-
-# Add custom target for docs since we don't include a cmake file there directly.
-add_custom_target(docs)
-
-# uninstall target
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-
-add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-# Define windows versions and library helpers
-include (src/msvc.cmake)
-
-# Do not keep on linking against transitive library dependencies
-# TODO Need to rework CMake files to use INTERFACE_LINK_LIBRARIES target property
-# When that is done we can remove the next 4 lines completely
-set (CMAKE_LINK_INTERFACE_LIBRARIES "")
-if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12")
-  cmake_policy(SET CMP0022 OLD)
-endif (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12")
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-   # Warnings: Enable as many as possible, keep the code clean. Please
-   # do not disable warnings or remove -Werror without discussing on
-   # qpid-dev list.
-   #
-   # The following warnings are deliberately omitted, they warn on valid code.
-   # -Wunreachable-code -Wpadded -Winline
-   # -Wshadow - warns about boost headers.
-   set (WARNING_FLAGS
-        "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations")
-
-   set (CATCH_UNDEFINED "-Wl,--no-undefined")
-   # gcc on SunOS uses native linker whose "-z defs" is too fussy
-   if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
-      set (CATCH_UNDEFINED "")
-   endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
-  set (NOSTRICT_ALIASING "-fno-strict-aliasing")
-  set (COMPILER_FLAGS "-fvisibility-inlines-hidden")
-   # gcc 4.1.2 on RHEL 5 needs -Wno-attributes to avoid an error that's fixed
-   # in later gcc versions.
-   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                   OUTPUT_VARIABLE GCC_VERSION)
-   if (GCC_VERSION VERSION_EQUAL 4.1.2)
-     message (STATUS "Cannot restrict library symbol export on gcc 4.1.2")
-     set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden")
-   else (GCC_VERSION VERSION_EQUAL 4.1.2)
-     set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden -fvisibility=hidden")
-     set (QPID_LINKMAP ${CMAKE_CURRENT_SOURCE_DIR}/src/qpid.linkmap)
-     set (LINK_VERSION_SCRIPT_FLAG "-Wl,--version-script=${QPID_LINKMAP}")
-   endif (GCC_VERSION VERSION_EQUAL 4.1.2)
-
-   if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-     add_definitions(-pthread)
-     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
-     set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CATCH_UNDEFINED} -pthread")
-     set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CATCH_UNDEFINED} -pthread")
-   endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
-endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
-  set (COMPILER_FLAGS "-library=stlport4 -mt")
-  set (WARNING_FLAGS "+w")
-  set (CATCH_UNDEFINED "")
-  set (HIDE_SYMBOL_FLAGS "")
-endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
-
-# XL is IBM XL C/C++
-if (CMAKE_CXX_COMPILER_ID MATCHES XL)
-  set (COMPILER_FLAGS "-qtls -qrtti")
-endif (CMAKE_CXX_COMPILER_ID MATCHES XL)
-
-if (CMAKE_SYSTEM_NAME STREQUAL Windows)
-  # Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version
-  set (win32_winnt_default OFF)
-  if (MSVC)
-    set (win32_winnt_default ON)
-  endif (MSVC)
-  option(SET_WIN32_WINNT "In Windows-MSVC build: define _WIN32_WINNT=0x0502 to select target version: Windows XP with SP3" ${win32_winnt_default})
-endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
-
-if (MSVC)
-  add_definitions(
-    /D "_CRT_NONSTDC_NO_WARNINGS"
-    /D "NOMINMAX"
-    /D "WIN32_LEAN_AND_MEAN"
-    /wd4244
-    /wd4800
-    /wd4355
-    /wd4267
-  )
-
-  if (SET_WIN32_WINNT)
-    add_definitions(/D "_WIN32_WINNT=0x0502")
-  endif (SET_WIN32_WINNT)
-
-  # set the RelWithDebInfo compile/link switches to equal Release
-  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG")
-  set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
-
-  if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src)
-    # Set the windows version for the .NET Binding cpp project
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/windows/resources" DOTNET_src)
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/resource1.h" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_relPathToResource ${DOTNET_src} ${DOTNET_tgt})
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
-                   ${CMAKE_CURRENT_BINARY_DIR}/src/windows/resources/org.apache.qpid.messaging.rc)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
-                   ${CMAKE_CURRENT_BINARY_DIR}/src/windows/generated_src/AssemblyInfo.cpp)
-    # Set the windows version for the .NET Binding sessionreceiver project
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
-                   ${CMAKE_CURRENT_BINARY_DIR}/src/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
-  endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bindings/qpid/dotnet/src)
-endif (MSVC)
-
-# Subdirectories
-add_subdirectory(management/python)
-add_subdirectory(managementgen)
-add_subdirectory(src)
-add_subdirectory(etc)
-add_subdirectory(bindings)
-add_subdirectory(docs/api)
-add_subdirectory(docs/man)
-add_subdirectory(examples)
-
-include (CPack)
diff --git a/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake b/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
deleted file mode 100755
index 463a37d..0000000
--- a/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
+++ /dev/null
@@ -1,55 +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.
-#
-
-# This module checks to see if size_t is a distinct type from the other
-# integer types already set up in IntegerTypes.h.
-
-INCLUDE (CheckCXXSourceCompiles)
-
-FUNCTION (check_size_t_distinct VARIABLE)
-  # No need to check if we already did. If you want to re-run, clear it
-  # from the cache.
-  if (NOT DEFINED ${VARIABLE})
-    message (STATUS "Check for size_t")
-    set (CMAKE_REQUIRED_QUIET ON)
-    set (CMAKE_REQUIRED_INCLUDES "${CMAKE_SOURCE_DIR}/include")
-    CHECK_CXX_SOURCE_COMPILES (
-"
-#include \"qpid/sys/IntegerTypes.h\"
-// Define functions that will fail to compile if size_t is the same as
-// one of the int types defined in IntegerTypes.h
-int foo(int16_t)    { return 1; }
-int foo(int32_t)    { return 2; }
-int foo(int64_t)    { return 3; }
-int foo(uint16_t)   { return 4; }
-int foo(uint32_t)   { return 5; }
-int foo(uint64_t)   { return 6; }
-int foo(size_t)     { return 7; }
-int main (int, char *[]) {
-  return 0;
-}
-"
-    ${VARIABLE})
-    if (${VARIABLE})
-      message (STATUS "Check for size_t -- NOT a distinct type")
-    else (${VARIABLE})
-      message (STATUS "Check for size_t -- distinct type")
-    endif (${VARIABLE})
-  endif ()
-ENDFUNCTION (check_size_t_distinct VARIABLE)
diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake
deleted file mode 100644
index 71441fe..0000000
--- a/qpid/cpp/CMakeModules/FindProton.cmake
+++ /dev/null
@@ -1,82 +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(FindPackageHandleStandardArgs)
-include(FindPackageMessage)
-
-# First try to find the Installed Proton config (Proton 0.7 and later)
-find_package(Proton QUIET NO_MODULE)
-if (Proton_FOUND)
-    find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION")
-    return()
-endif ()
-
-# Now look for the cooky Proton config installed with some earlier
-# versions of Proton
-find_package(proton QUIET NO_MODULE)
-if (proton_FOUND)
-    include("${proton_DIR}/libqpid-proton.cmake")
-    set (Proton_VERSION ${PROTON_VERSION})
-    set (Proton_INCLUDE_DIRS ${PROTON_INCLUDE_DIRS})
-    set (Proton_LIBRARIES ${PROTON_LIBRARIES})
-    set (Proton_FOUND true)
-    find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION")
-    return()
-endif ()
-
-# Now look for any pkg-config configuration
-find_package(PkgConfig QUIET)
-
-if (PKG_CONFIG_FOUND)
-    # Check for cmake 2.6
-    if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0")
-        set (FindPkgQUIET QUIET)
-    endif()
-
-    if (NOT Proton_FIND_VERSION)
-        pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton)
-    elseif(NOT Proton_FIND_VERSION_EXACT)
-        pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton>=${Proton_FIND_VERSION})
-    else()
-        pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION})
-    endif()
-    if (Proton_FOUND)
-        find_library(Proton_LIBRARY ${Proton_LIBRARIES} HINTS ${Proton_LIBRARY_DIRS})
-        set (Proton_LIBRARIES ${Proton_LIBRARY})
-        find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION")
-        return()
-    endif ()
-endif()
-
-# Allow ccmake or command-line to set checked out but not installed Proton location
-# Defaule location is ${HOME}/qpid-proton
-set(Proton_CHECKOUT_DIR "$ENV{HOME}/qpid-proton" CACHE PATH "Proton checkout directory")
-set(Proton_BUILD_DIR_NAME "build" CACHE STRING "Proton build directory name within Proton_CHECKOUT_DIR")
-if (EXISTS ${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so)
-    include("${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/ProtonConfig.cmake")
-    set (Proton_INCLUDE_DIRS "${Proton_CHECKOUT_DIR}/proton-c/include" "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/include")
-    set (Proton_LIBRARIES "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so")
-    find_package_message(Proton "Found uninstalled Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR ${Proton_LIBRARIES} $Proton_VERSION")
-    return()
-endif ()
-
-# Proton not found print a standard error message
-if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.3")
-    find_package_handle_standard_args(Proton CONFIG_MODE)
-endif()
diff --git a/qpid/cpp/CTestConfig.cmake b/qpid/cpp/CTestConfig.cmake
deleted file mode 100755
index 7b8a6cb..0000000
--- a/qpid/cpp/CTestConfig.cmake
+++ /dev/null
@@ -1,32 +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.
-#
-
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "qpid-cpp")
-set(CTEST_NIGHTLY_START_TIME "20:00:00 EST")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "www.riverace.com")
-set(CTEST_DROP_LOCATION "/CDash-1.4.2/submit.php?project=qpid-cpp")
-set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/qpid/cpp/CTestCustom.cmake b/qpid/cpp/CTestCustom.cmake
deleted file mode 100644
index 0fcf256..0000000
--- a/qpid/cpp/CTestCustom.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(CTEST_CUSTOM_PRE_TEST "${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/src/tests/check_dependencies.py")
diff --git a/qpid/cpp/INSTALL-WINDOWS.txt b/qpid/cpp/INSTALL-WINDOWS.txt
deleted file mode 100644
index 6421719..0000000
--- a/qpid/cpp/INSTALL-WINDOWS.txt
+++ /dev/null
@@ -1,240 +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.

-#

-

-		Installing Qpid/C++ on Windows

-		==============================

-

-Table of Contents

-=================

-1. Introduction

-

-2. Prerequisites

-   2.1. What to Install

-   2.2. Important Environment Variable Settings

-   2.3. Setting up Boost

-3. Building Qpid

-   3.1. Building from a Source Distribution

-   3.2. Building a Repository Working Copy

-4. Building with Qpid Proton for AMQP 1.0 support

-5. Tests

-6. Doxygen

-7. Troubleshooting

-

-

-1. Introduction

-===============

-This document describes how to build the Qpid/C++ broker and client on

-Windows using Microsoft Visual Studio 2012 (VC11).

-

-Please see INSTALL for information on building on Linux/UNIX and for

-building Qpid Java.

-

-

-2. Prerequisites

-================

-Known version numbers for a successful build are given in parentheses.

-

-2.1. What to Install

-====================

-

-The following libraries and header files must be installed to build

-from either a source checkout or a source distribution:

-

- * boost      <http://www.boost.org>                   	(1.58)

- * CMake      <http://www.cmake.org>                    (3.2)

- * python     <http://www.python.org>                   (2.7.10)

- * ruby       <http://www.ruby-lang.org>               	(2.2.2)

-

-Optional libraries and headers may be installed to build language-

-specific bindings and tests:

-

- * swig       <http://www.swig.org>                     (2.0.10)

- * perl       <http://www.perl.HELPME>                  (1.2.3)

- * nunit      <http://www.nunit.HELPME>                 (2.5.8)

- * doxygen

- 

-NOTES:

- * Support for Python 3.x is in progress. Version 2.7 works.

- * Regardless of which type of build you perform if you wish to run the

-   full test suite you will need to have python installed.

-

-2.2. Important Environment Variable Settings

-============================================

-

-Ensure that all the build tools are available on your path, when they are

-manually installed to non-standard locations. For example:

-

- # set PATH=%PATH%;C:\Perl\bin

- # set PATH=%PATH%;C:\Program Files\Python26

- # set PATH=%PATH%;C:\Program Files\ruby\bin

- # set PATH=%PATH%;C:\Program Files\CMake 2.8\bin

- # set PATH=%PATH%;C:\Program Files\doxygen\bin

- # set PATH=%PATH%;C:\Program Files\Python26\Scripts

- # set PATH=%PATH%;C:\Program Files\CMake 2.8\bin

- # set PATH=%PATH%;C:\Program Files\NUnit 2.5.8\bin\net-2.0

-

-2.3. Setting Up Boost

-=====================

-

-For Boost 1.58 the community provides prebuilt Windows binaries. See

-http://sourceforge.net/projects/boost/files/boost-binaries/1.58.0/

-

-Choose the installer that has the binary bits for the version of Visual

-Studio and architecture that you plan to use. For example file

-boost_1_58_0-bin-msvc-11.0-64.exe has the include files and dll files

-for Visual Studio 2012 x64 project development.

-

-2.3.1. Configure boost so CMake finds this one version

-======================================================

-

-CMake can find and use the Boost installation easily if the package

-boost package is installed as follows:

-

- * Install the package to C:\boost

- * Create a link for a \lib folder to point to the actual library

-   files:

-     # cd C:\boost

-     # mklink /J lib lib64-msvc-11.0

-

-   or

-

-   Rename the actual library folder to "lib":

-     # rename lib64-msvc-11.0 lib

-

-With a setup like this you do not need to specify any Boost

-environment variables or set any CMake switches.

-

-An issue is that CMake will find this boost for 32-bit and

-for 64-bit builds. One of them will work and the other will not.

-If you have an architecture you plan to use all the time then this is

-a reasonable setup.

-

-2.3.2. Configure boost so CMake finds one of many versions

-==========================================================

-

-CMake can be steered to use any one of multiple concurrent boost

-installations. Using this method you can build with any version of

-Visual Studio and with any architecture without rearranging your

-boost folders.

-

- * Install the Boost package to C:\boost_1_58_0

-   Do NOT install to C:\boost

-

- * Set environment variables to point to the boost installation

-   # set BOOST_INCLUDEDIR=C:\boost_1_58_0

-   # set BOOST_LIBRARYDIR=C:\boost_1_58_0\lib64-msvc-11.0

-   # cmake -G "Visual Studio 11 2012 Win64"  ....

-

-CMake will use the same include files regardless of the compiler/

-architecture. CMake can be directed to use  any of the libs that are

-for the specific compiler/architecture build by varying the

-BOOST_LIBRARYDIR setting.

-

-3. Building Qpid

-================

-The Qpid client/broker, examples, and tests are built with a Visual

-Studio solution file and many project files which are generated by

-CMake.

-

-From a command prompt:

-

- # cd qpid\cpp

- # mkdir build

- # cd build

- # cmake -G "Visual Studio 10" ..

-

-Output from CMake includes .h files in the include directory, .vcproj

-files for executables and dlls, and the qpid-cpp.sln solution file.

-

-Open the qpid-cpp.sln solution, select Debug or RelWithDebInfo, and build.

-

-3.1. Building from a Source Distribution

-========================================

-

-Unzip the distribution zip file into C:\qpid and follow the instructions

-in Section 3.

-

-3.2. Building a Repository Working Copy

-=======================================

-This section will assume that you will create a directory for your Qpid

-work. This directory will be referred to below as C:\qpid.

-

-Get the source code from the subversion repository:

-

- # C:\qpid> svn checkout https://svn.apache.org/repos/asf/qpid/trunk

-

-Then follow the build instructions in Section 3.

-

-4. Building with Qpid Proton for AMQP 1.0 support

-=================================================

-

-The easiest way to get Qpid Proton linked into a Qpid build is through

-a shared install directory.

-

-Suppose you have Qpid and Qpid Proton sources in directories:

-

-  C:\qpid

-  C:\proton

-

-When you run CMake for Proton you must specify an install prefix. The install

-folder will hold the Proton include files and libs that Qpid needs.

-

-  C:\proton\build> cmake -DCMAKE_INSTALL_PREFIX=C:\qpid\cpp\install

-  C:\proton\build> Proton.sln

-  <build the INSTALL project>

-

-Back in the Qpid build, specify the same install prefix.

-

-  C:\qpid\cpp\build> cmake -DCMAKE_INSTALL_PREFIX=C:\qpid\cpp\install

-  C:\qpid\cpp\build> qpid-cpp.sln

-  <build>

-

-Expect to see ths line in the CMake console output:

-

-   -- Qpid proton found, amqp 1.0 support enabled

-

-

-5. Tests

-========

-See src/tests/README.txt for details.

-

-

-6. Doxygen

-==========

-Doxygen generates documentation in several formats from source code

-using special comments. You can use javadoc style comments if you know

-javadoc, if you don't or want to know the fully story on doxygen

-markup see http://www.stack.nl/~dimitri/doxygen/

-

-Even even if the code is completely uncommented, doxygen generates

-UML-esque dependency diagrams that are ''extremely'' useful in navigating

-around the code, especially for newcomers.

-

-The user-level API documentation can be generated by building the

-user-api-docs project from the generated Visual Studio solution. The

-documentation is generated into the docs/api/html directory under your

-build directory.

-

-7. Troubleshooting

-==================

-

-When the broker is executed it will try to store a file in the "qpidd"

-subdirectory of the current user's temporary file directory, or in

-C:\WINDOWS\TEMP. If the qpidd directory can't be created or accessed the

-broker startup will fail.

diff --git a/qpid/cpp/INSTALL.txt b/qpid/cpp/INSTALL.txt
deleted file mode 100644
index cee7f17..0000000
--- a/qpid/cpp/INSTALL.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-		Installing Qpid/C++
-		===================
-
-Table of Contents
-=================
-1. Introduction
-2. How to Build and Install Qpid from a Source Distribution
-3. Building a Repository Working Copy
-4. Tests
-
-5. Prerequisites
-   5.1. What Prerequisite Libraries to Install
-   5.2. How to Install Prerequisite Libraries
-      5.2.1. Using Package Management Tools
-      5.2.2. Building Prerequisites From Source
-   5.3. Important Environment Variable Settings
-
-
-1. Introduction
-===============
-This document describes how to build the Qpid/C++ broker and client, either
-from a checkout of the source or from a source distribution, on Linux/UNIX.
-
-Please see INSTALL-WINDOWS for information on building on Windows.
-
-There are a number of prerequisite libraries that may need to be installed.
-If this is the first time that you have built Qpid please check the prerequisites
-section 5. below and/or check the output from running cmake for any errors.
-
-As of Qpid 0.26 cmake (versions 2.6 or 2.8) is the only way to build Qpid.
-
-
-2. How to Build and Install Qpid from a Source Distribution
-===========================================================
-It is strongly recommended that you use a separate build directory and do not try to
-build in the source directory. You may use a build directory in any convenient place.
-These instructions use a build directory inside the source tree but this isn't essential.
-
-In the cpp distribution directory (<qpid>/cpp), build the code with:
-
- # mkdir bld       # This is just a suggested name for the build directory
- # cd bld
- # cmake ..        # ".." is the path to the distribution directory
-
- # make all
-
-To run the tests:
-
- # make test
-
-To install (you may need to be root/sudo to do this):
-
- # make install
-
-To uninstall (you may need to be root/sudo to do this):
-
- # make uninstall
-
-
-The daemon and client API may be built separately if so desired:
-
- # make qpidbroker
-
- # make qpidclient
-
-The available make targets can be listed using:
-
- # make help
-
-
-You can have multiple builds which use the same working copy with different
-configuration. For example you can do the following to build twice, once for
-debug, the other with optimization:
-
- # mkdir BLD-dbg BLD-opt
- # (cd BLD-dbg; cmake -DCMAKE_BUILD_TYPE=Debug .. && make )
- # (cd BLD-opt; cmake -DCMAKE_BUILD_TYPE=Release .. && make)
-
-Note that there are 4 different predefined cmake build types:
-Debug, Release, MinSizeRel, DebWithRelInfo: They each correspond to a different
-set of build flags for respectively debug; release; minimum size release; release
-with debug information.
-
-To see and edit all the available cmake options:
-
- # cmake-gui ..    # ".." is the path to the source directory
-
-Or if you have only have a command line environment available
-
- # ccmake ..       # ".." is the path to the source directory
-
-2.1 Building as C++11 (Experimental)
-====================================
-Currently the Qpid project uses C++ that conforms to the C++03 standard, as currently
-this is the C++ standard that is supported the most widely, so any new code must also
-compile as C++03. As an experiment (and to support a few extra platforms) the Qpid code
-will also now build as C++11.
-
-This will work under both gcc and clang. However when compiled under gcc you will hit some
-depracation watrnings which will need to be suppressed.
-
-To compile as C++11 under gcc configure using cmake like this:
-
- # cmake -DCMAKE_CXX_FLAGS="-std=c++11 -Wno-error=deprecated-declarations" ..
-
-To compile as C++11 under clang configure using cmake like this:
-
- # CXX=clang++ CC=clang cmake -DBUILD_PROBES=no -DCMAKE_CXX_FLAGS=-std=c++11 ..
-
-2.2 Building with the clang C++ compiler
-========================================
-Qpid will build with the clang compiler as well as gcc. When compiling using clang the probe
-code will not compile so will need to be turned off.
-
-To compile using clang configure with cmake as follows:
-
- # CXX=clang++ CC=clang cmake -DBUILD_PROBES=no ..
-
-2.3 Building on FreeBSD
-=======================
-Qpid will build (and run) under FreeBSD using the clang compiler, compiling on FreeBSD using gcc
-is not being worked on, and indeed from FreeBSD 10 and onwards the system compiler is clang.
-
-Under FreeBSD 10 the C++ standard library is provided by libc++ rather than libstdc++ (which is the
-norm under Linux). There seems to be a bug in boost::lexical_cast which exhibits when compiling Qpid
-under C++03 with libc++ but not C++11 with libc++. This means that you have to compile Qpid as C++11
-under FreeBSD 10.
-
- # cmake -DCMAKE_CXX_FLAGS=-std=c++11 -DBUILD_BINDING_PERL=no ..
-
-It is not necessary to specify CXX=clang++ because it is the system compiler under FreeBSD 10;
-similarly we don't try to build the probe code on FreeBSD at this point because it doesn't work
-there yet, so it doesn't need to be explicitly turned off.
-
-We turn building the PERL bindings off because the perl header file is incompatible with C++11 currently.
-
-If you want to use the ports version of cyrus-sasl then you should also add:
-
- -DCMAKE_REQUIRED_FLAGS=-L/usr/local/lib -DCMAKE_REQUIRED_INCLUDES=/usr/local/include
-
-Which will allow cmake to find libraries installed in /usr/local (which is where cyrus-sasl gets
-installed by ports).
-
-2.4 Building on AIX
-===================
-Qpid has been tested on AIX 7.1 with XL C++ 13.1 and Boost 1.55.0. The
-thread-using variant of the compiler must be used but it isn't the default
-picked up by cmake. Thus, the compiler must be specified at cmake time.
-For example (assuming PATH includes the compiler binaries):
-
- # CXX=xlC_r CC=cc_r cmake ..
-
-Warnings from Boost header files are expected and can be ignored.
-
-It is normal to see (lots of) multiply-defined symbol warnings when linking
-the shared libraries built as part of Qpid.
-
-The mktemp package must be installed separately in order to execute the
-Qpid test suite.
-
-3. Building a Repository Working Copy
-=====================================
-To get the source code from the subversion repository (trunk) do:
-
- # svn checkout http://svn.apache.org/repos/asf/qpid/trunk/qpid/.
-
-To build, cd to <qpid>/cpp subdirectory and then follow the instructions for building
-from a Source Distribution in step (2).
-
-
-4. Tests
-========
-See <qpid>/cpp/src/tests/README.txt for details.
-
-
-======================================================================================
-
-
-5. Prerequisites
-================
-We prefer to avoid spending time accommodating older versions of these
-packages, so please make sure that you have the latest stable versions.
-Known version numbers for a succesful build are given in brackets, take
-these as a recommended minimum version.
-
-
-5.1. What Prerequisite Libraries to Install
-===========================================
-The following libraries and header files must be installed to build
-a source distribution:
- * boost      <http://www.boost.org>                    (1.41) (*)
- * libuuid    <http://kernel.org/~kzak/util-linux/>     (2.19)
- * pkgconfig  <http://pkgconfig.freedesktop.org/wiki/>  (0.21)
-
-(*) Boost 1.33 will also work.
-
-Optional support for AMQP 1.0 requires (see docs/amqp-1.0.txt for details):
-* Qpid proton-c <http://qpid.apache.org/proton>         (0.5)
-Note: If Proton is installed in a non-standard location, there are two ways to locate it:
-1. Recommended: use proton 0.7 or later and use the same install prefix
-   for both Proton and Qpid.
-2. Using pkg-config: set the PKG_CONFIG_PATH environment variable to
-   <proton-prefix>/lib[64]/pkgconfig before running cmake.
-
-Optional XML exchange requires:
- * xqilla  <http://xqilla.sourceforge.net/HomePage>     (2.0.0)
- * xerces-c <http://xerces.apache.org/xerces-c/>        (2.7.0)
-
-Optional SSL support requires (see docs/ssl.txt for details):
-* nss <http://www.mozilla.org/projects/security/pki/nss/>
-* nspr <http://www.mozilla.org/projects/nspr/>
-
-Optional RDMA transport protocol requires:
-* libibverbs <http://www.openfabrics.org/>              (1.1)
-* librdmacm  <http://www.openfabrics.org/>              (1.0)
-
-Optional binding support for ruby requires:
-* ruby and ruby devel <http://www.ruby-lang.org/en/>
-* swig <http://www.swig.org/>
-
-Qpid has been built using the GNU C++ compiler:
- * gcc     <http://gcc.gnu.org/>            		(4.1.2)
-
-If you want to build directly from the SVN repository you will need
-all of the above plus:
-
- * Cmake      <http://www.cmake.org/>                   (2.6.4)
- * GNU make   <http://www.gnu.org/software/make/>      	(3.8.0)
- * help2man   <http://www.gnu.org/software/help2man/>  	(1.36.4)
- * doxygen    <ftp://ftp.stack.nl/pub/users/dimitri/>  	(1.5.1)
- * graphviz   <http://www.graphviz.org/>               	(2.12)
- * ruby 1.8   <http://www.ruby-lang.org>               	(1.8.4)
- * python 2.x <http://www.python.org>                   (2.4.3)
-
-NOTE: make sure to install the related '-devel' packages also!!!!
-
-NOTE: Python 3.x is known to NOT work - please use 2.7 or earlier.
-
-To build the QMF (Qpid Management Framework) bindings for Ruby and Python,
-the following must also be installed:
-
- * ruby-devel
- * python-devel
- * swig       <http://www.swig.org>                     (1.3.35)
-
-UUID problems:
-
-In some earlier Linux releases (such as Fedora 11), the uuid/uuid.h
-file is located in the e2fsprogs-devel package instead of
-libuuid-devel. If you are using an older Linux release and run into a
-problem during configure in which uuid.h cannot be found, install the
-e2fsprogs-devel package.
-
-5.2. How to Install Prerequisite Libraries
-==========================================
-
-5.2.1. Using Package Management Tools
-=====================================
-On linux most packages can be installed using your distribution's
-package management tool. For example on Fedora:
-
- # yum install cmake boost-devel libuuid-devel pkgconfig gcc-c++ make ruby help2man doxygen graphviz
-
-For SASL and SSL, include
- # yum install cyrus-sasl-devel nss-devel nspr-devel
-
-For the XML Exchange, include:
-
- # yum install xqilla-devel xerces-c-devel
-
-Optional ruby binding support include:
- # yum install ruby ruby-devel swig
-
-Optional legacystore store module.
-# yum install libdb-cxx-devel libaio-devel
-
-Follow the manual installation instruction below for any packages not
-available through your distributions packaging tool.
-
-5.2.2. Building Prerequisites From Source
-=========================================
-Required dependencies can be installed and built from source distributions.
-It is recommended that you create a directory to install them to, for example,
-~/qpid-tools.
-
- To build and install the dependency packages:
-
- 1. Unzip and untar them and cd to the untared directory.
- 2. do:
-  # ./configure --prefix=~/qpid-tools
-  # make install
-
-The exception is boost.
-
-boost
-=====
- 1. Unpack boost-jam.
- 2. Add bjam in the unpacked directory to your path.
- 3. Unpack boost and cd to the boost untarred directory.
- 4. do:
-
-  # bjam toolset=gcc variant=release threading=single link=shared \
-    --layout=system --prefix=~/qpid-tools install
-
-
-5.3. Important Environment Variable Settings
-============================================
-Note that the following is generally not necessary if dependency packages have been
-installed using Package Management Tools such as yum or apt.
-
-Ensure that all the build tools are available on your path, when they are
-manually installed to non-standard locations. For example:
-
- # export PATH=~/qpid-tools/bin:$PATH
-
-Ensure that pkg-config is set up correctly. This is especially important
-if you have built the dependencies from source, as they may not be installed
-in the default system location. For example:
-
- # export PKG_CONFIG_PATH=~/qpid-tools/lib/pkgconfig:/usr/local/lib/pkgconfig
- # export PKG_CONFIG=~/qpid-tools/bin/pkg-config
-
-Ensure that the boost libraries are made available on the gcc library path.
-For example:
-
- # export CXXFLAGS=-I~/qpid-tools/include/boost-1_33_1
-
diff --git a/qpid/cpp/LICENSE.txt b/qpid/cpp/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/qpid/cpp/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
diff --git a/qpid/cpp/NOTICE.txt b/qpid/cpp/NOTICE.txt
deleted file mode 100644
index c56cab3..0000000
--- a/qpid/cpp/NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Qpid CPP
-Copyright 2006-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/qpid/cpp/README.md b/qpid/cpp/README.md
deleted file mode 100644
index ba13a9f..0000000
--- a/qpid/cpp/README.md
+++ /dev/null
@@ -1,59 +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.
-
--->
-
-# Qpid C++
-
-## Introduction
-
-Qpid C++ is a C++ implementation of the AMQP protocol described at
-<http://amqp.org/>.
-
-For additional software or information on the Qpid project go to:
-
-> <http://qpid.apache.org>
-
-For documentation, go to:
-
-> <http://qpid.apache.org/documentation>
-
-## Available documentation
-
- - INSTALL.txt - How to install Qpid C++
- - LICENSE.txt - The Apache license
- - NOTICE.txt  - Corresponds to the section 4 d of the Apache License,
-   Version 2.0
- - docs/       - Feature and design notes, other documentation
-
-## Quick start
-
-In C++ distributions:
-
-    mkdir BLD      # The recommended way to use cmake is in a separate
-                   # build directory
-    cd BLD
-    cmake ..       # Generates code and makefiles
-    make test      # Runs tests
-    make install   # Installs the client and daemon
-
-The INSTALL.txt notes contain more detailed information on compiling
-and installing this software.
-
-qpid/cpp/examples/README.txt describes the C++ client API examples.
diff --git a/qpid/cpp/VERSION.txt b/qpid/cpp/VERSION.txt
deleted file mode 100644
index c74e8a0..0000000
--- a/qpid/cpp/VERSION.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.35
diff --git a/qpid/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt
deleted file mode 100644
index 3c55871..0000000
--- a/qpid/cpp/bindings/CMakeLists.txt
+++ /dev/null
@@ -1,159 +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.
-#
-
-# Work-around for bug in older versions of cmake where find_package(PythonLib)
-# finds the static .a library before the the dynamic .so one on Unix.
-# Force search for .so first (this is exactly what newer versions of cmake do.)
-#
-# NOTE: Must be a macro, not a function. find_package in a function sets
-# the package found variables in the function scope, not the parent scope.
-#
-macro(find_python_libs)
-  # Only do this on unix-like systems that use the .so library suffix.
-  if(UNIX AND CMAKE_FIND_LIBRARY_SUFFIXES MATCHES "\\.so")
-    set(SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) # Save the suffixes.
-    # Look just for shared libraries.
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
-    find_package(PythonLibs)
-    # Restore the suffixes
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${SUFFIXES})
-  endif()
-  # If we are not on a Unix/.so platform or we didn't find the library with the .so search
-  # then do a plain search
-  if (NOT PYTHONLIBS_FOUND)
-    find_package(PythonLibs)
-  endif()
-endmacro(find_python_libs)
-
-
-find_package(SWIG)
-if (SWIG_FOUND)
-
-  include(UseSWIG)
-  find_package(Ruby)
-  find_python_libs()
-  find_package(PerlLibs)
-
-  if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-
-    if (RUBY_INCLUDE_PATH)
-        set(RUBY_FOUND "TRUE")
-    else()
-        set(RUBY_FOUND "FALSE")
-    endif (RUBY_INCLUDE_PATH)
-
-    if (PERL_FOUND)
-        # taken from Cmake 2.8 FindPerlLibs.cmake
-        execute_process(
-        COMMAND
-            ${PERL_EXECUTABLE} -V:installarchlib
-            OUTPUT_VARIABLE PERL_ARCHLIB_OUTPUT_VARIABLE
-            RESULT_VARIABLE PERL_ARCHLIB_RESULT_VARIABLE
-        )
-        if (NOT PERL_ARCHLIB_RESULT_VARIABLE)
-            string(REGEX REPLACE "install[a-z]+='([^']+)'.*" "\\1" PERL_ARCHLIB ${PERL_ARCHLIB_OUTPUT_VARIABLE})
-            file(TO_CMAKE_PATH "${PERL_ARCHLIB}" PERL_ARCHLIB)
-        endif ()
-
-        IF ( PERL_INCLUDE_PATH MATCHES .*-NOTFOUND )
-            EXECUTE_PROCESS ( COMMAND ${PERL_EXECUTABLE}
-                              -MConfig -e "print \$Config{archlibexp}"
-                              OUTPUT_VARIABLE PERL_OUTPUT
-                              RESULT_VARIABLE PERL_RETURN_VALUE )
-            IF ( NOT PERL_RETURN_VALUE )
-                FIND_PATH ( PERL_INCLUDE_PATH perl.h ${PERL_OUTPUT}/CORE )
-            ENDIF ( NOT PERL_RETURN_VALUE )
-        ENDIF ( PERL_INCLUDE_PATH MATCHES .*-NOTFOUND )
-
-        ## Try to fix failure in PERL_LIBRARY
-        IF ( PERL_LIBRARY MATCHES .*-NOTFOUND )
-            EXECUTE_PROCESS ( COMMAND ${PERL_EXECUTABLE}
-                              -MConfig -e "print \$Config{libperl}"
-                              OUTPUT_VARIABLE PERL_OUTPUT
-                              RESULT_VARIABLE PERL_RETURN_VALUE )
-            IF ( NOT PERL_RETURN_VALUE )
-                FIND_LIBRARY ( PERL_LIBRARY NAMES ${PERL_OUTPUT}
-                                            PATHS ${PERL_INCLUDE_PATH} )
-            ENDIF ( NOT PERL_RETURN_VALUE )
-        ENDIF ( PERL_LIBRARY MATCHES .*-NOTFOUND )
-
-    endif (PERL_FOUND)
-  endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-
-  set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503")
-
-  if (PYTHONLIBS_FOUND)
-    option(BUILD_BINDING_PYTHON "Build Python bindings" ON)
-  endif (PYTHONLIBS_FOUND)
-
-  if (RUBY_FOUND)
-    option(BUILD_BINDING_RUBY "Build Ruby bindings" ON)
-  endif (RUBY_FOUND)
-
-  if (PERLLIBS_FOUND)
-    option(BUILD_BINDING_PERL "Build Perl bindings" ON)
-  endif (PERLLIBS_FOUND)
-
-  if (BUILD_BINDING_PYTHON)
-      message(STATUS "Building Python bindings")
-      execute_process(COMMAND ${PYTHON_EXECUTABLE}
-                      -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')"
-                      OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-      add_subdirectory(qpid/python)
-      add_subdirectory(qmf2/python)
-  endif (BUILD_BINDING_PYTHON)
-
-  if (BUILD_BINDING_RUBY)
-      message(STATUS "Building Ruby bindings")
-      execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['prefix']"
-                      OUTPUT_VARIABLE RUBY_PREFIX
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-      string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_SITEARCH_DIR})
-#     string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_ARCH_DIR})
-      add_subdirectory(qpid/ruby)
-      add_subdirectory(qmf2/ruby)
-  endif (BUILD_BINDING_RUBY)
-
-  if (BUILD_BINDING_PERL)
-      message(STATUS "Building Perl bindings")
-      execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
-                      OUTPUT_VARIABLE QPERL_PREFIX
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-      string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX ${QPERL_PREFIX})
-      string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB ${PERL_ARCHLIB})
-
-      add_subdirectory(qpid/perl)
-  endif (BUILD_BINDING_PERL)
-endif (SWIG_FOUND)
-
-if (MSVC)
-    set (dotnet_binding_default ON)
-else (MSVC)
-    set (dotnet_binding_default OFF)
-endif (MSVC)
-option(BUILD_BINDING_DOTNET "Build DOTNET bindings" ${dotnet_binding_default})
-
-if (BUILD_BINDING_DOTNET)
-    message(STATUS "Building Dotnet bindings")
-    add_subdirectory(qpid/dotnet)
-endif (BUILD_BINDING_DOTNET)
-
-add_subdirectory(qmf2/examples/cpp)
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt b/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
deleted file mode 100644
index 2a01f33..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/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.
-#
-project(qmf2_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} qpidmessaging qpidtypes
-                          ${_boost_libs_needed})
-  else (${ARGC} GREATER 2)
-    target_link_libraries(${subdir}_${example} qpidmessaging qpidtypes
-                          ${_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})
-endmacro(add_installed_example)
-
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
-         DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
-         COMPONENT ${QPID_COMPONENT_EXAMPLES})
-
-add_installed_example(qmf2 agent qmf2)
-if (NOT WIN32)
-  # uses posix select()
-  add_installed_example(qmf2 event_driven_list_agents qmf2)
-endif (NOT WIN32)
-add_installed_example(qmf2 list_agents qmf2)
-add_installed_example(qmf2 print_events qmf2)
-
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/README.txt b/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
deleted file mode 100644
index 8ab3d17..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-This directory contains C++ example management tools and an example
-managed application based on the QPID Management Framework (QMF)
-Library.
-
-agent.cpp
----------
-
-This is an example of a managed application.  Applications that can be
-managed by QMF are called "agents".  This example shows how an agent
-can create managed objects and service method calls.  When run, this
-agent will attempt to connect to a broker at address "localhost:5672".
-
-list_agents.cpp
----------------
-
-This is an example of a management tool.  QMF management tools are
-called "consoles". This console monitors the broker for agent
-additions and removals.  When run, it will attempt to connect to a
-broker at address "localhost:5672".
-
-event_driven_list_agents.cpp
-----------------------------
-
-This console is similar to the list_agents.cpp example, except it uses
-an EventNotifier to wake up when new events arrive.  An EventNotifier
-may be used in a POSIX select/poll loop.
-
-print_events.cpp
-----------------
-
-A very basic console that monitors for all events published by agents.
-
-
-Running the examples
---------------------
-
-In order to run any of the examples, you'll first need to run a broker
-daemon on your local machine (qpidd).  Once the broker is up and
-running, start any of the example consoles.  While the consoles are
-running, run the example agent.  The consoles will print out event
-information that is published by the example agent.
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
deleted file mode 100644
index faa5d5f..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
+++ /dev/null
@@ -1,254 +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/Duration.h>
-
-#define QMF_USE_DEPRECATED_API
-#include <qmf/AgentSession.h>
-#include <qmf/AgentEvent.h>
-#include <qmf/Schema.h>
-#include <qmf/SchemaProperty.h>
-#include <qmf/SchemaMethod.h>
-#include <qmf/Data.h>
-#include <qmf/DataAddr.h>
-#include <qpid/types/Variant.h>
-#include <string>
-#include <iostream>
-
-using namespace std;
-using namespace qmf;
-using qpid::types::Variant;
-using qpid::messaging::Duration;
-
-class ExampleAgent {
-public:
-    ExampleAgent(const string& url);
-    ~ExampleAgent();
-
-    void setupSchema();
-    void populateData();
-    void run();
-private:
-    qpid::messaging::Connection connection;
-    AgentSession session;
-    Schema sch_exception;
-    Schema sch_control;
-    Schema sch_child;
-    Schema sch_event;
-    Data control;
-    DataAddr controlAddr;
-
-    bool method(AgentEvent& event);
-};
-
-
-ExampleAgent::ExampleAgent(const string& url)
-{
-    //
-    // Create and open a messaging connection to a broker.
-    //
-    connection = qpid::messaging::Connection(url, "{reconnect:True}");
-    connection.open();
-
-    //
-    // Create, configure, and open a QMFv2 agent session using the connection.
-    //
-    session = AgentSession(connection, "{interval:30}");
-    session.setVendor("profitron.com");
-    session.setProduct("gizmo");
-    session.setAttribute("attr1", 2000);
-    session.open();
-}
-
-ExampleAgent::~ExampleAgent()
-{
-    //
-    // Clean up the QMF session and the AMQP connection.
-    //
-    session.close();
-    connection.close();
-}
-
-void ExampleAgent::setupSchema()
-{
-    //
-    // Create and register schema for this agent.
-    //
-    string package("com.profitron.gizmo");
-
-    //
-    // Declare a schema for a structured exception that can be used in failed
-    // method invocations.
-    //
-    sch_exception = Schema(SCHEMA_TYPE_DATA, package, "exception");
-    sch_exception.addProperty(SchemaProperty("whatHappened", SCHEMA_DATA_STRING));
-    sch_exception.addProperty(SchemaProperty("howBad", SCHEMA_DATA_INT));
-    sch_exception.addProperty(SchemaProperty("details", SCHEMA_DATA_MAP));
-
-    //
-    // Declare a control object to test methods against.
-    //
-    sch_control = Schema(SCHEMA_TYPE_DATA, package, "control");
-    sch_control.addProperty(SchemaProperty("state", SCHEMA_DATA_STRING));
-    sch_control.addProperty(SchemaProperty("methodCount", SCHEMA_DATA_INT));
-
-    SchemaMethod stopMethod("stop", "{desc:'Stop Agent'}");
-    stopMethod.addArgument(SchemaProperty("message", SCHEMA_DATA_STRING));
-    sch_control.addMethod(stopMethod);
-
-    SchemaMethod echoMethod("echo", "{desc:'Echo Arguments'}");
-    echoMethod.addArgument(SchemaProperty("sequence", SCHEMA_DATA_INT, "{dir:INOUT}"));
-    echoMethod.addArgument(SchemaProperty("map", SCHEMA_DATA_MAP, "{dir:INOUT}"));
-    sch_control.addMethod(echoMethod);
-
-    SchemaMethod eventMethod("event", "{desc:'Raise an Event'}");
-    eventMethod.addArgument(SchemaProperty("text", SCHEMA_DATA_STRING, "{dir:IN}"));
-    eventMethod.addArgument(SchemaProperty("severity", SCHEMA_DATA_INT, "{dir:IN}"));
-    sch_control.addMethod(eventMethod);
-
-    SchemaMethod failMethod("fail", "{desc:'Expected to Fail'}");
-    failMethod.addArgument(SchemaProperty("useString", SCHEMA_DATA_BOOL, "{dir:IN}"));
-    failMethod.addArgument(SchemaProperty("stringVal", SCHEMA_DATA_STRING, "{dir:IN}"));
-    failMethod.addArgument(SchemaProperty("details", SCHEMA_DATA_MAP, "{dir:IN}"));
-    sch_control.addMethod(failMethod);
-
-    SchemaMethod createMethod("create_child", "{desc:'Create Child Object'}");
-    createMethod.addArgument(SchemaProperty("name", SCHEMA_DATA_STRING, "{dir:IN}"));
-    createMethod.addArgument(SchemaProperty("childAddr", SCHEMA_DATA_MAP, "{dir:OUT}"));
-    sch_control.addMethod(createMethod);
-
-    //
-    // Declare the child class
-    //
-    sch_child = Schema(SCHEMA_TYPE_DATA, package, "child");
-    sch_child.addProperty(SchemaProperty("name", SCHEMA_DATA_STRING));
-
-    //
-    // Declare the event class
-    //
-    sch_event = Schema(SCHEMA_TYPE_EVENT, package, "event");
-    sch_event.addProperty(SchemaProperty("text", SCHEMA_DATA_STRING));
-
-    //
-    // Register our schemata with the agent session.
-    //
-    session.registerSchema(sch_exception);
-    session.registerSchema(sch_control);
-    session.registerSchema(sch_child);
-    session.registerSchema(sch_event);
-}
-
-void ExampleAgent::populateData()
-{
-    //
-    // Create a control object and give it to the agent session to manage.
-    //
-    control = Data(sch_control);
-    control.setProperty("state", "OPERATIONAL");
-    control.setProperty("methodCount", 0);
-    controlAddr = session.addData(control, "singleton");
-}
-
-void ExampleAgent::run()
-{
-    AgentEvent event;
-    bool running(true);
-
-    while (running) {
-        bool valid(session.nextEvent(event, Duration::SECOND));
-        if (valid && running) {
-            switch (event.getType()) {
-            case AGENT_METHOD:
-                running = method(event);
-                break;
-            default:
-                break;
-            }
-        }
-    }
-}
-
-bool ExampleAgent::method(AgentEvent& event)
-{
-    const string& name(event.getMethodName());
-    control.setProperty("methodCount", control.getProperty("methodCount").asUint32() + 1);
-
-    try {
-        if (controlAddr == event.getDataAddr()) {
-            if (name == "stop") {
-                cout << "Stopping: message=" << event.getArguments()["message"] << endl;
-                session.methodSuccess(event);
-                return false;
-            }
-
-            if (name == "echo") {
-                event.addReturnArgument("sequence", event.getArguments()["sequence"]);
-                event.addReturnArgument("map", event.getArguments()["map"]);
-                session.methodSuccess(event);
-                return true;
-            }
-
-            if (name == "event") {
-                Data ev(sch_event);
-                ev.setProperty("text", event.getArguments()["text"]);
-                session.raiseEvent(ev, event.getArguments()["severity"]);
-                session.methodSuccess(event);
-                return true;
-            }
-
-            if (name == "fail") {
-                if (event.getArguments()["useString"])
-                    session.raiseException(event, event.getArguments()["stringVal"]);
-                else {
-                    Data ex(sch_exception);
-                    ex.setProperty("whatHappened", "It Failed");
-                    ex.setProperty("howBad", 75);
-                    ex.setProperty("details", event.getArguments()["details"]);
-                    session.raiseException(event, ex);
-                }
-            }
-
-            if (name == "create_child") {
-                const string& name(event.getArguments()["name"]);
-                Data child(sch_child);
-                child.setProperty("name", name);
-                DataAddr addr(session.addData(child, name));
-                event.addReturnArgument("childAddr", addr.asMap());
-                session.methodSuccess(event);
-            }
-        }
-    } catch (const exception& e) {
-        //
-        // Pass the exception on to the caller.
-        //
-        session.raiseException(event, e.what());
-    }
-
-    return true;
-}
-
-int main()
-{
-    ExampleAgent agent("localhost");
-    agent.setupSchema();
-    agent.populateData();
-    agent.run();
-}
-
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
deleted file mode 100644
index 0b09bbf..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
+++ /dev/null
@@ -1,109 +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 <sys/select.h>
-#include <time.h>
-
-#include <qpid/messaging/Connection.h>
-#include <qpid/messaging/Duration.h>
-
-#define QMF_USE_DEPRECATED_API
-#include <qmf/Agent.h>
-#include <qmf/ConsoleEvent.h>
-#include <qmf/ConsoleSession.h>
-#include <qpid/types/Variant.h>
-#include "qmf/posix/EventNotifier.h"
-
-#include <string>
-#include <iostream>
-
-using namespace std;
-using namespace qmf;
-using qpid::types::Variant;
-using qpid::messaging::Duration;
-
-int main(int argc, char** argv)
-{
-    string url("localhost");
-    string connectionOptions;
-    string sessionOptions;
-
-    if (argc > 1)
-        url = argv[1];
-    if (argc > 2)
-        connectionOptions = argv[2];
-    if (argc > 3)
-        sessionOptions = argv[3];
-
-    qpid::messaging::Connection connection(url, connectionOptions);
-    connection.open();
-
-    ConsoleSession session(connection, sessionOptions);
-    session.open();
-    session.setAgentFilter("");
-
-    posix::EventNotifier notifier(session);
-
-    int fd(notifier.getHandle());
-    time_t lastUpdate;
-    bool ftl = false;
-
-    time(&lastUpdate);
-
-    while (true) {
-        fd_set rfds;
-        struct timeval tv;
-        int nfds, retval;
-
-        FD_ZERO(&rfds);
-        FD_SET(fd, &rfds);
-        nfds = fd + 1;
-        tv.tv_sec = 10;
-        tv.tv_usec = 0;
-
-        retval = select(nfds, &rfds, NULL, NULL, &tv);
-
-        if (retval > 0 && FD_ISSET(fd, &rfds)) {
-            ConsoleEvent event;
-            while (session.nextEvent(event, Duration::IMMEDIATE)) {
-                string eventType = "";
-                switch(event.getType()) {
-                case CONSOLE_AGENT_ADD:             eventType = "Added"; break;
-                case CONSOLE_AGENT_DEL:             eventType = "Deleted"; break;
-                case CONSOLE_AGENT_RESTART:         eventType = "Restarted"; break;
-                case CONSOLE_AGENT_SCHEMA_UPDATE:   eventType = "Schema Updated"; break;
-                case CONSOLE_AGENT_SCHEMA_RESPONSE: eventType = "Schema Response"; break;
-                case CONSOLE_EVENT:                 eventType = "Event"; break;
-                case CONSOLE_QUERY_RESPONSE:        eventType = "Query Response"; break;
-                case CONSOLE_METHOD_RESPONSE:       eventType = "Method Response"; break;
-                case CONSOLE_EXCEPTION:             eventType = "Exception"; break;
-                case CONSOLE_SUBSCRIBE_ADD:         eventType = "Subscription Added"; break;
-                case CONSOLE_SUBSCRIBE_UPDATE:      eventType = "Subscription Updated"; break;
-                case CONSOLE_SUBSCRIBE_DEL:         eventType = "Subscription Deleted" ; break;
-                case CONSOLE_THREAD_FAILED:         eventType = "Thread Failure"; break;
-                default:                            eventType = "[UNDEFINED]";
-                }
-                cout << "Agent " << eventType << ": " << event.getAgent().getName() << endl;
-            }
-        } else {
-            cout << "No message received within waiting period." << endl;
-        }
-    }
-}
-
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
deleted file mode 100644
index 5fff985..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
+++ /dev/null
@@ -1,75 +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/Duration.h>
-
-#define QMF_USE_DEPRECATED_API
-#include <qmf/ConsoleSession.h>
-#include <qmf/ConsoleEvent.h>
-#include <qmf/Agent.h>
-#include <qpid/types/Variant.h>
-#include <string>
-#include <iostream>
-
-using namespace std;
-using namespace qmf;
-using qpid::types::Variant;
-using qpid::messaging::Duration;
-
-int main(int argc, char** argv)
-{
-    string url("localhost");
-    string connectionOptions;
-    string sessionOptions;
-
-    if (argc > 1)
-        url = argv[1];
-    if (argc > 2)
-        connectionOptions = argv[2];
-    if (argc > 3)
-        sessionOptions = argv[3];
-
-    qpid::messaging::Connection connection(url, connectionOptions);
-    connection.open();
-
-    ConsoleSession session(connection, sessionOptions);
-    session.open();
-
-    session.setAgentFilter("");
-
-    while (true) {
-        ConsoleEvent event;
-        if (session.nextEvent(event)) {
-            if (event.getType() == CONSOLE_AGENT_ADD) {
-                string extra;
-                if (event.getAgent().getName() == session.getConnectedBrokerAgent().getName())
-                    extra = "  [Connected Broker]";
-                cout << "Agent Added: " << event.getAgent().getName() << extra << endl;
-            }
-            if (event.getType() == CONSOLE_AGENT_DEL) {
-                if (event.getAgentDelReason() == AGENT_DEL_AGED)
-                    cout << "Agent Aged: " << event.getAgent().getName() << endl;
-                else
-                    cout << "Agent Filtered: " << event.getAgent().getName() << endl;
-            }
-        }
-    }
-}
-
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
deleted file mode 100644
index 413c01b..0000000
--- a/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
+++ /dev/null
@@ -1,66 +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/Duration.h>
-
-#define QMF_USE_DEPRECATED_API
-#include <qmf/ConsoleSession.h>
-#include <qmf/ConsoleEvent.h>
-#include <qmf/Data.h>
-#include <qpid/types/Variant.h>
-#include <string>
-#include <iostream>
-
-using namespace std;
-using namespace qmf;
-using qpid::types::Variant;
-using qpid::messaging::Duration;
-
-int main(int argc, char** argv)
-{
-    string url("localhost");
-    string connectionOptions;
-    string sessionOptions;
-
-    if (argc > 1)
-        url = argv[1];
-    if (argc > 2)
-        connectionOptions = argv[2];
-    if (argc > 3)
-        sessionOptions = argv[3];
-
-    qpid::messaging::Connection connection(url, connectionOptions);
-    connection.open();
-
-    ConsoleSession session(connection, sessionOptions);
-    session.open();
-
-    while (true) {
-        ConsoleEvent event;
-        if (session.nextEvent(event)) {
-            if (event.getType() == CONSOLE_EVENT) {
-                const Data& data(event.getData(0));
-                cout << "Event: timestamp=" << event.getTimestamp() << " severity=" <<
-                    event.getSeverity() << " content=" << data.getProperties() << endl;
-            }
-        }
-    }
-}
-
diff --git a/qpid/cpp/bindings/qmf2/examples/python/agent.py b/qpid/cpp/bindings/qmf2/examples/python/agent.py
deleted file mode 100755
index a9f1a14..0000000
--- a/qpid/cpp/bindings/qmf2/examples/python/agent.py
+++ /dev/null
@@ -1,196 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import qpid_messaging
-from qmf2 import *
-
-
-class ExampleAgent(AgentHandler):
-  """
-  This example agent is implemented as a single class that inherits AgentHandler.
-  It does not use a separate thread since once set up, it is driven strictly by
-  incoming method calls.
-  """
-
-  def __init__(self, url):
-    ##
-    ## Create and open a messaging connection to a broker.
-    ##
-    self.connection = qpid_messaging.Connection(url, "{reconnect:True}")
-    self.session = None
-    self.connection.open()
-
-    ##
-    ## Create, configure, and open a QMFv2 agent session using the connection.
-    ##
-    self.session = AgentSession(self.connection, "{interval:30}")
-    self.session.setVendor('profitron.com')
-    self.session.setProduct('blastinator')
-    self.session.setAttribute('attr1', 1000)
-    self.session.open()
-
-    ##
-    ## Initialize the parent class.
-    ##
-    AgentHandler.__init__(self, self.session)
-
-
-  def shutdown(self):
-    """
-    Clean up the session and connection.
-    """
-    if self.session:
-      self.session.close()
-    self.connection.close()
-
-
-  def method(self, handle, methodName, args, subtypes, addr, userId):
-    """
-    Handle incoming method calls.
-    """
-    if addr == self.controlAddr:
-      self.control.methodCount += 1
-
-      try:
-        if methodName == "stop":
-          self.session.methodSuccess(handle)
-          self.cancel()
-
-        elif methodName == "echo":
-          handle.addReturnArgument("sequence", args["sequence"])
-          handle.addReturnArgument("map", args["map"])
-          self.session.methodSuccess(handle)
-
-        elif methodName == "event":
-          ev = Data(self.sch_event)
-          ev.text = args['text']
-          self.session.raiseEvent(ev, args['severity'])
-          self.session.methodSuccess(handle)
-
-        elif methodName == "fail":
-          if args['useString']:
-            self.session.raiseException(handle, args['stringVal'])
-          else:
-            ex = Data(self.sch_exception)
-            ex.whatHappened = "It Failed"
-            ex.howBad = 75
-            ex.details = args['details']
-            self.session.raiseException(handle, ex)
-
-        elif methodName == "create_child":
-          name = args['name']
-          child = Data(self.sch_child)
-          child.name = name
-          addr = self.session.addData(child, name)
-          handle.addReturnArgument("childAddr", addr.asMap())
-          self.session.methodSuccess(handle)
-      except BaseException, e:
-        self.session.raiseException(handle, "%r" % e)
-
-
-  def setupSchema(self):
-    """
-    Create and register the schema for this agent.
-    """
-    package = "com.profitron.bntor"
-
-    ##
-    ## Declare a schema for a structured exception that can be used in failed
-    ## method invocations.
-    ##
-    self.sch_exception = Schema(SCHEMA_TYPE_DATA, package, "exception")
-    self.sch_exception.addProperty(SchemaProperty("whatHappened", SCHEMA_DATA_STRING))
-    self.sch_exception.addProperty(SchemaProperty("howBad", SCHEMA_DATA_INT))
-    self.sch_exception.addProperty(SchemaProperty("details", SCHEMA_DATA_MAP))
-
-    ##
-    ## Declare a control object to test methods against.
-    ##
-    self.sch_control = Schema(SCHEMA_TYPE_DATA, package, "control")
-    self.sch_control.addProperty(SchemaProperty("state", SCHEMA_DATA_STRING))
-    self.sch_control.addProperty(SchemaProperty("methodCount", SCHEMA_DATA_INT))
-
-    stopMethod = SchemaMethod("stop", desc="Stop Agent")
-    stopMethod.addArgument(SchemaProperty("message", SCHEMA_DATA_STRING, direction=DIR_IN))
-    self.sch_control.addMethod(stopMethod)
-
-    echoMethod = SchemaMethod("echo", desc="Echo Arguments")
-    echoMethod.addArgument(SchemaProperty("sequence", SCHEMA_DATA_INT, direction=DIR_IN_OUT))
-    echoMethod.addArgument(SchemaProperty("map", SCHEMA_DATA_MAP, direction=DIR_IN_OUT))
-    self.sch_control.addMethod(echoMethod)
-
-    eventMethod = SchemaMethod("event", desc="Raise an Event")
-    eventMethod.addArgument(SchemaProperty("text", SCHEMA_DATA_STRING, direction=DIR_IN))
-    eventMethod.addArgument(SchemaProperty("severity", SCHEMA_DATA_INT, direction=DIR_IN))
-    self.sch_control.addMethod(eventMethod)
-
-    failMethod = SchemaMethod("fail", desc="Expected to Fail")
-    failMethod.addArgument(SchemaProperty("useString", SCHEMA_DATA_BOOL, direction=DIR_IN))
-    failMethod.addArgument(SchemaProperty("stringVal", SCHEMA_DATA_STRING, direction=DIR_IN))
-    failMethod.addArgument(SchemaProperty("details", SCHEMA_DATA_MAP, direction=DIR_IN))
-    self.sch_control.addMethod(failMethod)
-
-    createMethod = SchemaMethod("create_child", desc="Create Child Object")
-    createMethod.addArgument(SchemaProperty("name", SCHEMA_DATA_STRING, direction=DIR_IN))
-    createMethod.addArgument(SchemaProperty("childAddr", SCHEMA_DATA_MAP, direction=DIR_OUT))
-    self.sch_control.addMethod(createMethod)
-
-    ##
-    ## Declare a child object
-    ##
-    self.sch_child = Schema(SCHEMA_TYPE_DATA, package, "child")
-    self.sch_child.addProperty(SchemaProperty("name", SCHEMA_DATA_STRING))
-
-    ##
-    ## Declare the event class
-    ##
-    self.sch_event = Schema(SCHEMA_TYPE_EVENT, package, "event")
-    self.sch_event.addProperty(SchemaProperty("text", SCHEMA_DATA_STRING))
-
-    ##
-    ## Register our schemata with the agent session.
-    ##
-    self.session.registerSchema(self.sch_exception)
-    self.session.registerSchema(self.sch_control)
-    self.session.registerSchema(self.sch_child)
-    self.session.registerSchema(self.sch_event)
-
-
-  def populateData(self):
-    """
-    Create a control object and give it to the agent session to manage.
-    """
-    self.control = Data(self.sch_control)
-    self.control.state = "OPERATIONAL"
-    self.control.methodCount = 0
-    self.controlAddr = self.session.addData(self.control, "singleton")
-
-
-try:
-  agent = ExampleAgent("localhost")
-  agent.setupSchema()
-  agent.populateData()
-  agent.run()  # Use agent.start() to launch the agent in a separate thread
-  agent.shutdown()
-except Exception, e:
-  print "Exception Caught:", e
-
-
diff --git a/qpid/cpp/bindings/qmf2/examples/python/find_agents.py b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
deleted file mode 100644
index 852f23f..0000000
--- a/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import qpid_messaging
-import qmf2
-
-class FindAgents(qmf2.ConsoleHandler):
-
-  def __init__(self, session):
-    qmf2.ConsoleHandler.__init__(self, session)
-
-  def agentAdded(self, agent):
-    print "Agent Added: %r" % agent
-
-  def agentDeleted(self, agent, reason):
-    print "Agent Deleted: %r reason: %s" % (agent, reason)
-
-  def agentRestarted(self, agent):
-    print "Agent Restarted: %r" % agent
-
-  def agentSchemaUpdated(self, agent):
-    print "Agent Schema Updated: %r" % agent
-
-  def eventRaised(self, agent, data, timestamp, severity):
-    print "Event: data=%r time=%d sev=%d" % (data.getProperties(), timestamp, severity)
-
-
-
-url     = "localhost"
-options = ""
-
-connection = qpid_messaging.Connection(url, options)
-connection.open()
-
-session = qmf2.ConsoleSession(connection)
-session.open()
-session.setAgentFilter("[]")
-
-main = FindAgents(session)
-main.run()
-
diff --git a/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
deleted file mode 100644
index 7517193..0000000
--- a/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-require 'cqpid'
-require 'qmf2'
-
-class MyAgent < Qmf2::AgentHandler
-
-  def initialize(session, data)
-    super(session)
-    @data = data
-  end
-
-  def authorize_query(query, user_id)
-    puts "Authorizing #{user_id}"
-    return true
-  end
-
-  def get_query(context, query, user_id)
-    puts "Get Query"
-    context.response(@data)
-    context.complete
-  end
-
-  def method_call(context, method_name, data_addr, args, user_id)
-    puts "Method: #{method_name}"
-    context._success
-  end
-
-end
-
-
-class Program
-
-  def initialize(url)
-    @url = url
-    @sess_options = "{allow-queries:False, external:True}"
-  end
-
-  def setup_schema(agent)
-    @cls_control = Qmf2::Schema.new(Qmf2::SCHEMA_TYPE_DATA, "org.package", "control")
-    @cls_control.add_property(Qmf2::SchemaProperty.new("state", Qmf2::SCHEMA_DATA_STRING))
-    agent.register_schema(@cls_control)
-  end
-
-  def run
-    connection = Cqpid::Connection.new(@url)
-    connection.open
-
-    session = Qmf2::AgentSession.new(connection, @sess_options)
-    session.set_vendor("package.org")
-    session.set_product("external_agent")
-    setup_schema(session)
-    session.open
-
-    @control = Qmf2::Data.new(@cls_control)
-    @control.state = "OPERATIONAL-EXTERNAL"
-    @control.set_addr(Qmf2::DataAddr.new("singleton"))
-
-    main = MyAgent.new(session, @control)
-    main.run
-  end
-end
-
-prog = Program.new("localhost")
-prog.run
-
-
diff --git a/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
deleted file mode 100644
index fc49a88..0000000
--- a/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
+++ /dev/null
@@ -1,77 +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.
-#
-
-require 'cqpid'
-require 'qmf2'
-
-class MyAgent < Qmf2::AgentHandler
-
-  def initialize(session)
-    super(session)
-  end
-
-  def authorize_query(query, user_id)
-    puts "Authorizing #{user_id}"
-    return true
-  end
-
-  def method_call(context, method_name, data_addr, args, user_id)
-    puts "Method: #{method_name}"
-    context._success
-  end
-
-end
-
-
-class Program
-
-  def initialize(url)
-    @url = url
-    @sess_options = "{allow-queries:False}"
-  end
-
-  def setup_schema(agent)
-    @cls_control = Qmf2::Schema.new(Qmf2::SCHEMA_TYPE_DATA, "org.package", "control")
-    @cls_control.add_property(Qmf2::SchemaProperty.new("state", Qmf2::SCHEMA_DATA_STRING))
-    agent.register_schema(@cls_control)
-  end
-
-  def run
-    connection = Cqpid::Connection.new(@url)
-    connection.open
-
-    session = Qmf2::AgentSession.new(connection, @sess_options)
-    session.set_vendor("package.org")
-    session.set_product("internal_agent")
-    setup_schema(session)
-    session.open
-
-    control = Qmf2::Data.new(@cls_control)
-    control.state = "OPERATIONAL"
-    session.add_data(control)
-
-    main = MyAgent.new(session)
-    main.run
-  end
-end
-
-prog = Program.new("localhost")
-prog.run
-
-
diff --git a/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
deleted file mode 100644
index 41de7e5..0000000
--- a/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
+++ /dev/null
@@ -1,63 +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.
-#
-
-require 'cqpid'
-require 'qmf2'
-
-class FindAgents < Qmf2::ConsoleHandler
-
-  def initialize(session)
-    super(session)
-  end
-
-  def agent_added(agent)
-    puts "Agent Added: #{agent.name}"
-  end
-
-  def agent_deleted(agent, reason)
-    puts "Agent Deleted: #{agent.to_s} reason: #{reason}"
-  end
-
-  def agent_restarted(agent)
-    puts "Agent Restarted: #{agent.to_s} epoch: #{agent.epoch}"
-  end
-
-  def agent_schema_updated(agent)
-    puts "Agent with new Schemata: #{agent.to_s}"
-  end
-
-  def event_raised(agent, data, timestamp, severity)
-    puts "Event Raised time=#{timestamp} sev=#{severity} data=#{data.properties}"
-  end
-end
-
-
-url     = "localhost"
-options = ""
-
-connection = Cqpid::Connection.new(url, options)
-connection.open
-
-session = Qmf2::ConsoleSession.new(connection)
-session.open
-session.set_agent_filter("[]")
-
-main = FindAgents.new(session)
-main.run
-
diff --git a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
deleted file mode 100644
index 3acd583..0000000
--- a/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
+++ /dev/null
@@ -1,74 +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.
-#
-
-##------------------------------------------------------
-## Use Swig to generate a literal binding to the C++ API
-##------------------------------------------------------
-
-# NB For python the SWIG module name must have the same name as the input .i file for CMake to generate the
-# correct dependencies
-
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cqmf2.i PROPERTIES
-    CPLUSPLUS ON
-    SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
-
-list(APPEND SWIG_MODULE_cqmf2_EXTRA_DEPS
-    ${CMAKE_SOURCE_DIR}/include/qmf/qmf2.i
-    ${CMAKE_SOURCE_DIR}/include/qpid/swig_python_typemaps.i
-)
-swig_add_module(cqmf2 python ${CMAKE_CURRENT_SOURCE_DIR}/cqmf2.i)
-swig_link_libraries(cqmf2 qmf2 qpidmessaging qpidtypes ${PYTHON_LIBRARIES})
-
-set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${NOSTRICT_ALIASING}")
-include_directories(${PYTHON_INCLUDE_PATH}
-                    ${qpid-cpp_SOURCE_DIR}/include
-                    ${qpid-cpp_SOURCE_DIR}/bindings)
-
-# Move source into binary dir so compiled .pyc,pyo files will be in binary dir.
-# NOTE: not using the file(COPY) command as it is not available in cmake 2.6
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
-
-# Python compile the modules
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqmf2.py
-                              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqmf2.py
-                              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qmf2.py
-                              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qmf2.py
-                              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-##------------------------------------
-## Install the complete Python binding
-##------------------------------------
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.py
-  ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.pyc
-  ${CMAKE_CURRENT_BINARY_DIR}/cqmf2.pyo
-  ${CMAKE_CURRENT_SOURCE_DIR}/qmf2.py
-  ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pyc
-  ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pyo
-  DESTINATION ${PYTHON_SITEARCH_PACKAGES}
-  COMPONENT ${QPID_COMPONENT_CLIENT}
-  )
-
-install(TARGETS ${SWIG_MODULE_cqmf2_REAL_NAME}
-        DESTINATION ${PYTHON_SITEARCH_PACKAGES}
-        COMPONENT ${QPID_COMPONENT_CLIENT}
-        )
-
diff --git a/qpid/cpp/bindings/qmf2/python/cqmf2.i b/qpid/cpp/bindings/qmf2/python/cqmf2.i
deleted file mode 100644
index 6b5326f..0000000
--- a/qpid/cpp/bindings/qmf2/python/cqmf2.i
+++ /dev/null
@@ -1,41 +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.
- */
-
-%module cqmf2
-%include "std_string.i"
-%include "qpid/swig_python_typemaps.i"
-
-/* Define the general-purpose exception handling */
-%exception {
-    std::string error;
-    Py_BEGIN_ALLOW_THREADS;
-    try {
-        $action
-    } catch (qpid::types::Exception& ex) {
-        error = ex.what();
-    }
-    Py_END_ALLOW_THREADS;
-    if (!error.empty()) {
-        PyErr_SetString(PyExc_RuntimeError, error.c_str());
-        return NULL;
-    }
-}
-
-%include "qmf/qmf2.i"
-
diff --git a/qpid/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py
deleted file mode 100644
index 601e68f..0000000
--- a/qpid/cpp/bindings/qmf2/python/qmf2.py
+++ /dev/null
@@ -1,937 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import warnings
-warnings.warn("The qmf2 module is deprecated.  It will be removed in the future.",
-              Warning, stacklevel=2)
-
-import cqmf2
-import qpid_messaging
-from threading import Thread
-import time
-
-#===================================================================================================
-# CONSTANTS
-#===================================================================================================
-SCHEMA_TYPE_DATA  = cqmf2.SCHEMA_TYPE_DATA
-SCHEMA_TYPE_EVENT = cqmf2.SCHEMA_TYPE_EVENT
-
-SCHEMA_DATA_VOID   = cqmf2.SCHEMA_DATA_VOID
-SCHEMA_DATA_BOOL   = cqmf2.SCHEMA_DATA_BOOL
-SCHEMA_DATA_INT    = cqmf2.SCHEMA_DATA_INT
-SCHEMA_DATA_FLOAT  = cqmf2.SCHEMA_DATA_FLOAT
-SCHEMA_DATA_STRING = cqmf2.SCHEMA_DATA_STRING
-SCHEMA_DATA_MAP    = cqmf2.SCHEMA_DATA_MAP
-SCHEMA_DATA_LIST   = cqmf2.SCHEMA_DATA_LIST
-SCHEMA_DATA_UUID   = cqmf2.SCHEMA_DATA_UUID
-
-ACCESS_READ_CREATE = cqmf2.ACCESS_READ_CREATE
-ACCESS_READ_WRITE  = cqmf2.ACCESS_READ_WRITE
-ACCESS_READ_ONLY   = cqmf2.ACCESS_READ_ONLY
-
-DIR_IN     = cqmf2.DIR_IN
-DIR_OUT    = cqmf2.DIR_OUT
-DIR_IN_OUT = cqmf2.DIR_IN_OUT
-
-SEV_EMERG  = cqmf2.SEV_EMERG
-SEV_ALERT  = cqmf2.SEV_ALERT
-SEV_CRIT   = cqmf2.SEV_CRIT
-SEV_ERROR  = cqmf2.SEV_ERROR
-SEV_WARN   = cqmf2.SEV_WARN
-SEV_NOTICE = cqmf2.SEV_NOTICE
-SEV_INFORM = cqmf2.SEV_INFORM
-SEV_DEBUG  = cqmf2.SEV_DEBUG
-
-QUERY_OBJECT    = cqmf2.QUERY_OBJECT
-QUERY_OBJECT_ID = cqmf2.QUERY_OBJECT_ID
-QUERY_SCHEMA    = cqmf2.QUERY_SCHEMA
-QUERY_SCHEMA_ID = cqmf2.QUERY_SCHEMA_ID
-
-
-#===================================================================================================
-# EXCEPTIONS
-#===================================================================================================
-class QmfAgentException(Exception):
-  """
-  This exception class represents an exception that was raised by a remote agent and propagated
-  to a console via QMFv2.
-  """
-  def __init__(self, data):
-    self.value = data
-
-  def __str__(self):
-    return "From Remote Agent: %r" % self.value.getProperties()
-
-
-#===================================================================================================
-# AGENT HANDLER
-#===================================================================================================
-class AgentHandler(Thread):
-  """
-  Agent applications can create a subclass of AgentHandler to handle asynchronous events (like
-  incoming method calls) that occur on the agent session.  AgentHandler contains a thread on which
-  the handler callbacks are invoked.
-
-  There are two ways to operate the handler:  Cause it to start its own thread by calling
-  start() and later stop it by calling cancel(); and directly calling run() to operate it on the
-  main thread.
-
-  Example Usage:
-
-      class MyAgentHandler(qmf2.AgentHandler):
-          def __init__(self, agentSession):
-              qmf2.AgentHandler.__init__(self, agentSession)
-          def method(self, handle, methodName, args, subtypes, addr, userId):
-              ...method handling code goes here...
-              For success, add output arguments:
-                  handle.addReturnArgument("argname", argvalue)
-                  ...
-                  self.agent.methodSuccess(handle)
-              For failure, raise an exception:
-                  self.agent.raiseException(handle, "error text")
-              Or, if you have created a schema for a structured exception:
-                  ex = qmf2.Data(exceptionSchema)
-                  ex.whatHappened = "it failed"
-                  ex.howBad = 84
-                  ex.detailMap = {}
-                  ...
-                  self.agent.raiseException(handle, ex)
-  """
-
-  def __init__(self, agentSession):
-    Thread.__init__(self)
-    self.__agent = agentSession
-    self.__running = True
-
-  def cancel(self):
-    """
-    Stop the handler thread.
-    """
-    self.__running = None
-
-  def run(self):
-    event = cqmf2.AgentEvent()
-    while self.__running:
-      valid = self.__agent._impl.nextEvent(event, qpid_messaging.Duration.SECOND)
-      if valid and self.__running:
-        if event.getType() == cqmf2.AGENT_METHOD:
-          self.method(event, event.getMethodName(), event.getArguments(), event.getArgumentSubtypes(),
-                      DataAddr(event.getDataAddr()), event.getUserId())
-
-  def method(self, handle, methodName, args, subtypes, addr, userId):
-    """
-    Override this method to create your own method handler.
-    """
-    pass
-
-
-#===================================================================================================
-# CONSOLE HANDLER
-#===================================================================================================
-class ConsoleHandler(Thread):
-
-  def __init__(self, consoleSession):
-    Thread.__init__(self)
-    self.__session = consoleSession
-    self.__running = True
-
-  def cancel(self):
-    """
-    Stop the handler thread.
-    """
-    self.__running = None
-
-  def run(self):
-    event = cqmf2.ConsoleEvent()
-    while self.__running:
-      valid = self.__session._impl.nextEvent(event, qpid_messaging.Duration.SECOND)
-      if valid and self.__running:
-        if event.getType() == cqmf2.CONSOLE_AGENT_ADD:
-          self.agentAdded(Agent(event.getAgent()))
-
-        elif event.getType() == cqmf2.CONSOLE_AGENT_DEL:
-          reason = 'filter'
-          if event.getAgentDelReason() == cqmf2.AGENT_DEL_AGED:
-            reason = 'aged'
-          self.agentDeleted(Agent(event.getAgent()), reason)
-
-        elif event.getType() == cqmf2.CONSOLE_AGENT_RESTART:
-          self.agentRestarted(Agent(event.getAgent()))
-
-        elif event.getType() == cqmf2.CONSOLE_AGENT_SCHEMA_UPDATE:
-          self.agentSchemaUpdated(Agent(event.getAgent()))
-
-        elif event.getType() == cqmf2.CONSOLE_EVENT:
-          self.eventRaised(Agent(event.getAgent()), Data(event.getData(0)), event.getTimestamp(), event.getSeverity())
-
-  ##
-  ## The following methods are intended to be overridden in a sub-class.  They are
-  ## handlers for events that occur on QMF consoles.
-  ##
-
-  #
-  # A new agent, whose attributes match the console's agent filter, has been discovered.
-  #
-  def agentAdded(self, agent):
-    pass
-
-  #
-  # A known agent has been removed from the agent list.  There are two possible reasons
-  # for agent deletion:
-  #
-  #    1) 'aged'   - The agent hasn't been heard from for the maximum age interval and is
-  #                  presumed dead.
-  #    2) 'filter' - The agent no longer matches the console's agent-filter and has been
-  #                  effectively removed from the agent list.  Such occurrences are likely
-  #                  to be seen immediately after setting the filter to a new value.
-  #
-  def agentDeleted(self, agent, reason):
-    pass
-
-  #
-  # An agent-restart was detected.  This occurs when the epoch number advertised by the
-  # agent changes.  It indicates that the agent in question was shut-down/crashed and
-  # restarted.
-  #
-  def agentRestarted(self, agent):
-    pass
-
-  #
-  # The agent has registered new schema information which can now be queried, if desired.
-  #
-  def agentSchemaUpdated(self, agent):
-    pass
-
-  #
-  # An agent raised an event.  The 'data' argument is a Data object that contains the
-  # content of the event.
-  #
-  def eventRaised(self, agent, data, timestamp, severity):
-    pass
-
-
-#===================================================================================================
-# CONSOLE SESSION
-#===================================================================================================
-class ConsoleSession(object):
-  """
-  """
-
-  def __init__(self, connection, options=""):
-    """
-    ## The options string is of the form "{key:value,key:value}".  The following keys are supported:
-    ##
-    ##    domain:NAME                   - QMF Domain to join [default: "default"]
-    ##    max-agent-age:N               - Maximum time, in minutes, that we will tolerate not hearing from
-    ##                                    an agent before deleting it [default: 5]
-    ##    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-    ##                                    If False: Listen only on the routable direct address
-    ##    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-    ##                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-    ##
-    """
-    self._impl = cqmf2.ConsoleSession(connection, options)
-
-  def setDomain(self, domain):
-    """
-    """
-    self._impl.setDomain(domain)
-
-  def setAgentFilter(self, filt):
-    """
-    """
-    self._impl.setAgentFilter(filt)
-
-  def open(self):
-    """
-    """
-    self._impl.open()
-
-  def close(self):
-    """
-    """
-    self._impl.close()
-
-  def getAgents(self):
-    """
-    """
-    result = []
-    count = self._impl.getAgentCount()
-    for i in range(count):
-      result.append(Agent(self._impl.getAgent(i)))
-    return result
-
-  def getConnectedBrokerAgent(self):
-    """
-    """
-    return Agent(self._impl.getConnectedBrokerAgent())
-
-  ## TODO: Async methods
-
-#===================================================================================================
-# AGENT SESSION
-#===================================================================================================
-class AgentSession(object):
-  """
-  """
-
-  def __init__(self, connection, options=""):
-    """
-    ## The options string is of the form "{key:value,key:value}".  The following keys are supported:
-    ##
-    ##    interval:N                 - Heartbeat interval in seconds [default: 60]
-    ##    external:{True,False}      - Use external data storage (queries and subscriptions are pass-through) [default: False]
-    ##    allow-queries:{True,False} - If True:  automatically allow all queries [default]
-    ##                                 If False: generate an AUTH_QUERY event to allow per-query authorization
-    ##    allow-methods:{True,False} - If True:  automatically allow all methods [default]
-    ##                                 If False: generate an AUTH_METHOD event to allow per-method authorization
-    ##    max-subscriptions:N        - Maximum number of concurrent subscription queries permitted [default: 64]
-    ##    min-sub-interval:N         - Minimum publish interval (in milliseconds) permitted for a subscription [default: 3000]
-    ##    sub-lifetime:N             - Lifetime (in seconds with no keepalive) for a subscription [default: 300]
-    ##    public-events:{True,False} - If True:  QMF events are sent to the topic exchange [default]
-    ##                                 If False: QMF events are only sent to authorized subscribers
-    ##    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-    ##                                    If False: Listen only on the routable direct address
-    ##    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-    ##                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-    ##
-    """
-    self._impl = cqmf2.AgentSession(connection, options)
-
-  def setDomain(self, domain):
-    """
-    """
-    self._impl.setDomain(domain)
-
-  def setVendor(self, val):
-    """
-    """
-    self._impl.setVendor(val)
-
-  def setProduct(self, val):
-    """
-    """
-    self._impl.setProduct(val)
-
-  def setInstance(self, val):
-    """
-    """
-    self._impl.setInstance(val)
-
-  def setAttribute(self, key, val):
-    """
-    """
-    self._impl.setAttribute(key, val)
-
-  def open(self):
-    """
-    """
-    self._impl.open()
-
-  def close(self):
-    """
-    """
-    self._impl.close()
-
-  def registerSchema(self, schema):
-    """
-    """
-    self._impl.registerSchema(schema._impl)
-
-  def addData(self, data, name="", persistent=False):
-    """
-    """
-    return DataAddr(self._impl.addData(data._impl, name, persistent))
-
-  def delData(self, addr):
-    """
-    """
-    self._impl.delData(addr._impl)
-
-  def methodSuccess(self, handle):
-    """
-    """
-    self._impl.methodSuccess(handle)
-
-  def raiseException(self, handle, data):
-    """
-    """
-    if data.__class__ == Data:
-      self._impl.raiseException(handle, data._impl)
-    else:
-      self._impl.raiseException(handle, data)
-
-  def raiseEvent(self, data, severity=None):
-    """
-    """
-    if not severity:
-      self._impl.raiseEvent(data._impl)
-    else:
-      if (severity.__class__ != int and severity.__class__ != long) or severity < 0 or severity > 7:
-        raise Exception("Severity must be an int between 0..7")
-      self._impl.raiseEvent(data._impl, severity);
-
-
-#===================================================================================================
-# AGENT PROXY
-#===================================================================================================
-class Agent(object):
-  """
-  """
-
-  def __init__(self, impl):
-    self._impl = impl
-
-  def __repr__(self):
-    return self.getName()
-
-  def getName(self):
-    """
-    """
-    return self._impl.getName()
-
-  def getEpoch(self):
-    """
-    """
-    return self._impl.getEpoch()
-
-  def getVendor(self):
-    """
-    """
-    return self._impl.getVendor()
-
-  def getProduct(self):
-    """
-    """
-    return self._impl.getProduct()
-
-  def getInstance(self):
-    """
-    """
-    return self._impl.getInstance()
-
-  def getAttributes(self):
-    """
-    """
-    return self._impl.getAttributes()
-
-  def query(self, q, timeout=30):
-    """
-    """
-    if q.__class__ == Query:
-      q_arg = q._impl
-    else:
-      q_arg = q
-    dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
-    result = self._impl.query(q_arg, dur)
-    if result.getType() == cqmf2.CONSOLE_EXCEPTION:
-      raise Exception(Data(result.getData(0)))
-    if result.getType() != cqmf2.CONSOLE_QUERY_RESPONSE:
-      raise Exception("Protocol error, expected CONSOLE_QUERY_RESPONSE, got %d" % result.getType())
-    dataList = []
-    count = result.getDataCount()
-    for i in range(count):
-      dataList.append(Data(result.getData(i)))
-    return dataList
-
-  def loadSchemaInfo(self, timeout=30):
-    """
-    """
-    dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
-    self._impl.querySchema(dur)
-
-  def getPackages(self):
-    """
-    """
-    result = []
-    count = self._impl.getPackageCount()
-    for i in range(count):
-      result.append(self._impl.getPackage(i))
-    return result
-
-  def getSchemaIds(self, package):
-    """
-    """
-    result = []
-    count = self._impl.getSchemaIdCount(package)
-    for i in range(count):
-      result.append(SchemaId(self._impl.getSchemaId(package, i)))
-    return result
-
-  def getSchema(self, schemaId, timeout=30):
-    """
-    """
-    dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
-    return Schema(self._impl.getSchema(schemaId._impl, dur))
-
-  ## TODO: Async query
-  ## TODO: Agent method
-
-#===================================================================================================
-# QUERY
-#===================================================================================================
-class Query(object):
-  """
-  """
-
-  def __init__(self, arg1, arg2=None, arg3=None, *kwargs):
-    """
-    """
-    if arg1.__class__ == DataAddr:
-      self._impl = cqmf2.Query(arg1._impl)
-
-  def getAddr(self):
-    """
-    """
-    return DataAddr(self._impl.getDataAddr())
-
-  def getSchemaId(self):
-    """
-    """
-    return SchemaId(self._impl.getSchemaId())
-
-  def getPredicate(self):
-    """
-    """
-    return self._impl.getPredicate()
-
-  def matches(self, data):
-    """
-    """
-    m = data
-    if data.__class__ == Data:
-      m = data.getProperties()
-    return self._impl.matchesPredicate(m)
-
-#===================================================================================================
-# DATA
-#===================================================================================================
-class Data(object):
-  """
-  """
-
-  def __init__(self, arg=None):
-    """
-    """
-    if arg == None:
-      self._impl = cqmf2.Data()
-    elif arg.__class__ == cqmf2.Data:
-      self._impl = arg
-    elif arg.__class__ == Schema:
-      self._impl = cqmf2.Data(arg._impl)
-    else:
-      raise Exception("Unsupported initializer for Data")
-    self._schema = None
-
-  def getSchemaId(self):
-    """
-    """
-    if self._impl.hasSchema():
-      return SchemaId(self._impl.getSchemaId())
-    return None
-
-  def getAddr(self):
-    """
-    """
-    if self._impl.hasAddr():
-      return DataAddr(self._impl.getAddr())
-    return None
-
-  def getAgent(self):
-    """
-    """
-    return Agent(self._impl.getAgent())
-
-  def update(self, timeout=5):
-    dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
-    agent = self._impl.getAgent()
-    query = cqmf2.Query(self._impl.getAddr())
-    result = agent.query(query, dur)
-    if result.getType() != cqmf2.CONSOLE_QUERY_RESPONSE:
-      raise "Update query failed"
-    if result.getDataCount == 0:
-      raise "Object no longer exists on agent"
-    self._impl = cqmf2.Data(result.getData(0))
-
-  def getProperties(self):
-    """
-    """
-    return self._impl.getProperties();
-
-  def _getSchema(self):
-    if not self._schema:
-      if not self._impl.hasSchema():
-        raise Exception("Data object has no schema")
-      self._schema = Schema(self._impl.getAgent().getSchema(self._impl.getSchemaId()))
-
-  def _invoke(self, name, args, kwargs):
-    ##
-    ## Get local copies of the agent and the address of the data object
-    ##
-    agent = self._impl.getAgent()
-    addr = self._impl.getAddr()
-
-    ##
-    ## Set up the timeout duration for the method call.  Set the default and override
-    ## it if the _timeout keyword arg was supplied.
-    ##
-    timeout = 30
-    if '_timeout' in kwargs:
-      timeout = kwargs['_timeout']
-    dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout)
-
-    ##
-    ## Get the list of arguments from the schema, isolate those that are IN or IN_OUT,
-    ## validate that we have the right number of arguments supplied, and marshall them
-    ## into a map for transmission.
-    ##
-    arglist = []
-    methods = self._schema.getMethods()
-    for m in methods:
-      if m.getName() == name:
-        arglist = m.getArguments()
-        break
-    argmap = {}
-    count = 0
-    for a in arglist:
-      if a.getDirection() == DIR_IN or a.getDirection() == DIR_IN_OUT:
-        count += 1
-    if count != len(args):
-      raise Exception("Wrong number of arguments: expected %d, got %d" % (count, len(args)))
-    i = 0
-    for a in arglist:
-      if a.getDirection() == DIR_IN or a.getDirection() == DIR_IN_OUT:
-        argmap[a.getName()] = args[i]
-        i += 1
-
-    ##
-    ## Invoke the method through the agent proxy.
-    ##
-    result = agent.callMethod(name, argmap, addr, dur)
-
-    ##
-    ## If the agent sent an exception, raise it in a QmfAgentException.
-    ##
-    if result.getType() == cqmf2.CONSOLE_EXCEPTION:
-      exdata = result.getData(0)
-      raise QmfAgentException(exdata)
-
-    ##
-    ## If a successful method response was received, collect the output arguments into a map
-    ## and return them to the caller.
-    ##
-    if result.getType() != cqmf2.CONSOLE_METHOD_RESPONSE:
-      raise Exception("Protocol error: Unexpected event type in method-response: %d" % result.getType())
-    return result.getArguments()
-
-  def __getattr__(self, name):
-    ##
-    ## If we have a schema and an address, check to see if this name is the name of a method.
-    ##
-    if self._impl.hasSchema() and self._impl.hasAddr() and self._impl.hasAgent():
-      ##
-      ## Get the schema for the data object.  Note that this call will block if the remote agent
-      ## needs to be queried for the schema (i.e. the schema is not in the local cache).
-      ##
-      self._getSchema()
-      methods = self._schema.getMethods()
-
-      ##
-      ## If the name matches a method in the schema, return a closure to be invoked.
-      ##
-      for method in methods:
-        if name == method.getName():
-          return lambda *args, **kwargs : self._invoke(name, args, kwargs)
-
-    ##
-    ## This is not a method call, return the property matching the name.
-    ##
-    return self._impl.getProperty(name)
-
-  def __setattr__(self, name, value):
-    if name[0] == '_':
-      super.__setattr__(self, name, value)
-      return
-    self._impl.setProperty(name, value)
-
-#===================================================================================================
-# DATA ADDRESS
-#===================================================================================================
-class DataAddr(object):
-  """
-  """
-
-  def __init__(self, arg, agentName=""):
-    if arg.__class__ == dict:
-      self._impl = cqmf2.DataAddr(arg)
-    elif arg.__class__ == cqmf2.DataAddr:
-      self._impl = arg
-    else:
-      self._impl = cqmf2.DataAddr(arg, agentName)
-
-  def __repr__(self):
-    return "%s:%s" % (self.getAgentName(), self.getName())
-
-  def __eq__(self, other):
-    return self.getAgentName() == other.getAgentName() and \
-        self.getName() == other.getName() and \
-        self.getAgentEpoch() == other.getAgentEpoch()
-
-  def asMap(self):
-    """
-    """
-    return self._impl.asMap()
-
-  def getAgentName(self):
-    """
-    """
-    return self._impl.getAgentName()
-
-  def getName(self):
-    """
-    """
-    return self._impl.getName()
-
-  def getAgentEpoch(self):
-    """
-    """
-    return self._impl.getAgentEpoch()
-
-#===================================================================================================
-# SCHEMA ID
-#===================================================================================================
-class SchemaId(object):
-  """
-  """
-
-  def __init__(self, impl):
-    self._impl = impl
-
-  def __repr__(self):
-    return "%s:%s" % (self.getPackageName(), self.getName())
-
-  def getType(self):
-    """
-    """
-    return self._impl.getType()
-
-  def getPackageName(self):
-    """
-    """
-    return self._impl.getPackageName()
-
-  def getName(self):
-    """
-    """
-    return self._impl.getName()
-
-  def getHash(self):
-    """
-    """
-    return self._impl.getHash()
-
-#===================================================================================================
-# SCHEMA
-#===================================================================================================
-class Schema(object):
-  """
-  """
-
-  def __init__(self, stype, packageName=None, className=None, desc=None, sev=None):
-    if stype.__class__ == cqmf2.Schema:
-      self._impl = stype
-    else:
-      self._impl = cqmf2.Schema(stype, packageName, className)
-      if desc:
-        self._impl.setDesc(desc)
-      if sev:
-        self._impl.setDefaultSeverity(sev)
-
-  def __repr__(self):
-    return "QmfSchema:%r" % SchemaId(self._impl.getSchemaId())
-
-  def finalize(self):
-    """
-    """
-    self._impl.finalize()
-
-  def getSchemaId(self):
-    """
-    """
-    return SchemaId(self._impl.getSchemaId())
-
-  def getDesc(self):
-    """
-    """
-    return self._impl.getDesc()
-
-  def getSev(self):
-    """
-    """
-    return self._impl.getDefaultSeverity()
-
-  def addProperty(self, prop):
-    """
-    """
-    self._impl.addProperty(prop._impl)
-
-  def addMethod(self, meth):
-    """
-    """
-    self._impl.addMethod(meth._impl)
-
-  def getProperties(self):
-    """
-    """
-    props = []
-    count = self._impl.getPropertyCount()
-    for i in range(count):
-      props.append(SchemaProperty(self._impl.getProperty(i)))
-    return props
-
-  def getMethods(self):
-    """
-    """
-    meths = []
-    count = self._impl.getMethodCount()
-    for i in range(count):
-      meths.append(SchemaMethod(self._impl.getMethod(i)))
-    return meths
-
-#===================================================================================================
-# SCHEMA PROPERTY
-#===================================================================================================
-class SchemaProperty(object):
-  """
-  """
-
-  def __init__(self, name, dtype=None, **kwargs):
-    """
-    """
-    if name.__class__ == cqmf2.SchemaProperty:
-      self._impl = name
-    else:
-      self._impl = cqmf2.SchemaProperty(name, dtype)
-      if 'access' in kwargs:
-        self._impl.setAccess(kwargs['access'])
-      if 'index' in kwargs:
-        self._impl.setIndex(kwargs['index'])
-      if 'optional' in kwargs:
-        self._impl.setOptional(kwargs['optional'])
-      if 'unit' in kwargs:
-        self._impl.setUnit(kwargs['unit'])
-      if 'desc' in kwargs:
-        self._impl.setDesc(kwargs['desc'])
-      if 'subtype' in kwargs:
-        self._impl.setSubtype(kwargs['subtype'])
-      if 'direction' in kwargs:
-        self._impl.setDirection(kwargs['direction'])
-
-  def __repr__(self):
-    return self._impl.getName()
-
-  def getName(self):
-    """
-    """
-    return self._impl.getName()
-
-  def getType(self):
-    """
-    """
-    return self._impl.getType()
-
-  def getAccess(self):
-    """
-    """
-    return self._impl.getAccess()
-
-  def isIndex(self):
-    """
-    """
-    return self._impl.isIndex()
-
-  def isOptional(self):
-    """
-    """
-    return self._impl.isOptional()
-
-  def getUnit(self):
-    """
-    """
-    return self._impl.getUnit()
-
-  def getDesc(self):
-    """
-    """
-    return self._impl.getDesc()
-
-  def getSubtype(self):
-    """
-    """
-    return self._impl.getSubtype()
-
-  def getDirection(self):
-    """
-    """
-    return self._impl.getDirection()
-
-#===================================================================================================
-# SCHEMA METHOD
-#===================================================================================================
-class SchemaMethod(object):
-  """
-  """
-
-  def __init__(self, name, **kwargs):
-    """
-    """
-    if name.__class__ == cqmf2.SchemaMethod:
-      self._impl = name
-    else:
-      self._impl = cqmf2.SchemaMethod(name)
-      if 'desc' in kwargs:
-        self._impl.setDesc(kwargs['desc'])
-
-  def __repr__(self):
-    return "%s()" % self._impl.getName()
-
-  def getName(self):
-    """
-    """
-    return self._impl.getName()
-
-  def getDesc(self):
-    """
-    """
-    return self._impl.getDesc()
-
-  def addArgument(self, arg):
-    """
-    """
-    self._impl.addArgument(arg._impl)
-
-  def getArguments(self):
-    """
-    """
-    result = []
-    count = self._impl.getArgumentCount()
-    for i in range(count):
-      result.append(SchemaProperty(self._impl.getArgument(i)))
-    return result
-
diff --git a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
deleted file mode 100644
index 74fe777..0000000
--- a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
+++ /dev/null
@@ -1,50 +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.
-#
-
-##------------------------------------------------------
-## Use Swig to generate a literal binding to the C++ API
-##------------------------------------------------------
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ruby.i PROPERTIES
-    CPLUSPLUS ON
-    SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
-
-if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-  set (RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_PATH})
-endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-
-include_directories(${RUBY_INCLUDE_DIRS}
-                    ${qpid-cpp_SOURCE_DIR}/include
-                    ${qpid-cpp_SOURCE_DIR}/bindings)
-
-list(APPEND SWIG_MODULE_cqmf2_ruby_EXTRA_DEPS
-    ${CMAKE_SOURCE_DIR}/include/qmf/qmf2.i
-    ${CMAKE_SOURCE_DIR}/include/qpid/swig_ruby_typemaps.i
-)
-swig_add_module(cqmf2_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
-swig_link_libraries(cqmf2_ruby qmf2 qpidmessaging qpidtypes ${RUBY_LIBRARY})
-
-##----------------------------------
-## Install the complete Ruby binding
-##----------------------------------
-install(TARGETS ${SWIG_MODULE_cqmf2_ruby_REAL_NAME}
-      RENAME cqmf2.so
-      DESTINATION ${RUBY_PFX_ARCH_DIR}
-      COMPONENT ${QPID_COMPONENT_CLIENT}
-)
-
diff --git a/qpid/cpp/bindings/qmf2/ruby/qmf2.rb b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
deleted file mode 100644
index b38aeae..0000000
--- a/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
+++ /dev/null
@@ -1,857 +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.
-#
-
-warn 'The qmf2 module is deprecated.  It will be removed in the future.'
-
-require 'cqmf2'
-require 'cqpid'
-require 'thread'
-require 'socket'
-require 'monitor'
-
-module Qmf2
-
-  Cqmf2.constants.each do |c|
-    if c.index('AGENT_') == 0 or c.index('CONSOLE_') == 0 or
-        c.index('SCHEMA_') == 0 or c.index('SEV_') == 0 or c.index('QUERY') == 0
-      const_set(c, Cqmf2.const_get(c))
-    end
-  end
-
-  SCHEMA_TYPE_DATA  = Cqmf2::SCHEMA_TYPE_DATA()
-  SCHEMA_TYPE_EVENT = Cqmf2::SCHEMA_TYPE_EVENT()
-
-  SCHEMA_DATA_VOID   = Cqmf2::SCHEMA_DATA_VOID()
-  SCHEMA_DATA_BOOL   = Cqmf2::SCHEMA_DATA_BOOL()
-  SCHEMA_DATA_INT    = Cqmf2::SCHEMA_DATA_INT()
-  SCHEMA_DATA_FLOAT  = Cqmf2::SCHEMA_DATA_FLOAT()
-  SCHEMA_DATA_STRING = Cqmf2::SCHEMA_DATA_STRING()
-  SCHEMA_DATA_MAP    = Cqmf2::SCHEMA_DATA_MAP()
-  SCHEMA_DATA_LIST   = Cqmf2::SCHEMA_DATA_LIST()
-  SCHEMA_DATA_UUID   = Cqmf2::SCHEMA_DATA_UUID()
-
-  ACCESS_READ_CREATE = Cqmf2::ACCESS_READ_CREATE()
-  ACCESS_READ_WRITE  = Cqmf2::ACCESS_READ_WRITE()
-  ACCESS_READ_ONLY   = Cqmf2::ACCESS_READ_ONLY()
-
-  DIR_IN     = Cqmf2::DIR_IN()
-  DIR_OUT    = Cqmf2::DIR_OUT()
-  DIR_IN_OUT = Cqmf2::DIR_IN_OUT()
-
-  SEV_EMERG  = Cqmf2::SEV_EMERG()
-  SEV_ALERT  = Cqmf2::SEV_ALERT()
-  SEV_CRIT   = Cqmf2::SEV_CRIT()
-  SEV_ERROR  = Cqmf2::SEV_ERROR()
-  SEV_WARN   = Cqmf2::SEV_WARN()
-  SEV_NOTICE = Cqmf2::SEV_NOTICE()
-  SEV_INFORM = Cqmf2::SEV_INFORM()
-  SEV_DEBUG  = Cqmf2::SEV_DEBUG()
-
-  ##==============================================================================
-  ## EXCEPTIONS
-  ##==============================================================================
-
-  class QmfAgentException < RuntimeError
-    attr :data
-
-    def initialize(data)
-      @data = data
-    end
-
-    def to_s
-      "QmfAgentException: #{@data}"
-    end
-  end
-
-  ##==============================================================================
-  ## AGENT HANDLER
-  ##==============================================================================
-
-  class AgentHandler
-
-    def initialize(session)
-      @_session = session
-      @_running = false
-      @_thread  = nil
-    end
-
-    ##
-    ## Call the "start" method to run the handler on a new thread.
-    ##
-    def start
-      @_thread = Thread.new do
-        run
-      end
-    end
-
-    ##
-    ## Request that the running thread complete and exit.
-    ##
-    def cancel
-      @_running = false
-      @_thread.join if @_thread
-      @_thread = nil
-    end
-
-    ##
-    ## Call the "run" method only if you want the handler to run on your own thread.
-    ##
-    def run
-      @_running = true
-      event = Cqmf2::AgentEvent.new
-      while @_running do
-        valid = @_session.impl.nextEvent(event, Cqpid::Duration.SECOND)
-        if valid and @_running
-          case event.getType
-          when Cqmf2::AGENT_AUTH_QUERY
-            yes = authorize_query(Query.new(event.getQuery()), event.getUserId())
-            if yes == true
-              @_session.impl.authAccept(event)
-            else
-              @_session.impl.authReject(event)
-            end
-
-          when Cqmf2::AGENT_QUERY
-            context = QueryContext.new(@_session, event)
-            get_query(context, Query.new(event.getQuery()), event.getUserId())
-
-          when Cqmf2::AGENT_METHOD
-            context = MethodContext.new(@_session, event)
-            begin
-              method_call(context, event.getMethodName(), event.getDataAddr(), event.getArguments(), event.getUserId())
-            rescue Exception => ex
-              @_session.impl.raiseException(event, "#{ex}")
-            end
-
-          end
-        end
-      end
-    end
-
-
-    ##
-    ## The following methods are intended to be overridden in a sub-class.  They are
-    ## handlers for events that occur on QMF consoles.
-    ##
-
-    #
-    # This method will only be invoked if the "allow-queries" option is enabled on the
-    # agent session.  When invoked, it provides the query and the authenticated user-id
-    # of the querying client.
-    #
-    # This method must return true if the query is permitted, false otherwise.
-    #
-    def authorize_query(query, user_id); end
-
-    #
-    # This method will only be invoked if the "external" option is "True" on the agent
-    # session.  When invoked, the method should begin the process of responding to a data
-    # query.  The authenticated user-id of the requestor is provided for informational
-    # purposes.  The 'context' variable is used to provide the results back to the requestor.
-    #
-    # For each matching Data object, call context.response(data).  When the query is complete,
-    # call context.complete().  After completing the query, you should not use 'context' any
-    # longer.
-    #
-    # Note: It is not necessary to process the query synchronously.  If desired, this method
-    # may store the context for asynchronous processing or pass it to another thread for
-    # processing.  There is no restriction on the number of contexts that may be in-flight
-    # concurrently.
-    #
-    def get_query(context, query, user_id); end
-
-    #
-    # This method is invoked when a console calls a QMF method on the agent.  Supplied are
-    # a context for the response, the method name, the data address of the data object being
-    # called, the input arguments (a dictionary), and the caller's authenticated user-id.
-    #
-    # A method call can end one of two ways:  Successful completion, in which the output
-    # arguments (if any) are supplied; and Exceptional completion if there is an error.
-    #
-    # Successful Completion:
-    #    For each output argument, assign the value directly to context (context.arg1 = "value")
-    #    Once arguments are assigned, call context._success().
-    #
-    # Exceptional Completion:
-    #    Method 1:  Call context._exception(data) where 'data' is a string or a Data object.
-    #    Method 2:  Raise an exception (raise "Error Text") synchronously in the method body.
-    #
-    # Note: Like get_query, method_call may process methods synchronously or asynchronously.
-    # This method may store the context for later asynchronous processing.  There is no
-    # restriction on the number of contexts that may be in-flight concurrently.
-    #
-    # However, "Method 2" for Exceptional Completion can only be done synchronously.
-    #
-    def method_call(context, method_name, data_addr, args, user_id); end
-  end
-
-  class QueryContext
-    def initialize(agent, context)
-      @agent = agent
-      @context = context
-    end
-
-    def response(data)
-      @agent.impl.response(@context, data.impl)
-    end
-
-    def complete
-      @agent.impl.complete(@context)
-    end
-  end
-
-  class MethodContext
-    def initialize(agent, context)
-      @agent = agent
-      @context = context
-    end
-
-    def _success
-      @agent.impl.methodSuccess(@context)
-    end
-
-    def _exception(ex)
-      if ex.class == Data
-        @agent.impl.raiseException(@context, ex.impl)
-      else
-        @agent.impl.raiseException(@context, ex)
-      end
-    end
-
-    def method_missing(name_in, *args)
-      name = name_in.to_s
-      if name[name.length - 1] == 61
-        name = name[0..name.length - 2]
-        @context.impl.addReturnArgument(name, args[0])
-      else
-        super.method_missing(name_in, args)
-      end
-    end
-  end
-
-  ##==============================================================================
-  ## CONSOLE HANDLER
-  ##==============================================================================
-
-  class ConsoleHandler
-
-    def initialize(session)
-      @_session = session
-      @_running = false
-      @_thread  = nil
-    end
-
-    ##
-    ## Call the "start" method to run the handler on a new thread.
-    ##
-    def start
-      @_thread = Thread.new do
-        run
-      end
-    end
-
-    ##
-    ## Request that the running thread complete and exit.
-    ##
-    def cancel
-      @_running = false
-      @_thread.join if @_thread
-      @_thread = nil
-    end
-
-    ##
-    ## Call the "run" method only if you want the handler to run on your own thread.
-    ##
-    def run
-      @_running = true
-      event = Cqmf2::ConsoleEvent.new
-      while @_running do
-        valid = @_session.impl.nextEvent(event, Cqpid::Duration.SECOND)
-        if valid and @_running
-          case event.getType
-          when Cqmf2::CONSOLE_AGENT_ADD
-            agent_added(Agent.new(event.getAgent))
-
-          when Cqmf2::CONSOLE_AGENT_DEL
-            reason = :filter
-            reason = :aged if event.getAgentDelReason == Cqmf2::AGENT_DEL_AGED
-            agent_deleted(Agent.new(event.getAgent), reason)
-
-          when Cqmf2::CONSOLE_AGENT_RESTART
-            agent_restarted(Agent.new(event.getAgent))
-
-          when Cqmf2::CONSOLE_AGENT_SCHEMA_UPDATE
-            agent_schema_updated(Agent.new(event.getAgent))
-
-          when Cqmf2::CONSOLE_EVENT
-            event_raised(Agent.new(event.getAgent), Data.new(event.getData(0)), event.getTimestamp, event.getSeverity)
-
-          end
-        end
-      end
-    end
-
-
-    ##
-    ## The following methods are intended to be overridden in a sub-class.  They are
-    ## handlers for events that occur on QMF consoles.
-    ##
-
-    #
-    # A new agent, whose attributes match the console's agent filter, has been discovered.
-    #
-    def agent_added(agent); end
-
-    #
-    # A known agent has been removed from the agent list.  There are two possible reasons
-    # for agent deletion:
-    #
-    #    1) :aged   - The agent hasn't been heard from for the maximum age interval and is
-    #                 presumed dead.
-    #    2) :filter - The agent no longer matches the console's agent-filter and has been
-    #                 effectively removed from the agent list.  Such occurrences are likely
-    #                 to be seen immediately after setting the filter to a new value.
-    #
-    def agent_deleted(agent, reason); end
-
-    #
-    # An agent-restart was detected.  This occurs when the epoch number advertised by the
-    # agent changes.  It indicates that the agent in question was shut-down/crashed and
-    # restarted.
-    #
-    def agent_restarted(agent); end
-
-    #
-    # The agent has registered new schema information which can now be queried, if desired.
-    #
-    def agent_schema_updated(agent); end
-
-    #
-    # An agent raised an event.  The 'data' argument is a Data object that contains the
-    # content of the event.
-    #
-    def event_raised(agent, data, timestamp, severity); end
-  end
-
-  ##==============================================================================
-  ## CONSOLE SESSION
-  ##==============================================================================
-
-  class ConsoleSession
-    attr_reader :impl
-
-    ## The options string is of the form "{key:value,key:value}".  The following keys are supported:
-    ##
-    ##    domain:NAME                   - QMF Domain to join [default: "default"]
-    ##    max-agent-age:N               - Maximum time, in minutes, that we will tolerate not hearing from
-    ##                                    an agent before deleting it [default: 5]
-    ##    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-    ##                                    If False: Listen only on the routable direct address
-    ##    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-    ##                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-    ##
-    def initialize(connection, options="")
-      @impl = Cqmf2::ConsoleSession.new(connection, options)
-    end
-
-    def set_domain(domain)        @impl.setDomain(domain)      end
-    def set_agent_filter(filter)  @impl.setAgentFilter(filter) end
-
-    def open()   @impl.open  end
-    def close()  @impl.close  end
-
-    def agents
-      result = []
-      count = @impl.getAgentCount
-      for i in 0...count
-        result << Agent.new(@impl.getAgent(i))
-      end
-      return result
-    end
-
-    def connected_broker_agent
-      Agent.new(@impl.getConnectedBrokerAgent)
-    end
-  end
-
-  ##==============================================================================
-  ## AGENT SESSION
-  ##==============================================================================
-
-  class AgentSession
-    attr_reader :impl
-
-    ## The options string is of the form "{key:value,key:value}".  The following keys are supported:
-    ##
-    ##    interval:N                 - Heartbeat interval in seconds [default: 60]
-    ##    external:{True,False}      - Use external data storage (queries and subscriptions are pass-through) [default: False]
-    ##    allow-queries:{True,False} - If True:  automatically allow all queries [default]
-    ##                                 If False: generate an AUTH_QUERY event to allow per-query authorization
-    ##    allow-methods:{True,False} - If True:  automatically allow all methods [default]
-    ##                                 If False: generate an AUTH_METHOD event to allow per-method authorization
-    ##    max-subscriptions:N        - Maximum number of concurrent subscription queries permitted [default: 64]
-    ##    min-sub-interval:N         - Minimum publish interval (in milliseconds) permitted for a subscription [default: 3000]
-    ##    sub-lifetime:N             - Lifetime (in seconds with no keepalive) for a subscription [default: 300]
-    ##    public-events:{True,False} - If True:  QMF events are sent to the topic exchange [default]
-    ##                                 If False: QMF events are only sent to authorized subscribers
-    ##    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-    ##                                    If False: Listen only on the routable direct address
-    ##    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-    ##                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-    ##
-    def initialize(connection, options="")
-      @impl = Cqmf2::AgentSession.new(connection, options)
-    end
-
-    def set_domain(val)         @impl.setDomain(val)           end
-    def set_vendor(val)         @impl.setVendor(val)           end
-    def set_product(val)        @impl.setProduct(val)          end
-    def set_instance(val)       @impl.setInstance(val)         end
-    def set_attribute(key, val) @impl.setAttribute(key, val)   end
-    def open()                  @impl.open                     end
-    def close()                 @impl.close                    end
-    def register_schema(cls)    @impl.registerSchema(cls.impl) end
-
-    def add_data(data, name="", persistent=false)
-      DataAddr.new(@impl.addData(data.impl, name, persistent))
-    end
-
-    def del_data(addr)
-      @impl.del_data(addr.impl)
-    end
-
-    def raise_event(data, severity=nil)
-      if !severity
-        @impl.raiseEvent(data.impl)
-      else
-        @impl.raiseEvent(data.impl, severity)
-      end
-    end
-  end
-
-  ##==============================================================================
-  ## AGENT PROXY
-  ##==============================================================================
-
-  class Agent
-    attr_reader :impl
-
-    def initialize(impl)
-      @impl = impl
-    end
-
-    def name()       @impl.getName        end
-    def epoch()      @impl.getEpoch       end
-    def vendor()     @impl.getVendor      end
-    def product()    @impl.getProduct     end
-    def instance()   @impl.getInstance    end
-    def attributes() @impl.getAttributes  end
-
-    def to_s
-      "#{vendor}:#{product}:#{instance}"
-    end
-
-    def query(q, timeout=30)
-      if q.class == Query
-        q_arg = q.impl
-      else
-        q_arg = q
-      end
-      dur = Cqpid::Duration.new(Cqpid::Duration.SECOND.getMilliseconds * timeout)
-      result = @impl.query(q_arg, dur)
-      raise QmfAgentException.new(Data.new(result.getData(0))) if result.getType == Cqmf2::CONSOLE_EXCEPTION
-      raise "Protocol error, expected CONSOLE_QUERY_RESPONSE, got #{result.getType}" if result.getType != Cqmf2::CONSOLE_QUERY_RESPONSE
-      data_list = []
-      count = result.getDataCount
-      for i in 0...count
-        data_list << Data.new(result.getData(i))
-      end
-      return data_list
-    end
-
-    def load_schema_info(timeout=30)
-      dur = Cqpid::Duration.new(Cqpid::Duration.SECOND.getMilliseconds * timeout)
-      @impl.querySchema(dur)
-    end
-
-    def packages
-      result = []
-      count = @impl.getPackageCount
-      for i in 0...count
-        result << @impl.getPackage(i)
-      end
-      return result
-    end
-
-    def schema_ids(package)
-      result = []
-      count = @impl.getSchemaIdCount(package)
-      for i in 0...count
-        result << SchemaId.new(@impl.getSchemaId(package, i))
-      end
-      return result
-    end
-
-    def schema(sid, timeout=30)
-      dur = Cqpid::Duration.new(Cqpid::Duration.SECOND.getMilliseconds * timeout)
-      Schema.new(@impl.getSchema(sid.impl, dur))
-    end
-  end
-
-  ##==============================================================================
-  ## QUERY
-  ##==============================================================================
-
-  class Query
-    attr_reader :impl
-    def initialize(arg1, arg2=nil, arg3=nil)
-      if arg1.class == Qmf2::DataAddr
-        @impl = Cqmf2::Query.new(arg1.impl)
-      end
-    end
-
-    def addr()      DataAddr.new(@impl.getDataAddr())  end
-    def schema_id() SchemaId.new(@impl.getSchemaId())  end
-    def predicate() @impl.getPredicate()               end
-
-    def matches?(data)
-      map = data
-      map = data.properties if data.class == Data
-      @impl.matchesPredicate(map)
-    end
-  end
-
-  ##==============================================================================
-  ## DATA
-  ##==============================================================================
-
-  class Data
-    attr_reader :impl
-
-    def initialize(arg=nil)
-      @schema = nil
-      if arg == nil
-        @impl = Cqmf2::Data.new
-      elsif arg.class == Cqmf2::Data
-        @impl = arg
-      elsif arg.class == Schema
-        @impl = Cqmf2::Data.new(arg.impl)
-        @schema = arg
-      else
-        raise "Unsupported initializer for Data"
-      end
-    end
-
-    def to_s
-      "#{@impl.getProperties}"
-    end
-
-    def schema_id
-      if @impl.hasSchema
-        return SchemaId.new(@impl.getSchemaId)
-      end
-      return nil
-    end
-
-    def set_addr(addr)
-      @impl.setAddr(addr.impl)
-    end
-
-    def addr
-      if @impl.hasAddr
-        return DataAddr.new(@impl.getAddr)
-      end
-      return nil
-    end
-
-    def agent
-      return Agent.new(@impl.getAgent)
-    end
-
-    def update(timeout=5)
-      dur = Cqpid::Duration.new(Cqpid::Duration.SECOND.getMilliseconds * timeout)
-      agent = @impl.getAgent
-      query = Cqmf2::Query.new(@impl.getAddr)
-      result = agent.query(query, dur)
-      raise "Update query failed" if result.getType != Cqmf2::CONSOLE_QUERY_RESPONSE
-      raise "Object no longer exists on agent" if result.getDataCount == 0
-      @impl = Cqmf2::Data.new(result.getData(0))
-      return nil
-    end
-
-    def properties
-      return @impl.getProperties
-    end
-
-    def get_attr(name)
-      @impl.getProperty(name)
-    end
-
-    def set_attr(name, v)
-      @impl.setProperty(name, v)
-    end
-
-    def [](name)
-      get_attr(name)
-    end
-
-    def []=(name, value)
-      set_attr(name, value)
-    end
-
-    def _get_schema
-      unless @schema
-        raise "Data object has no schema" unless @impl.hasSchema
-        @schema = Schema.new(@impl.getAgent.getSchema(@impl.getSchemaId))
-      end
-    end
-
-    def method_missing(name_in, *args)
-      #
-      # Convert the name to a string and determine if it represents an
-      # attribute assignment (i.e. "attr=")
-      #
-      name = name_in.to_s
-      attr_set = (name[name.length - 1] == 61)
-      name = name[0..name.length - 2] if attr_set
-
-      #
-      # We'll be needing the schema to determine how to proceed.  Get the schema.
-      # Note that this call may block if the remote agent needs to be queried
-      # for the schema (i.e. the schema isn't in the local cache).
-      #
-      _get_schema
-
-      #
-      # If the name matches a property name, set or return the value of the property.
-      #
-      @schema.properties.each do |prop|
-        if prop.name == name
-          if attr_set
-            return set_attr(name, args[0])
-          else
-            return get_attr(name)
-          end
-        end
-      end
-
-      #
-      # If we still haven't found a match for the name, check to see if
-      # it matches a method name.  If so, marshall the arguments and invoke
-      # the method.
-      #
-      @schema.methods.each do |method|
-        if method.name == name
-          raise "Sets not permitted on methods" if attr_set
-          result = @impl.getAgent.callMethod(name, _marshall(method, args), @impl.getAddr)
-          if result.getType == Cqmf2::CONSOLE_EXCEPTION
-            raise QmfAgentException, result.getData(0)
-          end
-          return result.getArguments
-        end
-      end
-
-      #
-      # This name means nothing to us, pass it up the line to the parent
-      # class's handler.
-      #
-      super.method_missing(name_in, args)
-    end
-
-    #
-    # Convert a Ruby array of arguments (positional) into a Value object of type "map".
-    #
-    private
-    def _marshall(schema, args)
-      count = 0
-      schema.arguments.each do |arg|
-        if arg.direction == DIR_IN || arg.direction == DIR_IN_OUT
-          count += 1
-        end
-      end
-      raise "Wrong number of arguments: expecter #{count}, got #{arge.length}" if count != args.length
-      map = {}
-      count = 0
-      schema.arguments.each do |arg|
-        if arg.direction == DIR_IN || arg.direction == DIR_IN_OUT
-          map[arg.name] = args[count]
-          count += 1
-        end
-      end
-      return map
-    end
-  end
-
-  ##==============================================================================
-  ## DATA ADDRESS
-  ##==============================================================================
-
-  class DataAddr
-    attr_reader :impl
-
-    def initialize(arg, agentName="")
-      if arg.class == Hash
-        @impl = Cqmf2::DataAddr.new(arg)
-      elsif arg.class == Cqmf2::DataAddr
-        @impl = arg
-      else
-        @impl = Cqmf2::DataAddr.new(arg, agentName)
-      end
-    end
-
-    def ==(other)
-      return @impl == other.impl
-    end
-
-    def as_map()       @impl.asMap          end
-    def agent_name()   @impl.getAgentName   end
-    def name()         @impl.getName        end
-    def agent_epoch()  @impl.getAgentEpoch  end
-  end
-
-  ##==============================================================================
-  ## SCHEMA ID
-  ##==============================================================================
-
-  class SchemaId
-    attr_reader :impl
-    def initialize(impl)
-      @impl = impl
-    end
-
-    def type()         @impl.getType         end
-    def package_name() @impl.getPackageName  end
-    def class_name()   @impl.getName         end
-    def hash()         @impl.getHash         end
-  end
-
-  ##==============================================================================
-  ## SCHEMA
-  ##==============================================================================
-
-  class Schema
-    attr_reader :impl
-    def initialize(arg, packageName="", className="", kwargs={})
-      if arg.class == Cqmf2::Schema
-        @impl = arg
-      else
-        @impl = Cqmf2::Schema.new(arg, packageName, className)
-        @impl.setDesc(kwargs[:desc]) if kwargs.include?(:desc)
-        @impl.setDefaultSeverity(kwargs[:sev]) if kwargs.include?(:sev)
-      end
-    end
-
-    def finalize()         @impl.finalize                   end
-    def schema_id()        SchemaId.new(@impl.getSchemaId)  end
-    def desc()             @impl.getDesc                    end
-    def sev()              @impl.getDefaultSeverity         end
-    def add_property(prop) @impl.addProperty(prop.impl)     end
-    def add_method(meth)   @impl.addMethod(meth.impl)       end
-
-    def properties
-      result = []
-      count = @impl.getPropertyCount
-      for i in 0...count
-        result << SchemaProperty.new(@impl.getProperty(i))
-      end
-      return result
-    end
-
-    def methods
-      result = []
-      count = @impl.getMethodCount
-      for i in 0...count
-        result << SchemaMethod.new(@impl.getMethod(i))
-      end
-      return result
-    end
-  end
-
-  ##==============================================================================
-  ## SCHEMA PROPERTY
-  ##==============================================================================
-
-  class SchemaProperty
-    attr_reader :impl
-
-    def initialize(arg, dtype=nil, kwargs={})
-      if arg.class == Cqmf2::SchemaProperty
-        @impl = arg
-      else
-        @impl = Cqmf2::SchemaProperty.new(arg, dtype)
-        @impl.setAccess(kwargs[:access])       if kwargs.include?(:access)
-        @impl.setIndex(kwargs[:index])         if kwargs.include?(:index)
-        @impl.setOptional(kwargs[:optional])   if kwargs.include?(:optional)
-        @impl.setUnit(kwargs[:unit])           if kwargs.include?(:unit)
-        @impl.setDesc(kwargs[:desc])           if kwargs.include?(:desc)
-        @impl.setSubtype(kwargs[:subtype])     if kwargs.include?(:subtype)
-        @impl.setDirection(kwargs[:direction]) if kwargs.include?(:direction)
-      end
-    end
-
-    def name()       @impl.getName       end
-    def access()     @impl.getAccess     end 
-    def index?()     @impl.isIndex       end
-    def optional?()  @impl.isOptional    end
-    def unit()       @impl.getUnit       end
-    def desc()       @impl.getDesc       end
-    def subtype()    @impl.getSubtype    end
-    def direction()  @impl.getDirection  end
-
-    def to_s
-      name
-    end
-  end
-
-  ##==============================================================================
-  ## SCHEMA METHOD
-  ##==============================================================================
-
-  class SchemaMethod
-    attr_reader :impl
-
-    def initialize(arg, kwargs={})
-      if arg.class == Cqmf2::SchemaMethod
-        @impl = arg
-      else
-        @impl = Cqmf2::SchemaMethod.new(arg)
-        @impl.setDesc(kwargs[:desc]) if kwargs.include?(:desc)
-      end
-    end
-
-    def name()  @impl.getName  end
-    def desc()  @impl.getDesc  end
-    def add_argument(arg)  @impl.addArgument(arg.impl)  end
-
-    def arguments
-      result = []
-      count = @impl.getArgumentCount
-      for i in 0...count
-        result << SchemaProperty.new(@impl.getArgument(i))
-      end
-      return result
-    end
-
-    def to_s
-      name
-    end
-  end
-end
-
-
diff --git a/qpid/cpp/bindings/qmf2/ruby/ruby.i b/qpid/cpp/bindings/qmf2/ruby/ruby.i
deleted file mode 100644
index 65d0770..0000000
--- a/qpid/cpp/bindings/qmf2/ruby/ruby.i
+++ /dev/null
@@ -1,37 +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.
- */
-
-%module cqmf2
-/* Ruby doesn't have a != operator*/
-#pragma SWIG nowarn=378
-%include "std_string.i"
-%include "qpid/swig_ruby_typemaps.i"
-
-/* Define the general-purpose exception handling */
-%exception {
-    try {
-        $action
-    }
-    catch (qpid::types::Exception& mex) {
-        static VALUE qmferror = rb_define_class("QmfError", rb_eStandardError);
-        rb_raise(qmferror, "%s", mex.what());
-    }
-}
-
-%include "qmf/qmf2.i"
diff --git a/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt b/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
deleted file mode 100644
index 2690912..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
+++ /dev/null
@@ -1,206 +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.
-#
-
-# Configure Visual Studio version-specific files into build tree
-
-MACRO (select_msvc9_files)
-    set (sln_proj_SOURCES
-        examples/msvc9/csharp.example.drain/csharp.example.drain.csproj
-        examples/msvc9/csharp.example.spout/csharp.example.spout.csproj
-        examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
-        examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj
-        msvc9/org.apache.qpid.messaging.sessionreceiver.sln
-        msvc9/org.apache.qpid.messaging.sln
-        src/msvc9/org.apache.qpid.messaging.vcproj
-        src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj
-        test/messaging.test/msvc9/messaging.test.csproj
-        winsdk_sources/msvc9/winsdk_dotnet_examples.sln
-        winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
-        winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj
-        winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj
-        winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
-        winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj
-        winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
-        winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj
-        winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj
-        winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
-        winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
-        winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj
-        winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj)
-
-    # Base path from any example project
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/examples/msvc9/csharp.direct.receiver" DOTNET_src)
-    # to source root
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToSrc ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSrc} DOTNET_exampleRelPathToSrc)
-
-    # to org.apache.qpid.messaging.dll through a project reference
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/msvc9/org.apache.qpid.messaging.vcxproj" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToBindingProj ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToBindingProj} DOTNET_exampleRelPathToBindingProj)
-
-    # to org.apache.qpid.messaging.sessionreceiver.dll through a project reference
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToSessionreceiverProj ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSessionreceiverProj} DOTNET_exampleRelPathToSessionreceiverProj)
-
-    # to app.config file
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples/msvc9/app.config" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToAppConfig ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToAppConfig} DOTNET_exampleRelPathToAppConfig)
-ENDMACRO (select_msvc9_files)
-
-MACRO (select_msvcx_files)
-    set (sln_proj_SOURCES
-        examples/msvcx/csharp.example.drain/csharp.example.drain.csproj
-        examples/msvcx/csharp.example.spout/csharp.example.spout.csproj
-        examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
-        examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj
-        msvcx/org.apache.qpid.messaging.sessionreceiver.sln
-        msvcx/org.apache.qpid.messaging.sln
-        src/msvcx/org.apache.qpid.messaging.vcxproj
-        src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj
-        test/messaging.test/msvcx/messaging.test.csproj
-        winsdk_sources/msvcx/winsdk_dotnet_examples.sln
-        winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
-        winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj
-        winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj
-        winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj
-        winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj
-        winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj
-        winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj
-        winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj
-        winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
-        winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
-        winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj
-        winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj)
-
-    # Base path from any example project
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/examples/msvcx/csharp.direct.receiver" DOTNET_src)
-    # to source root
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToSrc ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSrc} DOTNET_exampleRelPathToSrc)
-
-    # to org.apache.qpid.messaging.dll through a project reference
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/msvcx/org.apache.qpid.messaging.vcxproj" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToBindingProj ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToBindingProj} DOTNET_exampleRelPathToBindingProj)
-
-    # to org.apache.qpid.messaging.sessionreceiver.dll through a project reference
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_BINARY_DIR}/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToSessionreceiverProj ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToSessionreceiverProj} DOTNET_exampleRelPathToSessionreceiverProj)
-
-    # to app.config file
-    file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/examples/msvcx/app.config" DOTNET_tgt)
-    file(RELATIVE_PATH DOTNET_exampleRelPathToAppConfig ${DOTNET_src} ${DOTNET_tgt})
-    file(TO_NATIVE_PATH ${DOTNET_exampleRelPathToAppConfig} DOTNET_exampleRelPathToAppConfig)
-ENDMACRO (select_msvcx_files)
-
-MACRO (configure_example_project msvc9_or_x name guid)
-    set(DOTNET_projectName ${name})
-    set(DOTNET_projectGuid ${guid})
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/examples/${msvc9_or_x}/anyproject.csproj.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/examples/${msvc9_or_x}/${DOTNET_projectName}/${DOTNET_projectName}.csproj)
-ENDMACRO (configure_example_project DOTNET_projectName DOTNET_projectGuid)
-
-MACRO (configure_example_projects msvc9_or_x)
-    configure_example_project(${msvc9_or_x} "csharp.direct.receiver"        "52F880E7-D677-4C91-8516-D679CE0F46A8")
-    configure_example_project(${msvc9_or_x} "csharp.direct.sender"          "7B71CE78-8E78-4632-ADBE-F4D5DFAE0068")
-    configure_example_project(${msvc9_or_x} "csharp.example.client"         "0DE01712-C2D1-4CA4-B42C-5856456A8696")
-    configure_example_project(${msvc9_or_x} "csharp.example.declare_queues" "E31B349C-830C-4583-8BD9-30DA4398349F")
-    configure_example_project(${msvc9_or_x} "csharp.example.helloworld"     "8CC1C265-0507-44A3-9483-8FAF48513F4D")
-    configure_example_project(${msvc9_or_x} "csharp.example.server"         "090A081D-E8B5-4949-AA43-EE182B7101E3")
-    configure_example_project(${msvc9_or_x} "csharp.map.receiver"           "AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9")
-    configure_example_project(${msvc9_or_x} "csharp.map.sender"             "5D8252F5-E1D3-44A0-94C7-7CB75E843C10")
-ENDMACRO (configure_example_projects msvc9_or_x)
-
-if (MSVC)
-    # Source and binary folders must be on the same drive so that
-    # relative paths between the two are possible.
-    # Note that this is for the DOTNET binding only and does not apply to the qpid-cpp main build.
-    string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} 0 1 srcDriveLetter)
-    string(SUBSTRING ${CMAKE_CURRENT_BINARY_DIR} 0 1 binDriveLetter)
-    if (NOT (${srcDriveLetter} STREQUAL ${binDriveLetter}))
-        message(FATAL_ERROR "Windows DOTNET binding builds must have source and binary folders on same drive.")
-    endif()
-
-    # General top level folders
-    file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR} DOTNET_currentBinaryDir)
-    file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR} DOTNET_currentSourceDir)
-    file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR}       DOTNET_projectBinaryDir)
-    file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR}       DOTNET_projectSourceDir)
-
-    # relative path from top-level binary back to top-level source
-    if (${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-        set (DOTNET_relPathToSrc ".\\")
-    else()
-        file(RELATIVE_PATH DOTNET_relPathToSrc "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
-        file(TO_NATIVE_PATH ${DOTNET_relPathToSrc} DOTNET_relPathToSrc)
-    endif()
-
-    if(${CMAKE_GENERATOR} MATCHES "^Visual Studio 9")
-        # Visual Studio 2008
-        select_msvc9_files()
-        set(DOTNET_MSVC_SELECT              "msvc9")
-        set(DOTNET_SLN_FILE_FORMAT          "10.00")
-        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2008")
-        set(DOTNET_TARGET_FRAMEWORK_VERSION "v3.5")
-        set(DOTNET_PLATFORM_TOOLSET         "")
-
-    elseif(${CMAKE_GENERATOR} MATCHES "^Visual Studio 10")
-        # Visual Studio 2010
-        select_msvcx_files()
-        set(DOTNET_MSVC_SELECT              "msvcx")
-        set(DOTNET_SLN_FILE_FORMAT          "11.00")
-        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2010")
-        set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.0")
-        set(DOTNET_PLATFORM_TOOLSET         "")
-
-    elseif(${CMAKE_GENERATOR} MATCHES "^Visual Studio 11")
-        # Visual Studio 2012
-        select_msvcx_files()
-        set(DOTNET_MSVC_SELECT              "msvcx")
-        set(DOTNET_SLN_FILE_FORMAT          "12.00")
-        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2012")
-        set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.5")
-        set(DOTNET_PLATFORM_TOOLSET         "<PlatformToolset>v110</PlatformToolset>")
-
-    elseif(${CMAKE_GENERATOR} MATCHES "^Visual Studio 12")
-        # Visual Studio 2013
-        select_msvcx_files()
-        set(DOTNET_MSVC_SELECT              "msvcx")
-        set(DOTNET_SLN_FILE_FORMAT          "13.00")
-        set(DOTNET_SLN_VISUAL_STUDIO        "Visual Studio 2013")
-        set(DOTNET_TARGET_FRAMEWORK_VERSION "v4.5")
-        set(DOTNET_PLATFORM_TOOLSET         "<PlatformToolset>v120</PlatformToolset>")
-
-    else()
-        message(FATAL_ERROR "No DOTNET binding support available for ${CMAKE_GENERATOR}")
-    endif()
-
-    # Configure common examples and individual files
-    configure_example_projects( ${DOTNET_MSVC_SELECT} )
-    foreach(slnProjFile ${sln_proj_SOURCES})
-        set (iFile "${slnProjFile}.in")
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${iFile} ${CMAKE_CURRENT_BINARY_DIR}/${slnProjFile})
-    endforeach()
-endif (MSVC)
diff --git a/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
deleted file mode 100644
index c709a27..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
+++ /dev/null
@@ -1,91 +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.

-#

-

-Qpid.cpp.bindings.qpid.dotnet binding package.

-

-1. Features

-===========

-

-A. This binding package provides a .NET Interop wrapper around the 

-   Qpid C++ Messaging interface. It exposes the Messaging interface through 

-   a series of managed code classes that may be used by any .NET language.

-

-B. A sessionreceiver assembly provides session message callback functionality.

-

-2. Prerequisites

-================

-

-A. From a fresh check-out of Qpid sources, execute an in-source CMake.

-   This command puts the CMake output files in the same directories

-   as the Qpid source files.

-  

-   > cd cpp

-   > cmake -i

-

-

-B. Build the qpid-cpp solution.

-

-   > qpid-cpp.sln

-     Select Configuration Debug

-     Select Platform Win32

-     Compile the ALL_BUILD project

-

-3. Building the Dotnet Binding solution

-=======================================

-

-A. Open solution file cpp\bindings\qpid\dotnet\org.apache.qpid.messaging.sln

-   Select Configuration Debug

-   Select Platform x86

-   Compile the solution

-

-

-4. Running the examples

-=======================

-

-A. csharp.direct.receiver

-B. csharp.direct.sender

-

-C. csharp.map.receiver

-D. csharp.map.sender

-

-E. csharp.map.callback.receiver

-F. csharp.map.callback.sender

-

-G. csharp.example.server

-H. visualbasic.example.server

-I. csharp.example.client

-

-J. csharp.example.drain

-K. csharp.example.spout

-L. csharp.example.declare_queues

-

-M. csharp.example.helloworld

-N. powershell.example.helloworld

-

-

-5. Running the tests

-====================

-

-A. TBD

-

-

-6. Notes

-========

-

-TBD   

diff --git a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
deleted file mode 100644
index a8dc34c..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ /dev/null
@@ -1,692 +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.

-#

-

-Set-PSDebug -Trace 0

-Set-PSDebug -strict

-$ErrorActionPreference='Stop'

-

-$global:usageText = @("#

-# configure-windows.ps1 [studio-and-architecture [boost-root-directory]]

-#

-# This script configures a qpid\cpp developer build environment under Windows

-# to enable working with cpp\bindings\qpid\dotnet binding source code.

-#

-# ARG PROCESSING

-# ==============

-# All arguments may be specified on the command line. If not then this

-# script will prompt the user for choices.

-#

-#   * studio-and-architecture

-#     User chooses a version of Visual Studio and a target platform:

-#       2012-x86

-#       2012-x64

-#       2010-x86

-#       2010-x64

-#       2008-x86

-#       2008-x64 

-#

-#   * boost-root-directory

-#     The path to the version of boost to be used in this build

-#

-# CONFIGURATION OUTPUT

-# ====================

-# This script uses these build and install directories for the build:

-#       build_2008_x86  install_2008_x86

-#       build_2010_x86  install_2010_x86

-#       build_2008_x64  install_2008_x64

-#       build_2010_x64  install_2010_x64

-#

-#

-# PROTON AMQP 1.0

-# ===============

-# Proton is included automatically by having previously executed proton's

-# ""make install"" to the install_xx_xxxx directory that qpid is about to use.

-#

-# Prerequisites

-# =============

-#  1. Powershell must be installed.

-#  2. 32-bit and/or 64-bit Boost libraries must be installed in separate

-#     directories. A user system may have any number of Boost library

-#     versions installed on it as long as each may be referred to through

-#     a separate BOOST_ROOT directory path.

-#  3. CMake 2.8 (or later) must be installed. The cmake\bin directory

-#     must be in the user's path.

-#  4. Boost library specifications may or may not be in the user's path.

-#     The script author recommends not to have Boost in the path and only

-#     allow the Boost path to be specified by generated command procedures.

-#  5. Visual Studio build environment must be installed.

-#

-#

-# Use case: Create a new build environment

-# ========================================

-#

-#  Required VS2010 Boost:

-#        32-bit library - C:\Boost

-#        64-bit library - D:\Boost_64

-#

-#  Required Qpid checkout tree

-#        C:\svn\qpid\...

-#

-#  Run this script, select VS2010 compiler, x86 platform:

-#

-#    configure-windows.ps1 2010-x86 C:\Boost

-#

-#  This script will automatically create build directory

-#        C:\svn\qpid\build_2010_x86

-#

-#  Next this script runs CMake.

-#

-#  * This step creates qpid-cpp.sln and related project files.

-#      C:\svn\qpid\build_2010_x86\qpid-cpp.sln

-#

-#  This script generates several other helper scripts:

-#

-#   C:\svn\qpid\build_2010_x86\start-devenv-messaging-x86-32bit.ps1

-#   C:\svn\qpid\build_2010_x86\start-devenv-messaging-x86-32bit.bat

-#   C:\svn\qpid\build_2010_x86\setenv-messaging-x86-32bit.bat

-#   C:\svn\qpid\build_2010_x86\run-cmake.bat

-#   C:\svn\qpid\build_2010_x86\run-qpid-devenv-debug.bat

-")

-

-#############################

-# global strings to be written to script files

-#

-$global:txtPath = '$env:PATH'

-$global:txtQR   = '$env:QPID_BUILD_ROOT'

-$global:txtWH   = 'Write-Host'

-

-#############################

-# Visual Studio version selection dialog items and choice

-#

-[array]$global:VsVersionCmakeChoiceList = `

-    "Visual Studio 2013 - x86", `

-    "Visual Studio 2013 - x64", `

-    "Visual Studio 2012 - x86", `

-    "Visual Studio 2012 - x64", `

-    "Visual Studio 2010 - x86", `

-    "Visual Studio 2010 - x64", `

-    "Visual Studio 2008 - x86", `

-    "Visual Studio 2008 - x64"

-$global:vsSelectedOption = ''

-$global:vsVersion = ''       # "Visual Studio 2010"

-$global:vsShortName = ''     # "2010"

-$global:cmakeGenerator = ''  # "Visual Studio 10"

-$global:vsSubdir = ''        # "msvc10"

-$global:vsSubdirX = ''       # "msvc9" or "msvcx"

-$global:cmakeCompiler = ''   # "-vc100"

-$global:build32or64 = ''     # "32" or "64"

-$global:buildPathSizeId = '' # "x86" or "x64"

-$global:vsEnvironment = ''   # ""%VS100COMNTOOLS%..\..\vcvarsall.bat" x86"

-$global:vsBuildTarget = ''   # "Debug|Win32"

-

-$global:cmakeCommandLine = ''

-

-$global:boostRootPath = ''

-

-#############################

-# Usage

-#

-function Usage

-{

-    Write-Host $global:usageText

-}

-

-#############################

-# Select-Folder

-#   Return a folder or null

-#

-function Select-Folder ($message="Select a folder", $path=0)

-{

-    $shellApp = New-Object -comObject Shell.Application

-    $folder = $shellApp.BrowseForFolder(0, $message, 0, $path)

-    if ($folder -ne $null) {

-        $folder.self.Path

-    }

-}

-

-

-#############################

-# AskYesOrNo

-#   Show modal dialog messagebox and return yes or no

-#

-function AskYesOrNo ($Question="No question?", $Title="No Title?")

-{

-    $dlg = [Windows.Forms.MessageBox]::Show($Question, $Title,  `

-           [Windows.Forms.MessageBoxButtons]::YesNo, `

-           [Windows.Forms.MessageBoxIcon]::Question)

-

-    $result = $dlg -eq [Windows.Forms.DialogResult]::Yes

-

-    $result

-}

-

-

-#############################

-# SanityCheckBoostPath

-#   A path is a "boost path" if it contains

-#   both lib and include subdirectories.

-#

-function SanityCheckBoostPath ($path=0)

-{

-    $result = 1

-    $displayPath = ""

-

-    if ($path -ne $null) {

-        $displayPath = $path

-

-        $toTest = ('lib')

-        foreach ($pattern in $toTest) {

-            $target = Join-Path $path $pattern

-            if (!(Test-Path -path $target)) {

-                $result = 0

-            }

-        }

-    } else {

-        $result = 0

-    }

-

-    if (! $result) {

-        Write-Host "The path ""$displayPath"" does not appear to be a Boost root path."

-    }

-    $result

-}

-

-

-#############################

-# SanityCheckBuildPath

-#   A path is a "build path" if it contains

-#   various subdirectories.

-#

-function SanityCheckBuildPath ($path=0)

-{

-    $result = 1

-    $displayPath = ""

-    if ($path -ne $null) {

-        $displayPath = $path

-

-        $toTest = ('CMakeFiles', 'docs', 'etc', 'examples', 'include',

-                   'managementgen', 'src')

-        foreach ($pattern in $toTest) {

-            $target = Join-Path $path $pattern

-            if (!(Test-Path -path $target)) {

-                $result = 0

-            }

-        }

-    } else {

-        $result = 0

-    }

-    if (! $result) {

-        Write-Host "The path ""$displayPath"" does not appear to be a Qpid C++ build root path."

-    }

-    $result

-}

-

-

-#############################

-# WriteDotnetBindingSlnLauncherPs1

-#   Write a powershell script that sets up the environment

-#   and then launches Visual Studio solution file.

-#

-function WriteDotnetBindingSlnLauncherPs1

-{

-    param

-    (

-        [string] $slnName,

-        [string] $boostRoot,

-        [string] $buildRoot,

-        [string] $cppDir,

-        [string] $vsPlatform,

-        [string] $nBits,

-        [string] $outfileName,

-        [string] $studioVersion,

-        [string] $studioSubdir

-    )

-

-    $out = @("#

-# Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment

-#

-$global:txtPath  = ""$boostRoot\lib;$global:txtPath""

-$global:txtQR    = ""$buildRoot""

-$global:txtWH      ""Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment.""

-$buildRoot\bindings\qpid\dotnet\$vsSubdirX\$slnName

-")

-    Write-Host "        $buildRoot\$outfileName"

-    $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

-}

-

-

-#############################

-# WriteDotnetBindingSlnLauncherBat

-#   Write a batch file that

-#   launches a powershell script.

-#

-function WriteDotnetBindingSlnLauncherBat

-{

-    param

-    (

-        [string] $slnName,

-        [string] $buildRoot,

-        [string] $vsPlatform,

-        [string] $nBits,

-        [string] $psScriptName,

-        [string] $outfileName,

-        [string] $studioVersion,

-        [string] $studioSubdir

-    )

-

-    $out = @("@ECHO OFF

-REM

-REM Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment

-REM

-ECHO Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment

-powershell $buildRoot\$psScriptName

-")

-    Write-Host "        $buildRoot\$outfileName"

-    $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

-}

-

-

-#############################

-# WriteDotnetBindingEnvSetupBat

-#   Write a batch file that sets the desired environment into

-#   the user's current environment settings.

-#

-function WriteDotnetBindingEnvSetupBat

-{

-    param

-    (

-        [string] $slnName,

-        [string] $boostRoot,

-        [string] $buildRoot,

-        [string] $vsPlatform,

-        [string] $nBits,

-        [string] $outfileName,

-        [string] $studioVersion,

-        [string] $studioSubdir,

-        [string] $cmakeLine

-    )

-

-    $out = @("@ECHO OFF

-REM

-REM Call this command procedure from a command prompt to set up a

-REM $studioVersion $vsPlatform ($nBits-bit)

-REM $slnName environment

-REM

-REM     > call $outfileName

-REM     >

-REM

-REM The solution was generated with cmake command line:

-REM $cmakeLine

-SET se_buildconfig=%1

-ECHO %PATH% | FINDSTR /I boost > NUL

-IF %ERRORLEVEL% EQU 0 ECHO WARNING: Boost is defined in your path multiple times!

-SET PATH=$boostRoot\lib;%PATH%

-SET QPID_BUILD_ROOT=$buildRoot

-IF NOT DEFINED se_buildconfig (GOTO :CONT)

-SET PATH=%QPID_BUILD_ROOT%\src\%se_buildconfig%;%PATH%

-:CONT

-ECHO Environment set for $slnName $studioVersion $vsPlatform $nBits-bit development.

-")

-    Write-Host "        $buildRoot\$outfileName"

-    $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

-}

-

-#############################

-# WriteCmakeRerunnerBat

-#   Write a batch file that runs cmake again

-#

-function WriteCmakeRerunnerBat

-{

-    param

-    (

-        [string] $slnName,

-        [string] $boostRoot,

-        [string] $buildRoot,

-        [string] $vsPlatform,

-        [string] $nBits,

-        [string] $outfileName,

-        [string] $studioVersion,

-        [string] $studioSubdir,

-        [string] $cmakeLine

-    )

-

-    $out = @("@ECHO OFF

-REM

-REM Call this command procedure from a command prompt to rerun cmake

-REM $studioVersion $vsPlatform ($nBits-bit)

-REM

-$cmakeLine

-")

-    Write-Host "        $buildRoot\$outfileName"

-    $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

-}

-

-#############################

-# WriteMakeInstallBat

-#   Write a batch file that runs "make install" for debug build

-#

-function WriteMakeInstallBat

-{

-    param

-    (

-        [string] $buildRoot,

-        [string] $outfileName,

-        [string] $varfileName,

-        [string] $vsEnvironment,

-        [string] $vsBuildTarget

-    )

-    $newTarget = $vsBuildTarget -replace "Debug", "%mi_buildconfig%"

-    $out = @("@ECHO OFF

-REM

-REM Call this command procedure from a command prompt to run 'make install'

-REM   %1 selects build configuration. Defaults to Debug

-REM

-setlocal

-SET mi_buildconfig=%1

-IF NOT DEFINED mi_buildconfig (SET mi_buildconfig=Debug)

-call $varfileName %mi_buildconfig%

-call $vsEnvironment

-devenv qpid-cpp.sln /build $newTarget /project INSTALL

-endlocal

-")

-    Write-Host "        $buildRoot\$outfileName"

-    $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

-}

-

-#############################

-# Given a visual studio selection from command line or selection list

-#  Return the visual studio and architecture settings or exit

-#

-function ParseStudioSelection 

-{

-    param

-    (

-        [string] $vsSelection

-    )

-    Write-Host "Checking studio version: $vsSelection"

-    if ($vsSelection.Contains("2013")) {

-        $global:vsVersion = "Visual Studio 2013"

-        $global:cmakeGenerator = "Visual Studio 12 2013"

-        $global:vsSubdir = "msvc12"

-        $global:vsSubdirX = "msvcx"

-        $global:cmakeCompiler = "-vc120"

-        $global:vsShortName = "2013"

-        $global:vsEnvironment = """%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"""

-    } elseif ($vsSelection.Contains("2012")) {

-        $global:vsVersion = "Visual Studio 2012"

-        $global:cmakeGenerator = "Visual Studio 11"

-        $global:vsSubdir = "msvc11"

-        $global:vsSubdirX = "msvcx"

-        $global:cmakeCompiler = "-vc110"

-        $global:vsShortName = "2012"

-        $global:vsEnvironment = """%VS110COMNTOOLS%..\..\VC\vcvarsall.bat"""

-    } elseif ($vsSelection.Contains("2010")) {

-        $global:vsVersion = "Visual Studio 2010"

-        $global:cmakeGenerator = "Visual Studio 10"

-        $global:vsSubdir = "msvc10"

-        $global:vsSubdirX = "msvcx"

-        $global:cmakeCompiler = "-vc100"

-        $global:vsShortName = "2010"

-        $global:vsEnvironment = """%VS100COMNTOOLS%..\..\VC\vcvarsall.bat"""

-    } elseif ($vsSelection.Contains("2008")) {

-        $global:vsVersion = "Visual Studio 2008"

-        $global:cmakeGenerator = "Visual Studio 9 2008"

-        $global:vsSubdir = "msvc9"

-        $global:vsSubdirX = "msvc9"

-        $global:cmakeCompiler = "-vc90"

-        $global:vsShortName = "2008"

-        $global:vsEnvironment = """%VS90COMNTOOLS%..\..\VC\vcvarsall.bat"""

-    } else {

-        Write-Host "Visual Studio must be 2008, 2010, 2012, or 2013"

-        exit

-    }

-    $global:vsSelectedOption = $vsSelection

-    

-    if ($vsSelection.Contains("x86")) {

-        $global:buildPathSizeId = "x86"

-        $global:build32or64 = "32"

-        $global:vsEnvironment += " x86"

-        $global:vsBuildTarget = """Debug|Win32"""

-    } elseif ($vsSelection.Contains("x64")) {

-        $global:buildPathSizeId = "x64"

-        $global:build32or64 = "64"

-        $global:vsEnvironment += " amd64"

-        $global:vsBuildTarget = """Debug|x64"""

-        # Promote CMAKE generator to 64 bit variant

-        $global:cmakeGenerator += " Win64"

-    } else {

-        Write-Host "Studio selection must contain x86 or x64"

-        exit

-    }

-}

-

-#############################

-# When the user presses 'select' then this function handles it.

-#  Return the visual studio and architecture.

-#  Close the form.

-#

-function SelectVisualStudio {

-    if ($DropDown.SelectedItem -ne $null) {

-        $vsVersion = $DropDown.SelectedItem.ToString()

-        

-        ParseStudioSelection $vsVersion 

-

-        $Form.Close() 2> $null

-        Write-Host "Selected generator: $global:cmakeGenerator"

-    }

-}

-

-#############################

-# Create the Visual Studio version form and launch it

-#

-function SelectVisualStudioVersion {

-

-    $Form = New-Object System.Windows.Forms.Form

-

-    $Form.width = 350

-    $Form.height = 150

-    $Form.Text = "Select Visual Studio Version and platform"

-

-    $DropDown          = new-object System.Windows.Forms.ComboBox

-    $DropDown.Location = new-object System.Drawing.Size(120,10)

-    $DropDown.Size     = new-object System.Drawing.Size(150,30)

-

-    ForEach ($Item in $global:VsVersionCmakeChoiceList) {

-        [void] $DropDown.Items.Add($Item)

-    }

-    $DropDown.SelectedIndex = 0

-

-    $Form.Controls.Add($DropDown)

-

-    $Button          = new-object System.Windows.Forms.Button

-    $Button.Location = new-object System.Drawing.Size(120,50)

-    $Button.Size     = new-object System.Drawing.Size(120,20)

-    $Button.Text     = "Select"

-    $Button.Add_Click({SelectVisualStudio})

-    $form.Controls.Add($Button)

-

-    $Form.Add_Shown({$Form.Activate()})

-    $Form.ShowDialog()

-}

-

-

-#############################

-# Main

-#############################

-#

-# curDir is qpid\cpp\bindings\qpid\dotnet.

-#

-[string] $curDir   = Split-Path -parent $MyInvocation.MyCommand.Definition

-[string] $projRoot = Resolve-Path (Join-Path $curDir "..\..\..\..")

-[string] $cppDir   = Resolve-Path (Join-Path $curDir "..\..\..")

-

-[System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null

-[System.Reflection.Assembly]::LoadWithPartialName("System.Drawing")       | Out-Null

-

-#############################

-# Get command line args

-#

-if ($args.Length -ge 1) {

-    if (($args[0].Contains("help")) -or ($args[0].Contains("-h"))) {

-        Usage

-        exit

-    }

-    

-    $vsVer = $args[0]

-    ParseStudioSelection $vsVer

-}

-

-if ($args.Length -ge 2) {

-    $global:boostRootPath = $args[1]

-}

-

-#############################

-# User dialog to select a version of Visual Studio as CMake generator

-#

-if ($global:vsVersion -eq '') {

-    SelectVisualStudioVersion

-}

-

-#############################

-# User dialog to get boost paths

-#

-if ($global:boostRootPath -eq '') {

-    $global:boostRootPath = Select-Folder -message "Select BOOST_ROOT folder for $global:vsSelectedOption build. Press CANCEL to quit"

-}

-

-#############################

-# Decide to run cmake or not.

-#   If the build directory is absent the run cmake

-#   If the build directory already exists then it's the user's choice

-#

-$make = 0

-$defined = ($global:boostRootPath -ne $null) -and ($global:boostRootPath -ne '')

-if ($defined) {

-    $found = SanityCheckBoostPath $global:boostRootPath

-    if (! $found) {

-        exit

-    }

-    

-    $build   = Join-Path $projRoot   "build_${global:vsShortName}_${global:buildPathSizeId}"

-    $install = Join-Path $projRoot "install_${global:vsShortName}_${global:buildPathSizeId}"

-        

-    $found = SanityCheckBuildPath $build

-    if ($found) {

-        $make = AskYesOrNo "build directory ""$build"" appears to have run cmake already. Run cmake again?"

-    } else {

-        $make = 1

-    }

-}

-

-if (! $make) {

-    exit

-}

-

-#############################

-# run CMake

-#

-if(!(Test-Path -Path $build)) {

-    New-Item -ItemType directory -Path $build

-}

-cd "$build"

-$global:cmakeCommandLine  = "CMake -G ""$global:cmakeGenerator"" "

-$global:cmakeCommandLine += """-DBUILD_DOCS=No"" "

-$global:cmakeCommandLine += """-DCMAKE_INSTALL_PREFIX=$install"" "

-$global:cmakeCommandLine += """-DBoost_COMPILER=$global:cmakeCompiler"" "

-$global:cmakeCommandLine += """-DBOOST_ROOT=$global:boostRootPath"" "

-$global:cmakeCommandLine += """-DINSTALL_QMFGEN=No"" "

-$global:cmakeCommandLine +=  $cppDir

-Write-Host "Running CMake in $build : $global:cmakeCommandLine"

-& cmd /c "$global:cmakeCommandLine 2>&1"

-

-

-#############################

-# Emit scripts

-#

-Write-Host "Writing helper scripts..."

-

-###########

-# Powershell script to launch org.apache.qpid.messaging.sln

-#

-WriteDotnetBindingSlnLauncherPs1     -slnName "org.apache.qpid.messaging.sln" `

-                                   -boostRoot "$global:boostRootPath" `

-                                   -buildRoot "$build" `

-                                      -cppDir "$cppDir" `

-                                  -vsPlatform $global:buildPathSizeId `

-                                       -nBits $global:build32or64 `

-                                 -outfileName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.ps1" `

-                               -studioVersion "$global:vsVersion" `

-                                -studioSubdir "$global:vsSubdir"

-

-###########

-# Batch script (that you doubleclick) to launch powershell script

-# that launches org.apache.qpid.messaging.sln.

-#

-WriteDotnetBindingSlnLauncherBat      -slnName "org.apache.qpid.messaging.sln" `

-                                    -buildRoot "$build" `

-                                   -vsPlatform $global:buildPathSizeId `

-                                        -nBits $global:build32or64 `

-                                 -psScriptName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.ps1" `

-                                  -outfileName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.bat" `

-                                -studioVersion "$global:vsVersion" `

-                                 -studioSubdir "$global:vsSubdir"

-

-###########

-# Batch script (that you CALL from a command prompt)

-# to establish the org.apache.qpid.messaging.sln build environment.

-#

-WriteDotnetBindingEnvSetupBat     -slnName "org.apache.qpid.messaging.sln" `

-                                -boostRoot "$global:boostRootPath" `

-                                -buildRoot "$build" `

-                               -vsPlatform $global:buildPathSizeId `

-                                    -nBits $global:build32or64 `

-                              -outfileName "setenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.bat" `

-                            -studioVersion "$global:vsVersion" `

-                             -studioSubdir "$global:vsSubdir" `

-                                -cmakeLine "$global:cmakeCommandLine"

-

-###########

-# Batch script to re-run cmake

-#

-WriteCmakeRerunnerBat             -slnName "org.apache.qpid.messaging.sln" `

-                                -boostRoot ""$global:boostRootPath"" `

-                                -buildRoot "$build" `

-                               -vsPlatform $global:buildPathSizeId `

-                                    -nBits $global:build32or64 `

-                              -outfileName "run-cmake.bat" `

-                            -studioVersion "$global:vsVersion" `

-                             -studioSubdir "$global:vsSubdir" `

-                                -cmakeLine "$global:cmakeCommandLine"

-                                

-###########

-# Batch script to do command line "make install"

-#

-WriteMakeInstallBat             -buildRoot "$build" `

-                              -outfileName "make-install.bat" `

-                              -varfileName "setenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.bat" `

-                            -vsEnvironment $global:vsEnvironment `

-                            -vsBuildTarget $global:vsBuildTarget

-

-#############################

-# Pause on exit. If user ran this script through a graphical launch and there's

-# an error then the window closes and the user never sees the error. This pause

-# gives him a chance to figure it out.

-#

-#Write-Host "Press any key to continue ..."

-#[void] $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6976be5..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.direct.receiver")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.direct.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible

-// to COM components.  If you need to access a type in this assembly from

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
deleted file mode 100644
index 592a05a..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
+++ /dev/null
@@ -1,79 +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.

- *

- */

-

-using System;

-using Org.Apache.Qpid.Messaging;

-

-namespace CSharpDirect

-{

-    class Program

-    {

-        // Direct receiver example

-        //

-        // Receive 10 messages from localhost:5672, amq.direct/key

-        // Messages are assumed to be printable strings.

-        //

-        static int Main(string[] args)

-        {

-            String host = "localhost:5672";

-            String addr = "amq.direct/key";

-            Int32 nMsg = 10;

-

-            if (args.Length > 0)

-                host = args[0];

-            if (args.Length > 1)

-                addr = args[1];

-            if (args.Length > 2)

-                nMsg = Convert.ToInt32(args[2]);

-

-            Console.WriteLine("csharp.direct.receiver");

-            Console.WriteLine("host : {0}", host);

-            Console.WriteLine("addr : {0}", addr);

-            Console.WriteLine("nMsg : {0}", nMsg);

-            Console.WriteLine();

-

-            Connection connection = null;

-            try

-            {

-                connection = new Connection(host);

-                connection.Open();

-                if (!connection.IsOpen) {

-                    Console.WriteLine("Failed to open connection to host : {0}", host);

-                } else {

-                    Session session = connection.CreateSession();

-                    Receiver receiver = session.CreateReceiver(addr);

-                    Message message = new Message("");

-                    for (int i = 0; i < nMsg; i++) {

-                        Message msg2 = receiver.Fetch(DurationConstants.FORVER);

-                        Console.WriteLine("Rcvd msg {0} : {1}", i, msg2.GetContent());

-                    }

-                    connection.Close();

-                    return 0;

-                }

-            } catch (Exception e) {

-                Console.WriteLine("Exception {0}.", e);

-                if (null != connection)

-                    connection.Close();

-            }

-            return 1;

-        }

-    }

-}
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index 12368de..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.direct.sender")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.direct.sender")]

-[assembly: AssemblyCopyright("Copyright 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible

-// to COM components.  If you need to access a type in this assembly from

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("19ce67e4-db90-4480-88c4-3721f47634c7")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
deleted file mode 100644
index a0ac742..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
+++ /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.

- *

- */

-

-using System;

-using Org.Apache.Qpid.Messaging;

-

-namespace csharp.direct.sender

-{

-    class Program

-    {

-        // Direct sender example

-        //

-        // Send 10 messages from localhost:5672, amq.direct/key

-        // Messages are assumed to be printable strings.

-        //

-        static int Main(string[] args)

-        {

-            String host = "localhost:5672";

-            String addr = "amq.direct/key";

-            Int32 nMsg = 10;

-

-            if (args.Length > 0)

-                host = args[0];

-            if (args.Length > 1)

-                addr = args[1];

-            if (args.Length > 2)

-                nMsg = Convert.ToInt32(args[2]);

-

-            Console.WriteLine("csharp.direct.sender");

-            Console.WriteLine("host : {0}", host);

-            Console.WriteLine("addr : {0}", addr);

-            Console.WriteLine("nMsg : {0}", nMsg);

-            Console.WriteLine();

-

-            Connection connection = null;

-            try

-            {

-                connection = new Connection(host);

-                connection.Open();

-

-                if (!connection.IsOpen) {

-                    Console.WriteLine("Failed to open connection to host : {0}", host);

-                } else {

-                    Session session = connection.CreateSession();

-                    Sender sender = session.CreateSender(addr);

-                    for (int i = 0; i < nMsg; i++) {

-                        Message message = new Message(String.Format("Test Message {0}", i));

-                        sender.Send(message);

-                    }

-                    session.Sync();

-                    connection.Close();

-                    return 0;

-                }

-            } catch (Exception e) {

-                Console.WriteLine("Exception {0}.", e);

-                if (null != connection)

-                    connection.Close();

-            }

-            return 1;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
deleted file mode 100644
index eddb759..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.client")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.client")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
deleted file mode 100644
index 19a5267..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
+++ /dev/null
@@ -1,75 +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.

- *

- */

-

-using System;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples {

-    class Client {

-        static int Main(string[] args) {

-            String url = "amqp:tcp:127.0.0.1:5672";

-            String connectionOptions = "";

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                connectionOptions = args[1];

-

-            Connection connection = new Connection(url, connectionOptions);

-            try

-            {

-                connection.Open();

-

-                Session session = connection.CreateSession();

-

-                Sender sender = session.CreateSender("service_queue");

-

-                Address responseQueue = new Address("#response-queue; {create:always, delete:always}");

-                Receiver receiver = session.CreateReceiver(responseQueue);

-

-                String[] s = new String[] {

-                    "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 = new Message("");

-                request.ReplyTo = responseQueue;

-

-                for (int i = 0; i < s.Length; i++) {

-                    request.SetContent(s[i]);

-                    sender.Send(request);

-                    Message response = receiver.Fetch();

-                    Console.WriteLine("{0} -> {1}", request.GetContent(), response.GetContent());

-                }

-                connection.Close();

-                return 0;

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine("Exception {0}.", e);

-                connection.Close();

-            }

-            return 1;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4e06580..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.declare_queues")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.declare_queues")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
deleted file mode 100644
index 06267bf..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
+++ /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.

- *

- */

-

-using System;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples {

-    class DeclareQueues {

-        //

-        // Sample invocation: csharp.example.declare_queues.exe localhost:5672 my-queue

-        //

-        static int Main(string[] args) {

-            string addr = "localhost:5672";

-            string queue = "my-queue";

-

-            if (args.Length > 0)

-                addr = args[0];

-            if (args.Length > 1)

-                queue = args[1];

-

-            Connection connection = null;

-            try

-            {

-                connection = new Connection(addr);

-                connection.Open();

-                Session session = connection.CreateSession();

-                String queueName = queue + "; {create: always}";

-                Sender sender = session.CreateSender(queueName);

-                session.Close();

-                connection.Close();

-                return 0;

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine("Exception {0}.", e);

-                if (null != connection)

-                    connection.Close();

-            }

-            return 1;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
deleted file mode 100644
index 6059f76..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
+++ /dev/null
@@ -1,175 +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.

-*/

-

-namespace Org.Apache.Qpid.Messaging.Examples

-{

-    using System;

-

-    public class Options

-    {

-        private string url;

-        private string address;

-        private UInt64 timeout;

-        private int count;

-        private string id;

-        private string replyTo;

-        //private string[] properties;

-        //private string[] entries;

-        private string content;

-        private string connectionOptions;

-        private bool forever;

-

-        public Options(string[] args)

-        {

-            this.url = "amqp:tcp:127.0.0.1:5672";

-            this.address = "";

-            this.timeout = 0;

-            this.count = 1;

-            this.id = "";

-            this.replyTo = "";

-            this.content = "";

-            this.connectionOptions = "";

-            this.forever = false;

-            Parse(args);

-        }

-

-        private void Parse(string[] args)

-        {

-            int argCount = args.Length;

-            int current = 0;

-

-            while ((current + 1) < argCount)

-            {

-                string arg = args[current];

-                if (arg == "--broker")

-                {

-                    this.url = args[++current];

-                }

-                else if (arg == "--address")

-                {

-                    this.address = args[++current];

-                }

-                else if (arg == "--timeout")

-                {

-                    arg = args[++current];

-                    UInt64 i = UInt64.Parse(arg);

-                    if (i >= 0)

-                    {

-                        this.timeout = i;

-                    }

-                }

-                else if (arg == "--count")

-                {

-                    arg = args[++current];

-                    int i = int.Parse(arg);

-                    if (i >= 0)

-                    {

-                        this.count = i;

-                    }

-                }

-                else if (arg == "--id")

-                {

-                    this.id = args[++current];

-                }

-                else if (arg == "--reply-to")

-                {

-                    this.replyTo = args[++current];

-                }

-                else if (arg == "--properties")

-                {

-                    throw new ArgumentException("TODO: properties not implemented");

-                }

-                else if (arg == "--entries")

-                {

-                    throw new ArgumentException("TODO: entries not implemented");

-                }

-                else if (arg == "--content")

-                {

-                    this.content = args[++current];

-                }

-                else if (arg == "--connection-options")

-                {

-                    this.connectionOptions = args[++current];

-                }

-                else if (arg == "--forever")

-                {

-                    this.forever = true;

-                }

-                else

-                {

-                    throw new ArgumentException(String.Format("unknown argument \"{0}\"", arg));

-                }

-

-                current++;

-            }

-

-            if (current == argCount)

-            {

-                throw new ArgumentException("missing argument: address");

-            }

-

-            address = args[current];

-        }

-

-        public string Url

-        {

-            get { return this.url; }

-        }

-

-        public string Address

-        {

-            get { return this.address; }

-        }

-

-        public UInt64 Timeout

-        {

-            get { return this.timeout; }

-        }

-

-        public int Count

-        {

-            get { return this.count; }

-        }

-

-        public string Id

-        {

-            get { return this.id; }

-        }

-

-        public string ReplyTo

-        {

-            get { return this.replyTo; }

-        }

-

-        public string Content

-        {

-            get { return content; }

-        }

-

-        public string ConnectionOptions

-        {

-            get { return this.connectionOptions; }

-        }

-

-        public bool Forever

-        {

-            get { return this.forever; }

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
deleted file mode 100644
index d949dde..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.drain")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.drain")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
deleted file mode 100644
index da8218b..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
+++ /dev/null
@@ -1,88 +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.

- *

- */

-

-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Collections.ObjectModel;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples {

-    class Drain {

-        //

-        // Sample invocation: csharp.example.drain.exe --broker localhost:5672 --timeout 30 my-queue

-        //

-        static int Main(string[] args) {

-            Options options = new Options(args);

-

-            Connection connection = null;

-            try

-            {

-                connection = new Connection(options.Url, options.ConnectionOptions);

-                connection.Open();

-                Session session = connection.CreateSession();

-                Receiver receiver = session.CreateReceiver(options.Address);

-                Duration timeout = options.Forever ? 

-                                   DurationConstants.FORVER : 

-                                   DurationConstants.SECOND * options.Timeout;

-                Message message = new Message();

-

-                while (receiver.Fetch(ref message, timeout))

-                {

-                    Dictionary<string, object> properties = new Dictionary<string, object>();

-                    properties = message.Properties;

-                    Console.Write("Message(properties={0}, content='", 

-                                  message.MapAsString(properties));

-

-                    if ("amqp/map" == message.ContentType)

-                    {

-                        Dictionary<string, object> content = new Dictionary<string, object>();

-                        message.GetContent(content);

-                        Console.Write(message.MapAsString(content));

-                    }

-                    else if ("amqp/list" == message.ContentType)

-                    {

-                        Collection<object> content = new Collection<object>();

-                        message.GetContent(content);

-                        Console.Write(message.ListAsString(content));

-                    }

-                    else

-                    {

-                        Console.Write(message.GetContent());

-                    }

-                    Console.WriteLine("')");

-                    session.Acknowledge();

-                }

-                receiver.Close();

-                session.Close();

-                connection.Close();

-                return 0;

-            }

-            catch (Exception e)

-            {

-                Console.WriteLine("Exception {0}.", e);

-                if (null != connection)

-                    connection.Close();

-            }

-            return 1;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
deleted file mode 100644
index 17bbd84..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.helloworld")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.helloworld")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("19ce67e4-db90-4480-88c4-3721f47634c7")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
deleted file mode 100644
index 200d7f0..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
+++ /dev/null
@@ -1,56 +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.
- *
- */
-
-using System;
-using Org.Apache.Qpid.Messaging;
-
-namespace Org.Apache.Qpid.Messaging {
-    class Program {
-        static void Main(string[] args) {
-            String broker = args.Length > 0 ? args[0] : "localhost:5672";
-            String address = args.Length > 1 ? args[1] : "amq.topic";
-
-            Connection connection = null;
-            try {
-                connection = new Connection(broker);
-                connection.Open();
-                Session session = connection.CreateSession();
-
-                Receiver receiver = session.CreateReceiver(address);
-                Sender sender = session.CreateSender(address);
-
-                Message message = new Message();
-                message.SetContentObject("Hello world!"); // all strings are utf-8 encoded
-                sender.Send(message);
- 
-                message = receiver.Fetch(DurationConstants.SECOND * 1);
-                Console.WriteLine("{0}", message.GetContent());
-                session.Acknowledge();
-
-                connection.Close();
-            } catch (Exception e) {
-                Console.WriteLine("Exception {0}.", e);
-                if (null != connection)
-                    connection.Close();
-            }
-        }
-    }
-}
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7f0fd52..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.server")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.server")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
deleted file mode 100644
index 7e0b259..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
+++ /dev/null
@@ -1,66 +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.

- *

- */

-

-using System;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples {

-    class Server {

-        static int Main(string[] args) {

-            // Usage: csharp.example.server [url [connectionOptions]]

-            string url = "amqp:tcp:127.0.0.1:5672";

-            string connectionOptions = "";

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                connectionOptions = args[1];

-

-            try {

-                Connection connection = new Connection(url, connectionOptions);

-                connection.Open();

-                Session session = connection.CreateSession();

-                Receiver receiver = session.CreateReceiver("service_queue; {create: always}");

-

-                while (true) {

-                    Message request = receiver.Fetch();

-                    Address address = request.ReplyTo;

-

-                    if (null != address) {

-                        Sender sender = session.CreateSender(address);

-                        String s = request.GetContent();

-                        Message response = new Message(s.ToUpper());

-                        sender.Send(response);

-                        Console.WriteLine("Processed request: {0} -> {1}", request.GetContent(), response.GetContent());

-                        session.Acknowledge();

-                    } else {

-                        Console.WriteLine("Error: no reply address specified for request: {0}", request.GetContent());

-                        session.Reject(request);

-                    }

-                }

-                // connection.Close();  // unreachable in this example

-            } catch (Exception e) {

-                Console.WriteLine("Exception {0}.", e);

-            }

-            return 1;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
deleted file mode 100644
index 9ceb11e..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
+++ /dev/null
@@ -1,185 +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.

-*/

-

-namespace Org.Apache.Qpid.Messaging.Examples

-{

-    using System;

-    using System.Collections;

-    using System.Collections.Generic;

-    using System.Collections.ObjectModel;

-

-    public class Options

-    {

-        private string url;

-        private string address;

-        private int timeout;

-        private int count;

-        private string id;

-        private string replyTo;

-        private Collection<string> properties;

-        private Collection<string> entries;

-        private string content;

-        private string connectionOptions;

-        private bool forever;

-

-        public Options(string[] args)

-        {

-            this.url = "amqp:tcp:127.0.0.1:5672";

-            this.address = "";

-            this.timeout = 0;

-            this.count = 1;

-            this.id = "";

-            this.replyTo = "";

-            properties = new Collection<string>();

-            entries = new Collection<string>();

-            this.content = "";

-            this.connectionOptions = "";

-            this.forever = false;

-            Parse(args);

-        }

-

-        private void Parse(string[] args)

-        {

-            int argCount = args.Length;

-            int current = 0;

-

-            while ((current + 1) < argCount)

-            {

-                string arg = args[current];

-                if (arg == "--broker")

-                {

-                    this.url = args[++current];

-                }

-                else if (arg == "--address")

-                {

-                    this.address = args[++current];

-                }

-                else if (arg == "--timeout")

-                {

-                    arg = args[++current];

-                    int i = int.Parse(arg);

-                    if (i >= 0)

-                    {

-                        this.timeout = i;

-                    }

-                }

-                else if (arg == "--count")

-                {

-                    arg = args[++current];

-                    int i = int.Parse(arg);

-                    if (i >= 0)

-                    {

-                        this.count = i;

-                    }

-                }

-                else if (arg == "--id")

-                {

-                    this.id = args[++current];

-                }

-                else if (arg == "--reply-to")

-                {

-                    this.replyTo = args[++current];

-                }

-                else if (arg == "--properties")

-                {

-                    this.properties.Add(args[++current]);

-                }

-                else if (arg == "--map")

-                {

-                    this.entries.Add(args[++current]);

-                }

-                else if (arg == "--content")

-                {

-                    this.content = args[++current];

-                }

-                else if (arg == "--connection-options")

-                {

-                    this.connectionOptions = args[++current];

-                }

-                else if (arg == "--forever")

-                {

-                    this.forever = true;

-                }

-                else

-                {

-                    throw new ArgumentException(String.Format("unknown argument \"{0}\"", arg));

-                }

-

-                current++;

-            }

-

-            if (current == argCount)

-            {

-                throw new ArgumentException("missing argument: address");

-            }

-

-            address = args[current];

-        }

-

-        public string Url

-        {

-            get { return this.url; }

-        }

-

-        public string Address

-        {

-            get { return this.address; }

-        }

-

-        public int Timeout

-        {

-            get { return this.timeout; }

-        }

-

-        public int Count

-        {

-            get { return this.count; }

-        }

-

-        public string Id

-        {

-            get { return this.id; }

-        }

-

-        public string ReplyTo

-        {

-            get { return this.replyTo; }

-        }

-

-        public Collection<string> Entries

-        {

-            get { return this.entries; }

-        }

-

-        public string Content

-        {

-            get { return content; }

-        }

-

-        public string ConnectionOptions

-        {

-            get { return this.connectionOptions; }

-        }

-

-        public bool Forever

-        {

-            get { return this.forever; }

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
deleted file mode 100644
index f07c780..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.example.spout")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.example.spout")]

-[assembly: AssemblyCopyright("Copyright ?  2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("c60b17ab-a82c-4edf-ba95-1e88bd4c3e75")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
deleted file mode 100644
index 531abad..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*

- *

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- *

- */

-

-using System;

-using System.Diagnostics;

-using System.Collections;

-using System.Collections.Generic;

-using System.Collections.ObjectModel;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples {

-    class Spout {

-        //

-        // Sample invocation: csharp.example.spout.exe --broker localhost:5672 my-queue

-        // 

-        static bool NameVal(string In, out string nameOut, out string valueOut)

-        {

-            int pos = In.IndexOf("=");

-            if (-1 == pos) {

-                nameOut = In;

-                valueOut = "";

-                return false;

-            } else {

-                nameOut = In.Substring(0, pos);

-                if (pos + 1 < In.Length) {

-                    valueOut = In.Substring(pos + 1);

-                    return true;

-                } else {

-                    valueOut = "";

-                    return false;

-                }

-            }

-        }

-

-        static void SetEntries(Collection<string> entries, Dictionary<string, object> content)

-        {

-            foreach (String entry in entries)

-            {

-                string name = "";

-                string value = "";

-                if (NameVal(entry, out name, out value))

-                    content.Add(name, value);

-                else

-                    content.Add(name, "");

-            }

-        }

-

-        static int Main(string[] args) {

-            Options options = new Options(args);

-

-            Connection connection = null;

-            try

-            {

-                connection = new Connection(options.Url, options.ConnectionOptions);

-                connection.Open();

-                Session session = connection.CreateSession();

-                Sender sender = session.CreateSender(options.Address);

-                Message message;

-                if (options.Entries.Count > 0)

-                {

-                    Dictionary<string, object> content = new Dictionary<string, object>();

-                    SetEntries(options.Entries, content);

-                    message = new Message(content);

-                }

-                else

-                {

-                    message = new Message(options.Content);

-                    message.ContentType = "text/plain";

-                }

-                Address replyToAddr = new Address(options.ReplyTo);

-

-                Stopwatch stopwatch = new Stopwatch();

-                TimeSpan timespan = new TimeSpan(0,0,options.Timeout);

-                stopwatch.Start();

-                for (int count = 0;

-                    (0 == options.Count || count < options.Count) &&

-                    (0 == options.Timeout || stopwatch.Elapsed <= timespan);

-                    count++) 

-                {

-                    if ("" != options.ReplyTo) message.ReplyTo = replyToAddr;

-                    string id = options.Id ;

-                    if ("" == id) {

-                        Guid g = Guid.NewGuid();

-                        id = g.ToString();

-                    }

-                    string spoutid = id + ":" + count;

-                    message.SetProperty("spout-id", spoutid);

-                    sender.Send(message);

-                }

-                session.Sync();

-                connection.Close();

-                return 0;

-            } catch (Exception e) {

-                Console.WriteLine("Exception {0}.", e);

-                if (null != connection)

-                    connection.Close();

-            }

-            return 1;

-        }

-    }

-}

-

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index 459130e..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,54 +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.

-*/

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.map.callback.receiver")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.map.callback.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible

-// to COM components.  If you need to access a type in this assembly from

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("002049f9-41c5-420f-9ff6-45bb652dded6")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
deleted file mode 100644
index 3bc22b2..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
+++ /dev/null
@@ -1,310 +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.

- *

- */

-

-using System;

-using System.Collections.Generic;

-using System.Collections.ObjectModel;

-using Org.Apache.Qpid.Messaging;

-using Org.Apache.Qpid.Messaging.SessionReceiver;

-

-namespace Org.Apache.Qpid.Messaging.Examples

-{

-    /// <summary>

-    /// A class with functions to display structured messages.

-    /// </summary>

-    public static class MessageViewer

-    {

-        /// <summary>

-        /// A Function to display a amqp/map message packaged as a Dictionary.

-        /// </summary>

-        /// <param name="dict">The AMQP map</param>

-        /// <param name="level">Nested depth</param>

-        public static void ShowDictionary(Dictionary<string, object> dict, int level)

-        {

-            foreach (KeyValuePair<string, object> kvp in dict)

-            {

-                Console.Write(new string(' ', level * 4));

-

-                if (QpidTypeCheck.ObjectIsMap(kvp.Value))

-                {

-                    Console.WriteLine("Key: {0}, Value: Dictionary", kvp.Key);

-                    ShowDictionary((Dictionary<string, object>)kvp.Value, level + 1);

-                }

-                else if (QpidTypeCheck.ObjectIsList(kvp.Value))

-                {

-                    Console.WriteLine("Key: {0}, Value: List", kvp.Key);

-                    ShowList((Collection<object>)kvp.Value, level + 1);

-                }

-                else

-                    Console.WriteLine("Key: {0}, Value: {1}, Type: {2}",

-                        kvp.Key, kvp.Value, kvp.Value.GetType().ToString());

-            }

-        }

-

-        /// <summary>

-        /// A function to display a ampq/list message packaged as a List.

-        /// </summary>

-        /// <param name="list">The AMQP list</param>

-        /// <param name="level">Nested depth</param>

-        public static void ShowList(Collection<object> list, int level)

-        {

-            foreach (object obj in list)

-            {

-                Console.Write(new string(' ', level * 4));

-

-                if (QpidTypeCheck.ObjectIsMap(obj))

-                {

-                    Console.WriteLine("Dictionary");

-                    ShowDictionary((Dictionary<string, object>)obj, level + 1);

-                }

-                else if (QpidTypeCheck.ObjectIsList(obj))

-                {

-                    Console.WriteLine("List");

-                    ShowList((Collection<object>)obj, level + 1);

-                }

-                else

-                    Console.WriteLine("Value: {0}, Type: {1}",

-                        obj.ToString(), obj.GetType().ToString());

-            }

-        }

-

-        /// <summary>

-        /// A function to diplay a Message. The native Object type is

-        /// decomposed into AMQP types.

-        /// </summary>

-        /// <param name="message">The Message</param>

-        public static void ShowMessage(Message message)

-        {

-            if ("amqp/map" == message.ContentType)

-            {

-                Console.WriteLine("Received a Dictionary");

-                Dictionary<string, object> content = new Dictionary<string, object>();

-                message.GetContent(content);

-                ShowDictionary(content, 0);

-            }

-            else if ("amqp/list" == message.ContentType)

-            {

-                Console.WriteLine("Received a List");

-                Collection<object> content = new Collection<object>();

-                message.GetContent(content);

-                ShowList(content, 0);

-            }

-            else

-            {

-                Console.WriteLine("Received a String");

-                Console.WriteLine(message.GetContent());

-            }

-        }

-    }

-

-

-

-    /// <summary>

-    /// A model class to demonstrate how a user may use the Qpid Messaging

-    /// interface to receive Session messages using a callback.

-    /// </summary>

-    class ReceiverProcess : ISessionReceiver

-    {

-        UInt32 messagesReceived = 0;

-

-        /// <summary>

-        /// SessionReceiver implements the ISessionReceiver interface.

-        /// It is the callback function that receives all messages for a Session.

-        /// It may be called any time server is running.

-        /// It is always called on server's private thread.

-        /// </summary>

-        /// <param name="receiver">The Receiver associated with the message.</param>

-        /// <param name="message">The Message</param>

-        public void SessionReceiver(Receiver receiver, Message message)

-        {

-            //

-            // Indicate message reception

-            //

-            Console.WriteLine("--- Message {0}", ++messagesReceived);

-

-            //

-            // Display the received message

-            //

-            MessageViewer.ShowMessage(message);

-

-            //

-            // Acknowledge the receipt of all received messages.

-            //

-            receiver.Session.Acknowledge();

-        }

-

-

-        /// <summary>

-        /// SessionReceiver implements the ISessionReceiver interface.

-        /// It is the exception function that receives all exception messages

-        /// It may be called any time server is running.

-        /// It is always called on server's private thread.

-        /// After this is called then the sessionReceiver and private thread are closed.

-        /// </summary>

-        /// <param name="exception">The exception.</param>

-        public void SessionException(Exception exception)

-        {

-            // A typical application will take more action here.

-            Console.WriteLine("{0} Exception caught.", exception.ToString());

-        }

-

-

-        /// <summary>

-        /// Usage

-        /// </summary>

-        /// <param name="url">Connection target</param>

-        /// <param name="addr">Address: broker exchange + routing key</param>

-        /// <param name="nSec">n seconds to keep callback open</param>

-        static void usage(string url, string addr, int nSec)

-        {

-

-            Console.WriteLine("usage: {0} [url  [addr [nSec]]]",

-                System.Diagnostics.Process.GetCurrentProcess().ProcessName);

-            Console.WriteLine();

-            Console.WriteLine("A program to connect to a broker and receive");

-            Console.WriteLine("messages from a named exchange with a routing key.");

-            Console.WriteLine("The receiver uses a session callback and keeps the callback");

-            Console.WriteLine("server open for so many seconds.");

-            Console.WriteLine("The details of the message body's types and values are shown.");

-            Console.WriteLine();

-            Console.WriteLine(" url  = target address for 'new Connection(url)'");

-            Console.WriteLine(" addr = address for 'session.CreateReceiver(addr)'");

-            Console.WriteLine(" nSec = time in seconds to keep the receiver callback open");

-            Console.WriteLine();

-            Console.WriteLine("Default values:");

-            Console.WriteLine("  {0} {1} {2} {3}",

-                System.Diagnostics.Process.GetCurrentProcess().ProcessName,

-                url, addr, nSec);

-        }

-

-

-        /// <summary>

-        /// A function to illustrate how to open a Session callback and

-        /// receive messages.

-        /// </summary>

-        /// <param name="args">Main program arguments</param>

-        public int TestProgram(string[] args)

-        {

-            string url = "amqp:tcp:localhost:5672";

-            string addr = "amq.direct/map_example";

-            int nSec = 30;

-            string connectionOptions = "";

-

-            if (1 == args.Length)

-            {

-                if (args[0].Equals("-h") || args[0].Equals("-H") || args[0].Equals("/?"))

-                {

-                    usage(url, addr, nSec);

-                    return 1;

-                }

-            }

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                addr = args[1];

-            if (args.Length > 2)

-                nSec = System.Convert.ToInt32(args[2]);

-            if (args.Length > 3)

-                connectionOptions = args[3];

-

-            //

-            // Create and open an AMQP connection to the broker URL

-            //

-            Connection connection = new Connection(url, connectionOptions);

-            connection.Open();

-

-            //

-            // Create a session.

-            //

-            Session session = connection.CreateSession();

-

-            //

-            // Receive through callback

-            //

-            // Create callback server and implicitly start it

-            //

-            SessionReceiver.CallbackServer cbServer =

-                new SessionReceiver.CallbackServer(session, this);

-

-            //

-            // The callback server is running and executing callbacks on a

-            // separate thread.

-            //

-

-            //

-            // Create a receiver for the direct exchange using the

-            // routing key "map_example".

-            //

-            Receiver receiver = session.CreateReceiver(addr);

-

-            //

-            // Establish a capacity

-            //

-            receiver.Capacity = 100;

-

-            //

-            // Wait so many seconds for messages to arrive.

-            //

-            System.Threading.Thread.Sleep(nSec * 1000);   // in mS

-

-            //

-            // Stop the callback server.

-            //

-            cbServer.Close();

-

-            //

-            // Close the receiver and the connection.

-            //

-            try

-            {

-                receiver.Close();

-                connection.Close();

-            }

-            catch (Exception exception)

-            {

-                // receiver or connection may throw if they closed in error.

-                // A typical application will take more action here.

-                Console.WriteLine("{0} Closing exception caught.", exception.ToString());

-            }

-            return 0;

-        }

-    }

-

-

-    class MapCallbackReceiverMain

-    {

-        /// <summary>

-        /// Main program

-        /// </summary>

-        /// <param name="args">Main prgram args</param>

-        static int Main(string[] args)

-        {

-            // Invoke 'TestProgram' as non-static class.

-            ReceiverProcess mainProc = new ReceiverProcess();

-

-            int result = mainProc.TestProgram(args);

-

-            return result;

-        }

-    }

-}

-

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2be4011..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,54 +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.

-*/

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following 

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.map.callback.sender")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.map.callback.sender")]

-[assembly: AssemblyCopyright("Copyright 2010")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible 

-// to COM components.  If you need to access a type in this assembly from 

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("1eec2eca-adbd-4394-8b01-f4c4645bb122")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version 

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers 

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
deleted file mode 100644
index 4cc8856..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
+++ /dev/null
@@ -1,194 +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.

- *

- */

-

-using System;

-using System.Collections.Generic;

-using System.Collections.ObjectModel;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.Examples

-{

-    class MapSender

-    {

-        //

-        // usage

-        //

-        static void usage(string url, string addr, UInt32 count, string connOpts)

-        {

-

-            Console.WriteLine("usage: {0} [url  [addr [count]]]",

-                System.Diagnostics.Process.GetCurrentProcess().ProcessName);

-            Console.WriteLine();

-            Console.WriteLine("A program to connect to a broker and send N");

-            Console.WriteLine("messages to a named exchange with a routing key.");

-            Console.WriteLine();

-            Console.WriteLine(" url = target address for 'new Connection(url)'");

-            Console.WriteLine(" addr = address for 'session.CreateReceiver(addr)'");

-            Console.WriteLine(" count = number of messages to send");

-            Console.WriteLine(" connectionOptions = options list");

-            Console.WriteLine();

-            Console.WriteLine("Default values:");

-            Console.WriteLine("  {0} {1} {2} {3} {4}",

-                System.Diagnostics.Process.GetCurrentProcess().ProcessName,

-                url, addr, count, connOpts);

-        }

-

-        

-        //

-        // TestProgram

-        //

-        public int TestProgram(string[] args)

-        {

-            string url = "amqp:tcp:localhost:5672";

-            string addr = "amq.direct/map_example";

-            UInt32 count = 1;

-            string connectionOptions = "";

-

-            if (1 == args.Length)

-            {

-                if (args[0].Equals("-h") || args[0].Equals("-H") || args[0].Equals("/?"))

-                {

-                    usage(url, addr, count, connectionOptions);

-                    return 1;

-                }

-            }

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                addr = args[1];

-            if (args.Length > 2)

-                count = System.Convert.ToUInt32(args[2]);

-            if (args.Length > 3)

-                connectionOptions = args[3];

-            

-            //

-            // Create and open an AMQP connection to the broker URL

-            //

-            Connection connection = new Connection(url, connectionOptions);

-            connection.Open();

-

-            //

-            // Create a session and a sender to the direct exchange using the

-            // routing key "map_example".

-            //

-            Session session = connection.CreateSession();

-            Sender sender = session.CreateSender(addr);

-

-            //

-            // Create structured content for the message.  This example builds a

-            // map of items including a nested map and a list of values.

-            //

-            Dictionary<string, object> content = new Dictionary<string, object>();

-            Dictionary<string, object> subMap = new Dictionary<string, object>();

-            Collection<object> colors = new Collection<object>();

-

-            // add simple types

-            content["id"] = 987654321;

-            content["name"] = "Widget";

-            content["percent"] = 0.99;

-

-            // add nested amqp/map

-            subMap["name"] = "Smith";

-            subMap["number"] = 354;

-            content["nestedMap"] = subMap;

-

-            // add an amqp/list

-            colors.Add("red");

-            colors.Add("green");

-            colors.Add("white");

-            content["colorsList"] = colors;

-

-            // add one of each supported amqp data type

-            bool mybool = true;

-            content["mybool"] = mybool;

-

-            byte mybyte = 4;

-            content["mybyte"] = mybyte;

-

-            UInt16 myUInt16 = 5;

-            content["myUInt16"] = myUInt16;

-

-            UInt32 myUInt32 = 6;

-            content["myUInt32"] = myUInt32;

-

-            UInt64 myUInt64 = 7;

-            content["myUInt64"] = myUInt64;

-

-            char mychar = 'h';

-            content["mychar"] = mychar;

-

-            Int16 myInt16 = 9;

-            content["myInt16"] = myInt16;

-

-            Int32 myInt32 = 10;

-            content["myInt32"] = myInt32;

-

-            Int64 myInt64 = 11;

-            content["myInt64"] = myInt64;

-

-            Single mySingle = (Single)12.12;

-            content["mySingle"] = mySingle;

-

-            Double myDouble = 13.13;

-            content["myDouble"] = myDouble;

-

-            Guid myGuid = new Guid("000102030405060708090a0b0c0d0e0f");

-            content["myGuid"] = myGuid;

-

-            //

-            // Construct a message with the map content and send it synchronously

-            // via the sender.

-            //

-            Message message = new Message(content);

-            for (UInt32 i = 0; i<count; i++)

-                sender.Send(message, true);

-

-            //

-            // Wait until broker receives all messages.

-            //

-            session.Sync();

-

-            //

-            // Close the connection.

-            //

-            connection.Close();

-

-            return 0;

-        }

-    }

-

-    class MapSenderMain

-    {

-        //

-        // Main

-        //

-        static int Main(string[] args)

-        {

-            // Invoke 'TestProgram' as non-static class.

-            MapSender mainProc = new MapSender();

-

-            int result = mainProc.TestProgram(args);

-

-            return result;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
deleted file mode 100644
index f11ce8c..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.map.receiver")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.map.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible

-// to COM components.  If you need to access a type in this assembly from

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("002049f9-41c5-420f-9ff6-45bb652dded6")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
deleted file mode 100644
index f8bd9e9..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
+++ /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.

- *

- */

-

-using System;

-using System.Collections.Generic;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.examples

-{

-    class MapReceiver

-    {

-        // csharp.map.receiver example

-        //

-        // Send an amqp/map message to amqp:tcp:localhost:5672 amq.direct/map_example

-        // The map message 

-        //

-        static int Main(string[] args)

-        {

-            string url = "amqp:tcp:localhost:5672";

-            string address = "message_queue; {create: always}";

-            string connectionOptions = "";

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                address = args[1];

-            if (args.Length > 2)

-                connectionOptions = args[2];

-

-            //

-            // Create and open an AMQP connection to the broker URL

-            //

-            Connection connection = new Connection(url);

-            connection.Open();

-

-            //

-            // Create a session and a receiver fir the direct exchange using the

-            // routing key "map_example".

-            //

-            Session session = connection.CreateSession();

-            Receiver receiver = session.CreateReceiver(address);

-

-            //

-            // Fetch the message from the broker

-            //

-            Message message = receiver.Fetch(DurationConstants.MINUTE);

-

-            //

-            // Extract the structured content from the message.

-            //

-            Dictionary<string, object> content = new Dictionary<string, object>();

-            message.GetContent(content);

-            Console.WriteLine("{0}", message.AsString(content));

-

-            //

-            // Acknowledge the receipt of all received messages.

-            //

-            session.Acknowledge();

-

-            //

-            // Close the receiver and the connection.

-            //

-            receiver.Close();

-            connection.Close();

-            return 0;

-        }

-    }

-}

-

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
deleted file mode 100644
index ee09057..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,57 +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.

- *

- */

-

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-[assembly: AssemblyTitle("csharp.map.sender")]

-[assembly: AssemblyDescription("")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyCompany("")]

-[assembly: AssemblyProduct("csharp.map.sender")]

-[assembly: AssemblyCopyright("Copyright 2011")]

-[assembly: AssemblyTrademark("")]

-[assembly: AssemblyCulture("")]

-

-// Setting ComVisible to false makes the types in this assembly not visible

-// to COM components.  If you need to access a type in this assembly from

-// COM, set the ComVisible attribute to true on that type.

-[assembly: ComVisible(false)]

-

-// The following GUID is for the ID of the typelib if this project is exposed to COM

-[assembly: Guid("1eec2eca-adbd-4394-8b01-f4c4645bb122")]

-

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the values or you can default the Build and Revision Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("1.0.0.0")]

-[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
deleted file mode 100644
index 9001eb8..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
+++ /dev/null
@@ -1,146 +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.

- *

- */

-

-using System;

-using System.Collections.Generic;

-using System.Collections.ObjectModel;

-using Org.Apache.Qpid.Messaging;

-

-namespace Org.Apache.Qpid.Messaging.examples

-{

-    class MapSender

-    {

-        // csharp.map.sender example

-        //

-        // Send an amqp/map message to amqp:tcp:localhost:5672 amq.direct/map_example

-        // The map message contains simple types, a nested amqp/map,

-        // an ampq/list, and specific instances of each supported type.

-        //

-        static int Main(string[] args)

-        {

-            string url = "amqp:tcp:localhost:5672";

-            string address = "message_queue; {create: always}";

-            string connectionOptions = "";

-

-            if (args.Length > 0)

-                url = args[0];

-            if (args.Length > 1)

-                address = args[1];

-            if (args.Length > 2)

-                connectionOptions = args[2];

-

-            //

-            // Create and open an AMQP connection to the broker URL

-            //

-            Connection connection = new Connection(url, connectionOptions);

-            connection.Open();

-

-            //

-            // Create a session and a sender to the direct exchange

-            //

-            Session session = connection.CreateSession();

-            Sender sender = session.CreateSender(address);

-

-            //

-            // Create structured content for the message.  This example builds a

-            // map of items including a nested map and a list of values.

-            //

-            Dictionary<string, object> content = new Dictionary<string, object>();

-            Dictionary<string, object> subMap = new Dictionary<string, object>();

-            Collection<object> colors = new Collection<object>();

-

-            // add simple types

-            content["id"] = 987654321;

-            content["name"] = "Widget";

-            content["percent"] = 0.99;

-

-            // add nested amqp/map

-            subMap["name"] = "Smith";

-            subMap["number"] = 354;

-            content["nestedMap"] = subMap;

-

-            // add an amqp/list

-            colors.Add("red");

-            colors.Add("green");

-            colors.Add("white");

-            // list contains null value

-            colors.Add(null);

-            content["colorsList"] = colors;

-

-            // add one of each supported amqp data type

-            bool mybool = true;

-            content["mybool"] = mybool;

-

-            byte mybyte = 4;

-            content["mybyte"] = mybyte;

-

-            UInt16 myUInt16 = 5 ;

-            content["myUInt16"] = myUInt16;

-

-            UInt32 myUInt32 = 6;

-            content["myUInt32"] = myUInt32;

-

-            UInt64 myUInt64 = 7;

-            content["myUInt64"] = myUInt64;

-

-            char mychar = 'h';

-            content["mychar"] = mychar;

-

-            Int16 myInt16 = 9;

-            content["myInt16"] = myInt16;

-

-            Int32 myInt32 = 10;

-            content["myInt32"] = myInt32;

-

-            Int64 myInt64 = 11;

-            content["myInt64"] = myInt64;

-

-            Single mySingle = (Single)12.12;

-            content["mySingle"] = mySingle;

-

-            Double myDouble = 13.13;

-            content["myDouble"] = myDouble;

-

-            Guid myGuid = new Guid("000102030405060708090a0b0c0d0e0f");

-            content["myGuid"] = myGuid;

-

-            content["myNull"] = null;

-

-            //

-            // Construct a message with the map content and send it synchronously

-            // via the sender.

-            //

-            Message message = new Message(content);

-            sender.Send(message, true);

-

-            //

-            // Wait until broker receives all messages.

-            //

-            session.Sync();

-

-            //

-            // Close the connection.

-            //

-            connection.Close();

-            return 0;

-        }

-    }

-}

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
deleted file mode 100644
index 349708b..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- 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 ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{${DOTNET_projectGuid}}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>${DOTNET_projectName}</RootNamespace>
-    <AssemblyName>${DOTNET_projectName}</AssemblyName>
-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="${DOTNET_exampleRelPathToSrc}/${DOTNET_projectName}/${DOTNET_projectName}.cs" />
-    <Compile Include="${DOTNET_exampleRelPathToSrc}/${DOTNET_projectName}/Properties/AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
deleted file mode 100644
index b88171d..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{C43DEB69-8088-420B-B0CA-C699535E6D08}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.example.drain</RootNamespace>

-    <AssemblyName>csharp.example.drain</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\csharp.example.drain.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Options.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
deleted file mode 100644
index d6c7d43..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{EB36626D-36C2-41B3-B65E-762BAF27F137}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.example.spout</RootNamespace>

-    <AssemblyName>csharp.example.spout</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\csharp.example.spout.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Options.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
deleted file mode 100644
index ee851d3..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.30729</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{68A43817-2358-4A31-8FDF-FE21722BFBCF}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.map.callback.receiver</RootNamespace>

-    <AssemblyName>csharp.map.callback.receiver</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\csharp.map.callback.receiver.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="${DOTNET_exampleRelPathToSessionreceiverProj}">

-      <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>

-      <Name>org.apache.qpid.messaging.sessionreceiver</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
deleted file mode 100644
index 2fa6a63..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{12F1C14F-5C7D-4075-9BAE-C091394FF99A}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.map.callback.sender</RootNamespace>

-    <AssemblyName>csharp.map.callback.sender</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\csharp.map.callback.sender.cs" />

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
deleted file mode 100644
index 34fad8d..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{${DOTNET_projectGuid}}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>${DOTNET_projectName}</RootNamespace>
-    <AssemblyName>${DOTNET_projectName}</AssemblyName>
-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">
-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="${DOTNET_exampleRelPathToSrc}\${DOTNET_projectName}\${DOTNET_projectName}.cs">
-        <Link>${DOTNET_projectName}.cs</Link>
-    </Compile>
-    <Compile Include="${DOTNET_exampleRelPathToSrc}\${DOTNET_projectName}\Properties\AssemblyInfo.cs">
-        <Link>AssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="${DOTNET_exampleRelPathToAppConfig}">
-        <Link>app.config</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">
-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>
-      <Name>Org.Apache.Qpid.Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
deleted file mode 100644
index a1ff128..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.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.

--->

-<configuration>

-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>

diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
deleted file mode 100644
index 704dab7..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{C43DEB69-8088-420B-B0CA-C699535E6D08}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.example.drain</RootNamespace>

-    <AssemblyName>csharp.example.drain</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <UpgradeBackupLocation />

-    <TargetFrameworkProfile />

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\csharp.example.drain.cs">

-        <Link>csharp.example.drain.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Options.cs">

-        <Link>Options.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.drain\Properties\AssemblyInfo.cs">

-        <Link>AssemblyInfo.cs</Link>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="${DOTNET_exampleRelPathToAppConfig}">

-        <Link>App.Config</Link>

-    </None>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
deleted file mode 100644
index 492459b..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{EB36626D-36C2-41B3-B65E-762BAF27F137}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.example.spout</RootNamespace>

-    <AssemblyName>csharp.example.spout</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <UpgradeBackupLocation />

-    <TargetFrameworkProfile />

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\csharp.example.spout.cs">

-        <Link>csharp.example.spout.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Options.cs">

-        <Link>Options.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.example.spout\Properties\AssemblyInfo.cs">

-        <Link>AssemblyInfo.cs</Link>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="${DOTNET_exampleRelPathToAppConfig}">

-        <Link>App.Config</Link>

-    </None>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
deleted file mode 100644
index bf9beef..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{68A43817-2358-4A31-8FDF-FE21722BFBCF}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.map.callback.receiver</RootNamespace>

-    <AssemblyName>csharp.map.callback.receiver</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <UpgradeBackupLocation />

-    <TargetFrameworkProfile />

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\csharp.map.callback.receiver.cs">

-        <Link>csharp.map.callback.receiver.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.receiver\Properties\AssemblyInfo.cs">

-        <Link>AssemblyInfo.cs</Link>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-    <ProjectReference Include="${DOTNET_exampleRelPathToSessionreceiverProj}">

-      <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>

-      <Name>org.apache.qpid.messaging.sessionreceiver</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="${DOTNET_exampleRelPathToAppConfig}">

-        <Link>App.Config</Link>

-    </None>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
deleted file mode 100644
index f475921..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

- 

- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>

-    <ProductVersion>9.0.21022</ProductVersion>

-    <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{12F1C14F-5C7D-4075-9BAE-C091394FF99A}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace>csharp.map.callback.sender</RootNamespace>

-    <AssemblyName>csharp.map.callback.sender</AssemblyName>

-    <TargetFrameworkVersion>${DOTNET_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>

-    <FileAlignment>512</FileAlignment>

-    <FileUpgradeFlags>

-    </FileUpgradeFlags>

-    <OldToolsVersion>3.5</OldToolsVersion>

-    <UpgradeBackupLocation />

-    <TargetFrameworkProfile />

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x86' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x86</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">

-    <DebugSymbols>true</DebugSymbols>

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

-    <DebugType>full</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'RelWithDebInfo|x64' ">

-    <OutputPath>${PROJECT_BINARY_DIR}\src\$(Configuration)\</OutputPath>

-    <DefineConstants>TRACE</DefineConstants>

-    <Optimize>true</Optimize>

-    <DebugType>pdbonly</DebugType>

-    <PlatformTarget>x64</PlatformTarget>

-    <ErrorReport>prompt</ErrorReport>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\csharp.map.callback.sender.cs">

-        <Link>csharp.map.callback.sender.cs</Link>

-    </Compile>

-    <Compile Include="${DOTNET_exampleRelPathToSrc}\csharp.map.callback.sender\Properties\AssemblyInfo.cs">

-        <Link>AssemblyInfo.cs</Link>

-    </Compile>

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="${DOTNET_exampleRelPathToBindingProj}">

-      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

-      <Name>Org.Apache.Qpid.Messaging</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="${DOTNET_exampleRelPathToAppConfig}">

-        <Link>App.Config</Link>

-    </None>

-  </ItemGroup>

-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
diff --git a/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
deleted file mode 100644
index 5e754aa..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
+++ /dev/null
@@ -1,76 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}

-# ${DOTNET_SLN_VISUAL_STUDIO}

-#

-# 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}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug|x86 = Debug|x86

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release|x86 = Release|x86

-		RelWithDebInfo|Win32 = RelWithDebInfo|Win32

-		RelWithDebInfo|x64 = RelWithDebInfo|x64

-		RelWithDebInfo|x86 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.ActiveCfg = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.Build.0 = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.ActiveCfg = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.Build.0 = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|Win32.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.Build.0 = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.ActiveCfg = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.Build.0 = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|Win32.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.Build.0 = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.ActiveCfg = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.Build.0 = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
deleted file mode 100644
index 7ebbe7c..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
+++ /dev/null
@@ -1,346 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}

-# ${DOTNET_SLN_VISUAL_STUDIO}

-

-# 

-# 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}") = "Org.Apache.Qpid.Messaging", "${CMAKE_CURRENT_BINARY_DIR}\src\msvc9\org.apache.qpid.messaging.vcproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Direct", "Direct", "{DE58D329-10DC-4C8D-9EFA-230A57314089}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pub-Sub", "Pub-Sub", "{878FDDF8-A870-41D6-9E36-0A050EC5ACAB}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${CMAKE_CURRENT_BINARY_DIR}\test\messaging.test\msvc9\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuredMessage", "StructuredMessage", "{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${CMAKE_CURRENT_BINARY_DIR}\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Server", "{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hello World", "Hello World", "{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${CMAKE_CURRENT_BINARY_DIR}\examples\msvc9\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug|x86 = Debug|x86

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release|x86 = Release|x86

-		RelWithDebInfo|Win32 = RelWithDebInfo|Win32

-		RelWithDebInfo|x64 = RelWithDebInfo|x64

-		RelWithDebInfo|x86 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.ActiveCfg = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.Build.0 = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.ActiveCfg = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.Build.0 = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|Win32.ActiveCfg = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.ActiveCfg = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.Build.0 = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.ActiveCfg = Debug|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.Build.0 = Debug|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|Win32.ActiveCfg = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.ActiveCfg = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.Build.0 = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.ActiveCfg = Release|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.Build.0 = Release|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|Win32.ActiveCfg = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.ActiveCfg = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.Build.0 = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.ActiveCfg = Debug|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.Build.0 = Debug|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|Win32.ActiveCfg = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.ActiveCfg = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.Build.0 = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.ActiveCfg = Release|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.Build.0 = Release|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|Win32.ActiveCfg = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x64.ActiveCfg = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x64.Build.0 = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x86.ActiveCfg = Debug|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x86.Build.0 = Debug|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|Win32.ActiveCfg = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x64.ActiveCfg = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x64.Build.0 = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x86.ActiveCfg = Release|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x86.Build.0 = Release|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|Win32.ActiveCfg = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.ActiveCfg = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.Build.0 = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.ActiveCfg = Debug|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.Build.0 = Debug|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|Win32.ActiveCfg = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.ActiveCfg = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.Build.0 = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.ActiveCfg = Release|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.Build.0 = Release|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|Win32.ActiveCfg = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.ActiveCfg = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.Build.0 = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.ActiveCfg = Debug|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.Build.0 = Debug|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|Win32.ActiveCfg = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.ActiveCfg = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.Build.0 = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.ActiveCfg = Release|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.Build.0 = Release|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|Win32.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.Build.0 = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.ActiveCfg = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.Build.0 = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|Win32.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.Build.0 = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.ActiveCfg = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.Build.0 = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|Win32.ActiveCfg = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.ActiveCfg = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.Build.0 = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.ActiveCfg = Debug|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.Build.0 = Debug|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|Win32.ActiveCfg = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.ActiveCfg = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.Build.0 = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.ActiveCfg = Release|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.Build.0 = Release|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|Win32.ActiveCfg = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.ActiveCfg = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.Build.0 = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.ActiveCfg = Debug|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.Build.0 = Debug|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|Win32.ActiveCfg = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.ActiveCfg = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.Build.0 = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.ActiveCfg = Release|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.Build.0 = Release|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|Win32.ActiveCfg = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.ActiveCfg = Debug|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.Build.0 = Debug|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.ActiveCfg = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.Build.0 = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|Win32.ActiveCfg = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.ActiveCfg = Release|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.Build.0 = Release|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.ActiveCfg = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.Build.0 = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|Win32.ActiveCfg = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.ActiveCfg = Debug|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.Build.0 = Debug|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.ActiveCfg = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.Build.0 = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|Win32.ActiveCfg = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.ActiveCfg = Release|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.Build.0 = Release|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.ActiveCfg = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.Build.0 = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|Win32.ActiveCfg = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.ActiveCfg = Debug|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.Build.0 = Debug|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.ActiveCfg = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.Build.0 = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|Win32.ActiveCfg = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.ActiveCfg = Release|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.Build.0 = Release|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.ActiveCfg = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.Build.0 = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|Win32.ActiveCfg = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.ActiveCfg = Debug|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.Build.0 = Debug|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.ActiveCfg = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.Build.0 = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|Win32.ActiveCfg = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.ActiveCfg = Release|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.Build.0 = Release|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.ActiveCfg = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.Build.0 = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|Win32.ActiveCfg = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.ActiveCfg = Debug|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.Build.0 = Debug|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.ActiveCfg = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.Build.0 = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|Win32.ActiveCfg = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.ActiveCfg = Release|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.Build.0 = Release|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.ActiveCfg = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.Build.0 = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|Win32.ActiveCfg = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.ActiveCfg = Debug|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.Build.0 = Debug|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.ActiveCfg = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.Build.0 = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|Win32.ActiveCfg = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.ActiveCfg = Release|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.Build.0 = Release|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.ActiveCfg = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.Build.0 = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-	GlobalSection(NestedProjects) = preSolution

-		{DE58D329-10DC-4C8D-9EFA-230A57314089} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{878FDDF8-A870-41D6-9E36-0A050EC5ACAB} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{89CE04CB-21DE-4ABB-9236-50529DD8C022} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068} = {DE58D329-10DC-4C8D-9EFA-230A57314089}

-		{52F880E7-D677-4C91-8516-D679CE0F46A8} = {DE58D329-10DC-4C8D-9EFA-230A57314089}

-		{AF2FBC78-266C-430C-BC29-9477AB596A36} = {39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}

-		{090A081D-E8B5-4949-AA43-EE182B7101E3} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}

-		{C43DEB69-8088-420B-B0CA-C699535E6D08} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{EB36626D-36C2-41B3-B65E-762BAF27F137} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{E31B349C-830C-4583-8BD9-30DA4398349F} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D} = {4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
deleted file mode 100644
index 2909a66..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
+++ /dev/null
@@ -1,77 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}

-# ${DOTNET_SLN_VISUAL_STUDIO}

-

-# 

-# 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}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug|x86 = Debug|x86

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release|x86 = Release|x86

-		RelWithDebInfo|Win32 = RelWithDebInfo|Win32

-		RelWithDebInfo|x64 = RelWithDebInfo|x64

-		RelWithDebInfo|x86 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.ActiveCfg = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.Build.0 = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.ActiveCfg = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.Build.0 = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|Win32.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.Build.0 = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.ActiveCfg = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.Build.0 = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|Win32.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.Build.0 = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.ActiveCfg = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.Build.0 = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
deleted file mode 100644
index aa1820c..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
+++ /dev/null
@@ -1,344 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version ${DOTNET_SLN_FILE_FORMAT}

-# ${DOTNET_SLN_VISUAL_STUDIO}

-

-# 

-# 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{34C477FB-B0CC-4AB9-A346-EA7B055469AC}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Direct", "Direct", "{DE58D329-10DC-4C8D-9EFA-230A57314089}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pub-Sub", "Pub-Sub", "{878FDDF8-A870-41D6-9E36-0A050EC5ACAB}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StructuredMessage", "StructuredMessage", "{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client-Server", "Client-Server", "{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Drain-Spout", "Drain-Spout", "{89CE04CB-21DE-4ABB-9236-50529DD8C022}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org.apache.qpid.messaging", "${DOTNET_currentBinaryDir}\src\msvcx\org.apache.qpid.messaging.vcxproj", "{AA5A3B83-5F98-406D-A01C-5A921467A57D}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.sender\csharp.direct.sender.csproj", "{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.direct.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.direct.receiver\csharp.direct.receiver.csproj", "{52F880E7-D677-4C91-8516-D679CE0F46A8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "messaging.test", "${DOTNET_currentBinaryDir}\test\messaging.test\msvcx\messaging.test.csproj", "{AF2FBC78-266C-430C-BC29-9477AB596A36}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.sender\csharp.map.sender.csproj", "{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.receiver\csharp.map.receiver.csproj", "{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}"

-	ProjectSection(ProjectDependencies) = postProject

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D} = {AA5A3B83-5F98-406D-A01C-5A921467A57D}

-	EndProjectSection

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "org.apache.qpid.messaging.sessionreceiver", "${DOTNET_currentBinaryDir}\src\sessionreceiver\msvcx\org.apache.qpid.messaging.sessionreceiver.csproj", "{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.receiver", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.receiver\csharp.map.callback.receiver.csproj", "{68A43817-2358-4A31-8FDF-FE21722BFBCF}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.map.callback.sender", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.map.callback.sender\csharp.map.callback.sender.csproj", "{12F1C14F-5C7D-4075-9BAE-C091394FF99A}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.client", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.client\csharp.example.client.csproj", "{0DE01712-C2D1-4CA4-B42C-5856456A8696}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.server", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.server\csharp.example.server.csproj", "{090A081D-E8B5-4949-AA43-EE182B7101E3}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.drain", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.drain\csharp.example.drain.csproj", "{C43DEB69-8088-420B-B0CA-C699535E6D08}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.spout", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.spout\csharp.example.spout.csproj", "{EB36626D-36C2-41B3-B65E-762BAF27F137}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.declare_queues", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.declare_queues\csharp.example.declare_queues.csproj", "{E31B349C-830C-4583-8BD9-30DA4398349F}"

-EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp.example.helloworld", "${DOTNET_currentBinaryDir}\examples\msvcx\csharp.example.helloworld\csharp.example.helloworld.csproj", "{8CC1C265-0507-44A3-9483-8FAF48513F4D}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug|x86 = Debug|x86

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release|x86 = Release|x86

-		RelWithDebInfo|Win32 = RelWithDebInfo|Win32

-		RelWithDebInfo|x64 = RelWithDebInfo|x64

-		RelWithDebInfo|x86 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|Win32.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.ActiveCfg = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x64.Build.0 = Debug|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.ActiveCfg = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Debug|x86.Build.0 = Debug|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|Win32.Build.0 = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.ActiveCfg = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x64.Build.0 = Release|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.Release|x86.ActiveCfg = Release|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AA5A3B83-5F98-406D-A01C-5A921467A57D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|Win32.ActiveCfg = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.ActiveCfg = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x64.Build.0 = Debug|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.ActiveCfg = Debug|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Debug|x86.Build.0 = Debug|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|Win32.ActiveCfg = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.ActiveCfg = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x64.Build.0 = Release|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.ActiveCfg = Release|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.Release|x86.Build.0 = Release|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|Win32.ActiveCfg = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.ActiveCfg = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x64.Build.0 = Debug|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.ActiveCfg = Debug|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Debug|x86.Build.0 = Debug|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|Win32.ActiveCfg = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.ActiveCfg = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x64.Build.0 = Release|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.ActiveCfg = Release|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.Release|x86.Build.0 = Release|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{52F880E7-D677-4C91-8516-D679CE0F46A8}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|Win32.ActiveCfg = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x64.ActiveCfg = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x64.Build.0 = Debug|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x86.ActiveCfg = Debug|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Debug|x86.Build.0 = Debug|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|Win32.ActiveCfg = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x64.ActiveCfg = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x64.Build.0 = Release|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x86.ActiveCfg = Release|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.Release|x86.Build.0 = Release|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{AF2FBC78-266C-430C-BC29-9477AB596A36}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|Win32.ActiveCfg = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.ActiveCfg = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x64.Build.0 = Debug|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.ActiveCfg = Debug|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Debug|x86.Build.0 = Debug|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|Win32.ActiveCfg = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.ActiveCfg = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x64.Build.0 = Release|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.ActiveCfg = Release|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.Release|x86.Build.0 = Release|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|Win32.ActiveCfg = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.ActiveCfg = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x64.Build.0 = Debug|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.ActiveCfg = Debug|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Debug|x86.Build.0 = Debug|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|Win32.ActiveCfg = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.ActiveCfg = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x64.Build.0 = Release|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.ActiveCfg = Release|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.Release|x86.Build.0 = Release|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|Win32.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.ActiveCfg = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x64.Build.0 = Debug|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.ActiveCfg = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Debug|x86.Build.0 = Debug|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|Win32.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.ActiveCfg = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x64.Build.0 = Release|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.ActiveCfg = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.Release|x86.Build.0 = Release|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|Win32.ActiveCfg = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.ActiveCfg = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x64.Build.0 = Debug|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.ActiveCfg = Debug|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Debug|x86.Build.0 = Debug|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|Win32.ActiveCfg = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.ActiveCfg = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x64.Build.0 = Release|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.ActiveCfg = Release|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.Release|x86.Build.0 = Release|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|Win32.ActiveCfg = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.ActiveCfg = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x64.Build.0 = Debug|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.ActiveCfg = Debug|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Debug|x86.Build.0 = Debug|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|Win32.ActiveCfg = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.ActiveCfg = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x64.Build.0 = Release|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.ActiveCfg = Release|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.Release|x86.Build.0 = Release|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|Win32.ActiveCfg = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.ActiveCfg = Debug|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x64.Build.0 = Debug|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.ActiveCfg = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Debug|x86.Build.0 = Debug|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|Win32.ActiveCfg = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.ActiveCfg = Release|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x64.Build.0 = Release|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.ActiveCfg = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.Release|x86.Build.0 = Release|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|Win32.ActiveCfg = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.ActiveCfg = Debug|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x64.Build.0 = Debug|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.ActiveCfg = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Debug|x86.Build.0 = Debug|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|Win32.ActiveCfg = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.ActiveCfg = Release|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x64.Build.0 = Release|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.ActiveCfg = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.Release|x86.Build.0 = Release|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{090A081D-E8B5-4949-AA43-EE182B7101E3}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|Win32.ActiveCfg = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.ActiveCfg = Debug|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x64.Build.0 = Debug|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.ActiveCfg = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Debug|x86.Build.0 = Debug|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|Win32.ActiveCfg = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.ActiveCfg = Release|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x64.Build.0 = Release|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.ActiveCfg = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.Release|x86.Build.0 = Release|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{C43DEB69-8088-420B-B0CA-C699535E6D08}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|Win32.ActiveCfg = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.ActiveCfg = Debug|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x64.Build.0 = Debug|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.ActiveCfg = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Debug|x86.Build.0 = Debug|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|Win32.ActiveCfg = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.ActiveCfg = Release|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x64.Build.0 = Release|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.ActiveCfg = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.Release|x86.Build.0 = Release|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{EB36626D-36C2-41B3-B65E-762BAF27F137}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|Win32.ActiveCfg = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.ActiveCfg = Debug|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x64.Build.0 = Debug|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.ActiveCfg = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Debug|x86.Build.0 = Debug|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|Win32.ActiveCfg = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.ActiveCfg = Release|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x64.Build.0 = Release|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.ActiveCfg = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.Release|x86.Build.0 = Release|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{E31B349C-830C-4583-8BD9-30DA4398349F}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|Win32.ActiveCfg = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.ActiveCfg = Debug|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x64.Build.0 = Debug|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.ActiveCfg = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Debug|x86.Build.0 = Debug|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|Win32.ActiveCfg = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.ActiveCfg = Release|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x64.Build.0 = Release|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.ActiveCfg = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.Release|x86.Build.0 = Release|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x86

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x86

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-	GlobalSection(NestedProjects) = preSolution

-		{DE58D329-10DC-4C8D-9EFA-230A57314089} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{878FDDF8-A870-41D6-9E36-0A050EC5ACAB} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{E99FEFEE-B866-4BBA-9AA3-79DDF1C92960} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{9232212E-F3C6-4D18-8D25-0C31DD5FF3DB} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{89CE04CB-21DE-4ABB-9236-50529DD8C022} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{4408A2DA-ED2D-44AE-A465-0B6D75E1FF86} = {34C477FB-B0CC-4AB9-A346-EA7B055469AC}

-		{7B71CE78-8E78-4632-ADBE-F4D5DFAE0068} = {DE58D329-10DC-4C8D-9EFA-230A57314089}

-		{52F880E7-D677-4C91-8516-D679CE0F46A8} = {DE58D329-10DC-4C8D-9EFA-230A57314089}

-		{AF2FBC78-266C-430C-BC29-9477AB596A36} = {39E9D1BF-3A0B-4D86-BF6B-F463E1A2245A}

-		{5D8252F5-E1D3-44A0-94C7-7CB75E843C10} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{AD9E53D7-DB10-4DA2-84D2-A81BE09B04E9} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{68A43817-2358-4A31-8FDF-FE21722BFBCF} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{12F1C14F-5C7D-4075-9BAE-C091394FF99A} = {E99FEFEE-B866-4BBA-9AA3-79DDF1C92960}

-		{0DE01712-C2D1-4CA4-B42C-5856456A8696} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}

-		{090A081D-E8B5-4949-AA43-EE182B7101E3} = {9232212E-F3C6-4D18-8D25-0C31DD5FF3DB}

-		{C43DEB69-8088-420B-B0CA-C699535E6D08} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{EB36626D-36C2-41B3-B65E-762BAF27F137} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{E31B349C-830C-4583-8BD9-30DA4398349F} = {89CE04CB-21DE-4ABB-9236-50529DD8C022}

-		{8CC1C265-0507-44A3-9483-8FAF48513F4D} = {4408A2DA-ED2D-44AE-A465-0B6D75E1FF86}

-	EndGlobalSection

-EndGlobal

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
deleted file mode 100644
index e47db9f..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
+++ /dev/null
@@ -1,273 +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 <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Address.h"

-

-#include "Address.h"

-#include "QpidMarshal.h"

-#include "QpidTypeCheck.h"

-#include "TypeTranslator.h"

-#include "QpidException.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Address is a managed wrapper for a qpid::messaging::Address

-    /// </summary>

-

-    // Disallow access if object has been destroyed.

-    void Address::ThrowIfDisposed()

-    {

-        if (IsDisposed)

-            throw gcnew ObjectDisposedException (GetType()->FullName);

-    }

-

-

-    // Create empty

-    Address::Address()

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address(QpidMarshal::ToNative(""));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create string address

-    Address::Address(System::String ^ address)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address(QpidMarshal::ToNative(address));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create with options

-    Address::Address(System::String ^ name,

-        System::String ^ subject,

-        System::Collections::Generic::Dictionary<

-        System::String ^, System::Object ^> ^ options)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address();

-

-            Name = name;

-            Subject = subject;

-            Options = options;

-            Type = "";

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create with options and type

-    Address::Address(System::String ^ name,

-        System::String ^ subject,

-        System::Collections::Generic::Dictionary<

-        System::String ^, System::Object ^> ^ options,

-        System::String ^ type)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address();

-

-            Name = name;

-            Subject = subject;

-            Options = options;

-            Type = type;

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Copy constructor look-alike (C#)

-    Address::Address(const Address ^ address)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address(

-                *(const_cast<Address ^>(address)->NativeAddress));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Copy constructor implicitly dereferenced (C++)

-    Address::Address(const Address % address)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address(

-                *(const_cast<Address %>(address).NativeAddress));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // unmanaged clone

-    Address::Address(const ::qpid::messaging::Address & addrp)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Address(addrp);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Destructor

-    Address::~Address()

-    {

-        this->!Address();

-    }

-

-

-    // Finalizer

-    Address::!Address()

-    {

-        if (NULL != nativeObjPtr)

-        {

-            msclr::lock lk(privateLock);

-

-            if (NULL != nativeObjPtr)

-            {

-                delete nativeObjPtr;

-                nativeObjPtr = NULL;

-            }

-        }

-    }

-

-    //

-    // ToString

-    //

-    System::String ^ Address::ToStr()

-    {

-        System::String ^ result = nullptr;

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            result = gcnew System::String(nativeObjPtr->str().c_str());

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-        return result;

-    }

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Address.h b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
deleted file mode 100644
index 108a265..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Address.h
+++ /dev/null
@@ -1,232 +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.

-*/

-

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Address.h"

-

-#include "QpidMarshal.h"

-#include "QpidTypeCheck.h"

-#include "TypeTranslator.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Address is a managed wrapper for a qpid::messaging::Address

-    /// </summary>

-

-    public ref class Address

-    {

-    private:

-        // The kept object in the Messaging C++ DLL

-        ::qpid::messaging::Address * nativeObjPtr;

-

-        // per-instance lock object

-        System::Object ^ privateLock;

-

-        // Disallow use after object is destroyed

-        void ThrowIfDisposed();

-

-    public:

-        Address();

-

-        Address(System::String ^ address);

-

-        Address(System::String ^ name,

-            System::String ^ subject,

-            System::Collections::Generic::Dictionary<

-            System::String ^, System::Object ^> ^ options);

-

-        Address(System::String ^ name,

-            System::String ^ subject,

-            System::Collections::Generic::Dictionary<

-            System::String ^, System::Object ^> ^ options,

-            System::String ^ type);

-

-        // copy constructor

-        Address(const Address ^ address);

-        Address(const Address % address);

-

-        // unmanaged clone

-        Address(const ::qpid::messaging::Address & addrp);

-

-        // System destructor/finalizer entry points

-        ~Address();

-        !Address();

-

-        // assignment operator

-        Address % operator=(const Address % rhs)

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            if (this == %rhs)

-            {

-                // Self assignment, do nothing

-            }

-            else

-            {

-                if (NULL != nativeObjPtr)

-                    delete nativeObjPtr;

-                nativeObjPtr = new ::qpid::messaging::Address(

-                    *(const_cast<Address %>(rhs).NativeAddress) );

-            }

-            return *this;

-        }

-

-        //

-        // IsDisposed

-        //

-        property bool IsDisposed

-        {

-            bool get()

-            {

-                return NULL == nativeObjPtr;

-            }

-        }

-

-

-        //

-        // NativeAddress

-        //

-        property ::qpid::messaging::Address * NativeAddress

-        {

-            ::qpid::messaging::Address * get ()

-            {

-                return nativeObjPtr;

-            }

-        }

-

-        //

-        // name

-        //

-        property System::String ^ Name

-        {

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew System::String(nativeObjPtr->getName().c_str());

-            }

-

-            void set (System::String ^ name)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->::qpid::messaging::Address::setName(QpidMarshal::ToNative(name));

-            }

-        }

-

-

-        //

-        // subject

-        //

-        property System::String ^ Subject

-        {

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew System::String(nativeObjPtr->getSubject().c_str());

-            }

-

-            void set (System::String ^ subject)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setSubject(QpidMarshal::ToNative(subject));

-            }

-        }

-

-

-        //

-        // options

-        //

-        property  System::Collections::Generic::Dictionary<

-            System::String ^, System::Object ^> ^ Options

-        {

-            System::Collections::Generic::Dictionary<

-                System::String ^, System::Object ^> ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                ::qpid::types::Variant::Map map;

-                System::Collections::Generic::Dictionary<

-                    System::String ^, System::Object ^> ^ newMap =

-                    gcnew System::Collections::Generic::Dictionary<

-                    System::String ^, System::Object ^>;

-                map = nativeObjPtr->getOptions();

-                TypeTranslator::NativeToManaged(map, newMap);

-                return newMap;

-            }

-

-

-            void set (System::Collections::Generic::Dictionary<

-                System::String ^, System::Object ^> ^ options)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                ::qpid::types::Variant::Map map;

-                TypeTranslator::ManagedToNative(options, map);

-                nativeObjPtr->setOptions(map);

-            }

-        }

-

-

-        //

-        // type

-        //

-        property System::String ^ Type

-        {

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew System::String(nativeObjPtr->getType().c_str());

-            }

-

-

-            void set (System::String ^ type)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setType(QpidMarshal::ToNative(type));

-            }

-        }

-

-        System::String ^ ToStr();

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
deleted file mode 100644
index 00d5090..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.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.

-*/

-

-using namespace System;

-using namespace System::Reflection;

-using namespace System::Runtime::CompilerServices;

-using namespace System::Runtime::InteropServices;

-using namespace System::Security::Permissions;

-

-//

-// General Information about an assembly is controlled through the following

-// set of attributes. Change these attribute values to modify the information

-// associated with an assembly.

-//

-[assembly:AssemblyTitleAttribute("org.apache.qpid.messaging")];

-[assembly:AssemblyDescriptionAttribute("")];

-[assembly:AssemblyConfigurationAttribute("")];

-[assembly:AssemblyCompanyAttribute("")];

-[assembly:AssemblyProductAttribute("org.apache.qpid.messaging")];

-[assembly:AssemblyCopyrightAttribute("Copyright (c)  2010")];

-[assembly:AssemblyTrademarkAttribute("")];

-[assembly:AssemblyCultureAttribute("")];

-

-//

-// Version information for an assembly consists of the following four values:

-//

-//      Major Version

-//      Minor Version

-//      Build Number

-//      Revision

-//

-// You can specify all the value or you can default the Revision and Build Numbers

-// by using the '*' as shown below:

-// [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyVersion("${winver_PRODUCT_VERSION_N1}.${winver_PRODUCT_VERSION_N2}.${winver_PRODUCT_VERSION_N3}.${winver_PRODUCT_VERSION_N4}")]

-[assembly: AssemblyFileVersion("${winver_FILE_VERSION_N1}.${winver_FILE_VERSION_N2}.${winver_FILE_VERSION_N3}.${winver_FILE_VERSION_N4}")]

-

-[assembly:ComVisible(false)];

-

-[assembly:CLSCompliantAttribute(true)];

-

-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
deleted file mode 100644
index d4d5d2f..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
+++ /dev/null
@@ -1,465 +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 <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Connection.h"

-#include "qpid/messaging/Session.h"

-#include "qpid/messaging/exceptions.h"

-

-#include "QpidMarshal.h"

-#include "Connection.h"

-#include "Session.h"

-#include "QpidException.h"

-#include "TypeTranslator.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Connection is a managed wrapper for a qpid::messaging::Connection

-    /// </summary>

-

-    // Disallow access if object has been destroyed.

-    void Connection::ThrowIfDisposed()

-    {

-        if (IsDisposed)

-            throw gcnew ObjectDisposedException (GetType()->FullName);

-    }

-

-

-    // constructors

-    Connection::Connection(System::String ^ url)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Connection(QpidMarshal::ToNative(url));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    Connection::Connection(System::String ^ url,

-        System::Collections::Generic::Dictionary<

-        System::String ^, System::Object ^> ^ options)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Connection(QpidMarshal::ToNative(url));

-

-            for each (System::Collections::Generic::KeyValuePair<System::String^, System::Object^> kvp in options)

-            {

-                SetOption(kvp.Key, kvp.Value);

-            }

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    Connection::Connection(System::String ^ url, System::String ^ options)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Connection(QpidMarshal::ToNative(url),

-                QpidMarshal::ToNative(options));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // Copy constructor look-alike (C#)

-    Connection::Connection(const Connection ^ connection)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Connection(

-                *(const_cast<Connection ^>(connection)->NativeConnection));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Copy constructor implicitly dereferenced (C++)

-    Connection::Connection(const Connection % connection)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Connection(

-                *(const_cast<Connection %>(connection).NativeConnection));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // Destructor

-    Connection::~Connection()

-    {

-        this->!Connection();

-    }

-

-

-    // Finalizer

-    Connection::!Connection()

-    {

-        if (NULL != nativeObjPtr)

-        {

-            msclr::lock lk(privateLock);

-

-            if (NULL != nativeObjPtr)

-            {

-                delete nativeObjPtr;

-                nativeObjPtr = NULL;

-            }

-        }

-    }

-

-

-    void Connection::SetOption(System::String ^ name, System::Object ^ value)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            ::qpid::types::Variant entryValue;

-            TypeTranslator::ManagedToNativeObject(value, entryValue);

-            std::string entryName = QpidMarshal::ToNative(name);

-            nativeObjPtr->::qpid::messaging::Connection::setOption(entryName, entryValue);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    void Connection::Open()

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            nativeObjPtr->open();

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    void Connection::Close()

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            nativeObjPtr->close();

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    void Connection::Reconnect(System::String ^ url)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            std::string nativeUrl = QpidMarshal::ToNative(url);

-            nativeObjPtr->reconnect(nativeUrl);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    void Connection::Reconnect()

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            nativeObjPtr->reconnect();

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    //

-    // CreateTransactionalSession()

-    //

-    Session ^ Connection::CreateTransactionalSession()

-    {

-        return CreateTransactionalSession("");

-    }

-

-

-    Session ^ Connection::CreateTransactionalSession(System::String ^ name)

-    {

-        System::Exception          ^ newException = nullptr;

-        Session                    ^ newSession   = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            // create native session

-            ::qpid::messaging::Session sessionp =

-                nativeObjPtr->createTransactionalSession(QpidMarshal::ToNative(name));

-

-            // create managed session

-            newSession = gcnew Session(sessionp, this);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-        finally

-        {

-            // Clean up and throw on caught exceptions

-            if (newException != nullptr)

-            {

-                if (newSession != nullptr)

-                {

-                    delete newSession;

-                }

-            }

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-

-        return newSession;

-    }

-

-

-    //

-    // CreateSession()

-    //

-    Session ^ Connection::CreateSession()

-    {

-        return CreateSession("");

-    }

-

-

-    Session ^ Connection::CreateSession(System::String ^ name)

-    {

-        System::Exception          ^ newException = nullptr;

-        Session                    ^ newSession   = nullptr;

-

-        try

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            // create native session

-            ::qpid::messaging::Session sessionp =

-                nativeObjPtr->createSession(QpidMarshal::ToNative(name));

-

-            // create managed session

-            newSession = gcnew Session(sessionp, this);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-        finally

-        {

-            // Clean up and throw on caught exceptions

-            if (newException != nullptr)

-            {

-                if (newSession != nullptr)

-                {

-                    delete newSession;

-                }

-            }

-        }

-

-        if (nullptr != newException)

-        {

-            throw newException;

-        }

-

-        return newSession;

-    }

-

-

-    Session ^ Connection::GetSession(System::String ^ name)

-    {

-        System::Exception          ^ newException = nullptr;

-        Session                    ^ newSession   = nullptr;

-

-        try

-        {

-            const std::string n = QpidMarshal::ToNative(name);

-

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            ::qpid::messaging::Session sess =

-                nativeObjPtr->::qpid::messaging::Connection::getSession(n);

-

-            newSession = gcnew Session(sess, this);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-        finally

-        {

-            // Clean up and throw on caught exceptions

-            if (newException != nullptr)

-            {

-                if (newSession != nullptr)

-                {

-                    delete newSession;

-                }

-            }

-        }

-

-        if (nullptr != newException)

-        {

-            throw newException;

-        }

-

-        return newSession;

-    }

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Connection.h b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
deleted file mode 100644
index 82b5262..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
+++ /dev/null
@@ -1,167 +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.

-*/

-

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Connection.h"

-#include "qpid/messaging/Session.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Connection is a managed wrapper for a qpid::messaging::Connection

-    /// </summary>

-

-    ref class Session;

-

-    public ref class Connection

-    {

-    private:

-        // The kept object in the Messaging C++ DLL

-        ::qpid::messaging::Connection * nativeObjPtr;

-

-        // per-instance lock object

-        System::Object ^ privateLock;

-

-        // Disallow use after object is destroyed

-        void ThrowIfDisposed();

-

-    public:

-        Connection(System::String ^ url);

-

-        Connection(System::String ^ url,

-            System::Collections::Generic::Dictionary<

-            System::String ^, System::Object ^> ^ options);

-

-        Connection(System::String ^ url, System::String ^ options);

-

-        // copy constructor

-        Connection(const Connection ^ connection);

-        Connection(const Connection % connection);

-

-        // unmanaged clone

-        // not defined

-

-        ~Connection();

-        !Connection();

-

-        // assignment operator

-        Connection % operator=(const Connection % rhs)

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            if (this == %rhs)

-            {

-                // Self assignment, do nothing

-            }

-            else

-            {

-                if (NULL != nativeObjPtr)

-                    delete nativeObjPtr;

-                nativeObjPtr = new ::qpid::messaging::Connection(

-                    *(const_cast<Connection %>(rhs).NativeConnection) );

-            }

-            return *this;

-        }

-

-        //

-        // IsDisposed

-        //

-        property bool IsDisposed

-        {

-            bool get()

-            {

-                return NULL == nativeObjPtr;

-            }

-        }

-

-

-        //

-        // NativeConnection

-        //

-        property ::qpid::messaging::Connection * NativeConnection

-        {

-            ::qpid::messaging::Connection * get ()

-            {

-                return nativeObjPtr;

-            }

-        }

-

-        void SetOption(System::String ^ name, System::Object ^ value);

-

-        void Open();

-        void Close();

-

-        property System::Boolean IsOpen

-        {

-            System::Boolean get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return nativeObjPtr->isOpen();

-            }

-        }

-

-        void Reconnect(System::String ^ url);

-        void Reconnect();

-        

-        property System::String ^ Url

-        {

-            System::String ^ get()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew System::String(nativeObjPtr->getUrl().c_str());

-            }

-        }

-

-        // CreateTransactionalSession()

-        Session ^ CreateTransactionalSession();

-        Session ^ CreateTransactionalSession(System::String ^ name);

-

-        // CreateSession()

-        Session ^ CreateSession();

-        Session ^ CreateSession(System::String ^ name);

-

-        Session ^ GetSession(System::String ^ name);

-

-        property System::String ^ AuthenticatedUsername

-        {

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew System::String(nativeObjPtr->getAuthenticatedUsername().c_str());

-            }

-        }

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Duration.h b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
deleted file mode 100644
index d449992..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
+++ /dev/null
@@ -1,113 +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.

-*/

-

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Duration is a time interval in milliseconds.

-    /// It is a managed equivalent of ::qpid::messaging::Duration

-    /// </summary>

-

-    public ref class Duration sealed

-    {

-    private:

-        System::UInt64 milliseconds;

-

-    public:

-

-        Duration(const Duration % rhs)

-            : milliseconds(rhs.milliseconds) {}

-

-        explicit Duration(System::UInt64 mS)

-            : milliseconds(mS) {}

-

-        Duration()

-            : milliseconds(System::UInt64::MaxValue) {}

-

-        property System::UInt64 Milliseconds

-        {

-            System::UInt64 get () { return milliseconds; }

-        }

-

-        static Duration ^ operator * (Duration ^ dur, const System::UInt64 multiplier)

-        {

-            Duration ^ result = gcnew Duration(dur->Milliseconds * multiplier);

-            return result;

-        }

-

-        static Duration ^ operator * (const System::UInt64 multiplier, Duration ^ dur)

-        {

-            Duration ^ result = gcnew Duration(multiplier * dur->Milliseconds);

-            return result;

-        }

-

-        static Duration ^ Multiply (Duration ^ dur, const System::UInt64 multiplier)

-        {

-            Duration ^ result = gcnew Duration(dur->Milliseconds * multiplier);

-            return result;

-        }

-

-        static Duration ^ Multiply (const System::UInt64 multiplier, Duration ^ dur)

-        {

-            Duration ^ result = gcnew Duration(multiplier * dur->Milliseconds);

-            return result;

-        }

-

-        static bool operator == (Duration ^ a, Duration ^ b)

-        {

-            return a->Milliseconds == b->Milliseconds;

-        }

-

-        static bool operator != (Duration ^ a, Duration ^ b)

-        {

-            return a->Milliseconds != b->Milliseconds;

-        }

-    };

-

-    public ref class DurationConstants sealed

-    {

-    private:

-        DurationConstants::DurationConstants() {}

-

-    public:

-        static Duration ^ FORVER;

-        static Duration ^ IMMEDIATE;

-        static Duration ^ SECOND;

-        static Duration ^ MINUTE;

-

-        static DurationConstants()

-        {

-            FORVER    = gcnew Duration();

-            IMMEDIATE = gcnew Duration(0);

-            SECOND    = gcnew Duration(1000);

-            MINUTE    = gcnew Duration(60000);

-        }

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
deleted file mode 100644
index 4397789..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
+++ /dev/null
@@ -1,93 +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 <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/FailoverUpdates.h"

-

-#include "Connection.h"

-#include "FailoverUpdates.h"

-#include "QpidException.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// FailoverUpdates is a managed wrapper for a qpid::messaging::FailoverUpdates

-    /// </summary>

-

-    // Disallow access if object has been destroyed.

-    void FailoverUpdates::ThrowIfDisposed()

-    {

-        if (IsDisposed)

-            throw gcnew ObjectDisposedException (GetType()->FullName);

-    }

-

-    // constructors

-

-    FailoverUpdates::FailoverUpdates(Connection ^ connection)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::FailoverUpdates(*(connection->NativeConnection));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // Destructor

-    FailoverUpdates::~FailoverUpdates()

-    {

-        this->!FailoverUpdates();

-    }

-

-

-    // Finalizer

-    FailoverUpdates::!FailoverUpdates()

-    {

-        if (NULL != nativeObjPtr)

-        {

-            msclr::lock lk(privateLock);

-

-            if (NULL != nativeObjPtr)

-            {

-                delete nativeObjPtr;

-                nativeObjPtr = NULL;

-            }

-        }

-    }

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
deleted file mode 100644
index 1ad5c4b..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
+++ /dev/null
@@ -1,82 +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.

-*/

-

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// FailoverUpdates is a managed wrapper for a qpid::messaging::FailoverUpdates

-    /// </summary>

-

-    ref class Connection;

-

-    public ref class FailoverUpdates

-    {

-    private:

-        // The kept object in the Messaging C++ DLL

-        ::qpid::messaging::FailoverUpdates * nativeObjPtr;

-

-        // per-instance lock object

-        System::Object ^ privateLock;

-

-        // Disallow use after object is destroyed

-        void ThrowIfDisposed();

-

-    public:

-        FailoverUpdates(Connection ^ connection);

-

-        ~FailoverUpdates();

-        !FailoverUpdates();

-

-        //

-        // IsDisposed

-        //

-        property bool IsDisposed

-        {

-            bool get()

-            {

-                return NULL == nativeObjPtr;

-            }

-        }

-

-    private:

-        // unmanaged clone

-        // not defined

-

-        // copy constructor

-        FailoverUpdates(const FailoverUpdates ^ failoverUpdates) {}

-        FailoverUpdates(const FailoverUpdates % failoverUpdates) {}

-

-        // assignment operator

-        FailoverUpdates % operator=(const FailoverUpdates % rhs)

-        {

-            return *this;

-        }

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
deleted file mode 100644
index b084db5..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
+++ /dev/null
@@ -1,224 +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 <windows.h>

-#include <string>

-#include <limits>

-#include <vector>

-#include <iostream>

-#include <assert.h>

-

-#include "qpid/messaging/Logger.h"

-#include "qpid/messaging/exceptions.h"

-#include "qpid/types/Variant.h"

-

-#include "Logger.h"

-#include "QpidException.h"

-#include "QpidMarshal.h"

-

-/// <summary>

-/// outputCallbackHost

-/// Native class that holds reference to managed class

-/// and for hosting the native callback procedure.

-/// </summary>

-namespace qpid {

-namespace messaging {

-

-    class outputCallbackHost : public qpid::messaging::LoggerOutput {

-    private:

-        // Reference to managed class

-        gcroot<Org::Apache::Qpid::Messaging::LoggerOutput^> m_loggerOutput;

-

-    public:

-        outputCallbackHost(Org::Apache::Qpid::Messaging::LoggerOutput ^ _m_loggerOutput)

-            : m_loggerOutput(_m_loggerOutput)

-        {

-        }

-        ~outputCallbackHost()

-        {

-        }

-

-        // Native callback entry point called by qpid Logger 

-        void log(qpid::messaging::Level level, bool user, const char* file, int line, 

-            const char* function, const std::string& message)

-        {

-            m_loggerOutput->Log(level, user, file, line, function, message);

-        }

-    };

-}}

-

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-///

-/// Managed class with desired delegate

-///

-LoggerOutput::LoggerOutput( LoggerOutputCallback^ callback)

-    : loggerDelegate(callback), 

-    interceptor(new qpid::messaging::outputCallbackHost(this))

-{

-    ::qpid::messaging::Logger::setOutput(*interceptor);

-}

-

-LoggerOutput::~LoggerOutput()

-{

-}

-

-// Relay log message to managed code

-void LoggerOutput::Log(

-    qpid::messaging::Level level,

-    bool user,

-    const char* file,

-    int line,

-    const char* function,

-    const std::string& message)

-{

-    // create managed log args

-    Messaging::Level mLevel = (Messaging::Level)level;

-    System::Boolean mUser = user;

-    System::String^ mFile = gcnew String( file );

-    System::Int32 mLine = line;

-    System::String^ mFunction = gcnew String( function );

-    System::String^ mMessage = gcnew String( message.c_str() );

-

-    // pass to delegate

-    loggerDelegate( mLevel, mUser, mFile, mLine, mFunction, mMessage );

-}

-

-

-/// <summary>

-/// Logger a managed wrapper for a ::qpid::messaging::Logger

-/// </summary>

-

-// Constructor

-Logger::Logger()

-{

-    // Sanity check that managed == native enum values

-    assert((int)Messaging::Level::trace    == (int)::qpid::messaging::trace);

-    assert((int)Messaging::Level::debug    == (int)::qpid::messaging::debug);

-    assert((int)Messaging::Level::info     == (int)::qpid::messaging::info);

-    assert((int)Messaging::Level::notice   == (int)::qpid::messaging::notice);

-    assert((int)Messaging::Level::warning  == (int)::qpid::messaging::warning);

-    assert((int)Messaging::Level::error    == (int)::qpid::messaging::error);

-    assert((int)Messaging::Level::critical == (int)::qpid::messaging::critical);

-}

-

-

-// Destructor

-Logger::~Logger()

-{

-    this->!Logger();

-}

-

-

-// Finalizer

-Logger::!Logger()

-{

-}

-

-void Logger::Configure(array<System::String ^> ^ args)

-{

-    Configure(args, "");

-}

-

-void Logger::Configure(array<System::String ^> ^ theArgs, System::String ^ thePrefix)

-{

-    System::Exception ^ newException = nullptr;

-

-    try

-    {

-        // Marshal the calling args

-        int argc = theArgs->Length;

-

-        std::vector<std::string> cppStrings;

-        for (int i=0; i<argc; i++)

-        {

-            cppStrings.push_back ( QpidMarshal::ToNative( theArgs[i] ) );

-        }

-

-        std::vector<const char *> cStrings;

-        for (int i=0; i<argc; i++)

-        {

-            cStrings.push_back ( cppStrings[i].c_str() );

-        }

-

-        const char** argv = &cStrings[0];

-

-        std::string prefix = QpidMarshal::ToNative(thePrefix);

-

-        // configure

-        ::qpid::messaging::Logger::configure(argc, argv, prefix);

-    }

-    catch (const ::qpid::types::Exception & error)

-    {

-        String ^ errmsg = gcnew String(error.what());

-        newException    = gcnew QpidException(errmsg);

-    }

-    if (newException != nullptr)

-    {

-        throw newException;

-    }

-}

-

-

-System::String ^ Logger::Usage()

-{

-    return gcnew String(::qpid::messaging::Logger::usage().c_str());

-}

-

-

-// Inject a log message from managed user space into unmanaged 

-// Qpid Messaging log stream.

-void Logger::Log(

-    Messaging::Level level,

-    System::String^ file,

-    System::Int32 line,

-    System::String^ function,

-    System::String^ message)

-{

-    // create unmanaged log args

-    qpid::messaging::Level nLevel = (qpid::messaging::Level)level;

-    std::string nFile = QpidMarshal::ToNative(file);

-    int nLine = line;

-    std::string nFunction = QpidMarshal::ToNative(function);

-    const std::string nMessage = QpidMarshal::ToNative(message);

-

-    System::Exception ^ newException = nullptr;

-

-    try

-    {

-        // pass to native log engine

-        ::qpid::messaging::Logger::log(

-            nLevel, nFile.c_str(), line, nFunction.c_str(), nMessage);

-    }

-    catch (const ::qpid::types::Exception & error)

-    {

-        String ^ errmsg = gcnew String(error.what());

-        newException    = gcnew QpidException(errmsg);

-    }

-

-    if (newException != nullptr)

-    {

-        throw newException;

-    }

-}

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Logger.h b/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
deleted file mode 100644
index 1628fb1..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
+++ /dev/null
@@ -1,134 +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.

-*/

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Logger.h"

-

-//

-// Logger is implemented in two classes that roughly correspond

-// to the Logger and LoggerOutput classes defined by the native

-// C++ classes in qpid/messaging/Logger.h. Please refer to the

-// native Logger.h file for more detailed usage information.

-//

-// Logger is a control and status interface to configure logging

-// and to inject log messages.

-//

-// LoggerOutput defines a delegate to accept the Qpid Messaging

-// log message stream. LoggerOutput uses native class 

-// outputCallbackHost to receive the native callbacks and forward

-// the log on to the delegate.

-//

-

-/// <summary>

-/// outputCallbackHost

-/// Native class that holds reference to managed class

-/// and for hosting the native callback procedure.

-/// </summary>

-namespace qpid {

-namespace messaging {

-    class outputCallbackHost;

-}}

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Level constants

-    /// These correspond exactly to qpid::messaging::Level

-    /// </summary>

-    public enum class Level { trace, debug, info, notice, warning, error, critical };
-

-    /// <summary>

-    /// LoggerOutput relays messages to the managed delegate

-    /// </summary>

-

-    // The managed delegate signature

-    public delegate void LoggerOutputCallback(

-        Messaging::Level level,

-        System::Boolean user,

-        System::String^ file,

-        System::Int32 line,

-        System::String^ function,

-        System::String^ message);

-

-    // Managed class with desired delegate

-    public ref class LoggerOutput

-    {

-    private:

-        // private destructor

-        ~LoggerOutput();

-

-        // delegate

-        LoggerOutputCallback^ loggerDelegate;

-

-        // native class to host native callback

-        qpid::messaging::outputCallbackHost * interceptor;

-

-    public:

-        // function to receive unmanaged log and relay it 

-        // to managed delegate

-        void Log( 

-            qpid::messaging::Level level,

-            bool user,

-            const char* file,

-            int line, 

-            const char* function,

-            const std::string& message);

-

-        // constructor - create with reference to log message delegate

-        LoggerOutput( LoggerOutputCallback^ callback);

-    };

-

-    /// <summary>

-    /// Logger is a managed wrapper for native ::qpid::messaging::Logger

-    /// </summary>

-

-    public ref class Logger

-    {

-    private:

-

-    public:

-        Logger();

-        ~Logger();

-        !Logger();

-

-        // Set logging in qpid messaging

-        void Configure(array<System::String ^> ^ args);

-        void Configure(array<System::String ^> ^ args, System::String ^ prefix);

-

-        // Help string available after calling Configue

-        System::String ^ Usage();

-

-        // Inject a 'user' log message into qpid messaging log stream

-        void Log(

-            Messaging::Level level,

-            System::String^ file,

-            System::Int32 line,

-            System::String^ function,

-            System::String^ message);

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
deleted file mode 100644
index 3409db5..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
+++ /dev/null
@@ -1,716 +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 <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <typeinfo.h>

-#include <string>

-#include <limits>

-#include <iostream>

-#include <stdlib.h>

-

-#include "qpid/messaging/Message.h"

-#include "qpid/types/Variant.h"

-

-#include "QpidMarshal.h"

-#include "Address.h"

-#include "Duration.h"

-#include "Message.h"

-#include "QpidTypeCheck.h"

-#include "QpidException.h"

-#include "TypeTranslator.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Message is a managed wrapper for a ::qpid::messaging::Message

-    /// </summary>

-

-    // Disallow access if object has been destroyed.

-    void Message::ThrowIfDisposed()

-    {

-        if (IsDisposed)

-            throw gcnew ObjectDisposedException (GetType()->FullName);

-    }

-

-

-    // Create empty message

-    Message::Message()

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(QpidMarshal::ToNative(""));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create from string

-    Message::Message(System::String ^ theStr)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(QpidMarshal::ToNative(theStr));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create from object

-    Message::Message(System::Object ^ theValue)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(QpidMarshal::ToNative(""));

-

-            if (QpidTypeCheck::ObjectIsMap(theValue))

-            {

-                // Create a mapped message using given dictionary

-

-                // Allocate a map

-                ::qpid::types::Variant::Map newMap;

-

-                // Add the map variables to the map

-                TypeTranslator::ManagedToNative((QpidMap ^)theValue, newMap);

-

-                // Set message content type

-                nativeObjPtr->setContentType("ampq/map");

-

-                // Insert the map into the message

-                ::qpid::messaging::encode(newMap, *nativeObjPtr, QpidMarshal::ToNative("amqp/map"));

-            }

-            else if (QpidTypeCheck::ObjectIsList(theValue))

-            {

-                // Create a list message using given list

-

-                // Allocate a list

-                ::qpid::types::Variant::List newList;

-

-                // Add the list variables to the list

-                TypeTranslator::ManagedToNative((QpidList ^)theValue, newList);

-

-                // Set message content type

-                nativeObjPtr->setContentType("ampq/list");

-

-                // Insert the list into the message

-                ::qpid::messaging::encode(newList, *nativeObjPtr, QpidMarshal::ToNative("amqp/list"));

-            }

-            else

-            {

-                // Create a binary string message

-                nativeObjPtr->setContent(QpidMarshal::ToNative(theValue->ToString()));

-            }

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // Create from bytes

-    Message::Message(array<System::Byte> ^ bytes)

-    {

-        System::Exception ^ newException = nullptr;

-        try

-        {

-            privateLock = gcnew System::Object();

-            pin_ptr<unsigned char> pBytes = &bytes[0];

-            nativeObjPtr = new ::qpid::messaging::Message((char *)pBytes, bytes->Length);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Create from byte array slice

-    Message::Message(array<System::Byte> ^ bytes, int offset, int size)

-    {

-        if ((offset + size) > bytes->Length)

-            throw gcnew QpidException("Message::Message Create from byte array slice: buffer length exceeded");

-

-        System::Exception ^ newException = nullptr;

-        try

-        {

-            privateLock = gcnew System::Object();

-            pin_ptr<unsigned char> pBytes = &bytes[offset];

-            nativeObjPtr = new ::qpid::messaging::Message((char *)pBytes, size);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // unmanaged clone

-    Message::Message(const ::qpid::messaging::Message & msgp)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(msgp);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    // Destructor

-    // Called by .NET Dispose() or C++ delete.

-    Message::~Message()

-    {

-        this->!Message();

-    }

-

-

-    // Finalizer

-    // Called by Destructor or by System::GC

-    Message::!Message()

-    {

-        if (NULL != nativeObjPtr)

-        {

-            msclr::lock lk(privateLock);

-

-            if (NULL != nativeObjPtr)

-            {

-                delete nativeObjPtr;

-                nativeObjPtr = NULL;

-            }

-        }

-    }

-

-    // Copy constructor look-alike (C#)

-    Message::Message(const Message ^ message)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(

-                *(const_cast<Message ^>(message)->NativeMessage));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Copy constructor implicitly dereferenced (C++)

-    Message::Message(const Message % message)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Message(

-                *(const_cast<Message %>(message).NativeMessage));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Property

-    void Message::SetProperty(System::String ^ name, System::Object ^ value)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            ::qpid::types::Variant entryValue;

-            TypeTranslator::ManagedToNativeObject(value, entryValue);

-

-            nativeObjPtr->getProperties()[QpidMarshal::ToNative(name)] = entryValue;

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Content

-    void Message::SetContent(System::String ^ content)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            nativeObjPtr->setContent(QpidMarshal::ToNative(content));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    void Message::SetContent(cli::array<System::Byte> ^ bytes)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            pin_ptr<unsigned char> pBytes = &bytes[0];

-            nativeObjPtr->setContent((char *)pBytes, bytes->Length);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    void Message::SetContent(cli::array<System::Byte> ^ bytes, int offset, int size)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        if ((offset + size) > bytes->Length)

-            throw gcnew QpidException("Message::SetContent from byte array slice: buffer length exceeded");

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            pin_ptr<unsigned char> pBytes = &bytes[offset];

-            nativeObjPtr->setContent((char *)pBytes, size);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    

-    void Message::SetContentObject(System::Object ^ managedObject)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            ::qpid::types::Variant nativeObjValue;

-            TypeTranslator::ManagedToNativeObject(managedObject, nativeObjValue);

-            nativeObjPtr->setContentObject(nativeObjValue);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    System::String ^ Message::GetContent()

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::String ^ result = nullptr;

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            result = QpidMarshal::ToManaged(nativeObjPtr->getContent().c_str());

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-

-        return result;

-    }

-

-

-    //

-    // User wants to extract a Dictionary from the message

-    //

-    void Message::GetContent(System::Collections::Generic::Dictionary<

-        System::String^,

-        System::Object^> ^ dict)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            // Extract the message map from the message

-            ::qpid::types::Variant::Map map;

-

-            ::qpid::messaging::decode(*nativeObjPtr, map, QpidMarshal::ToNative("amqp/map"));

-

-            TypeTranslator::NativeToManaged(map, dict);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    //

-    // User wants to extract a list from the message

-    //

-    void Message::GetContent(System::Collections::ObjectModel::Collection<

-        System::Object^> ^ list)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            // allocate a native messaging::List

-            ::qpid::types::Variant::List nativeList;

-

-            // Extract the list from the message in native format

-            ::qpid::messaging::decode(*nativeObjPtr, nativeList, QpidMarshal::ToNative("amqp/list"));

-

-            // translate native list into user's managed list

-            TypeTranslator::NativeToManaged(nativeList, list);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    //

-    // Return message content to raw byte array.

-    // On entry, message size must not be zero and

-    // caller's byte array size must be equal to message size.

-    //

-    void Message::GetContent(array<System::Byte> ^ arr)

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            System::UInt32 size = (System::UInt32) nativeObjPtr->getContentSize();

-

-            if (0 == size)

-                throw gcnew QpidException("Message::GetRaw - message size is zero");

-

-            if (arr->Length != size)

-                throw gcnew QpidException("Message::GetRaw - receive buffer is wrong size");

-

-            const char * pMsgSrc = nativeObjPtr->getContentPtr();

-            pin_ptr<unsigned char> pArr = &arr[0];

-            memcpy(pArr, pMsgSrc, size);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-

-    System::Object ^ Message::GetContentObject()

-    {

-        msclr::lock lk(privateLock);

-        ThrowIfDisposed();

-

-        System::Exception ^ newException = nullptr;

-        System::Object ^ result = nullptr;

-

-        try

-        {

-            ::qpid::types::Variant nativeObject = nativeObjPtr->getContentObject();

-

-            result = TypeTranslator::NativeToManagedObject(nativeObject);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-

-        return result;

-    }

-    

-    System::String ^ Message::MapAsString(System::Collections::Generic::Dictionary<

-        System::String^, System::Object^> ^ dict)

-    {

-        System::Text::StringBuilder ^ sb = gcnew System::Text::StringBuilder("{");

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            System::String ^ leading = "";

-

-            for each (System::Collections::Generic::KeyValuePair

-                <System::String^, System::Object^> kvp in dict)

-            {

-                sb->Append(leading);

-                leading = ", ";

-

-                if (QpidTypeCheck::ObjectIsMap(kvp.Value))

-                {

-                    sb->AppendFormat(

-                        "{0}={1}",

-                        kvp.Key,

-                        MapAsString((System::Collections::Generic::Dictionary<System::String^, System::Object^> ^)kvp.Value));

-                }

-                else if (QpidTypeCheck::ObjectIsList(kvp.Value))

-                {

-                    sb->AppendFormat(

-                        "{0}={1}",

-                        kvp.Key,

-                        ListAsString((System::Collections::ObjectModel::Collection<

-                        System::Object^> ^)kvp.Value));

-                }

-                else if (nullptr == kvp.Value)

-                {

-                    sb->AppendFormat(

-                        "{0}=",

-                        kvp.Key);

-                }

-                else

-                    sb->AppendFormat("{0}={1}", kvp.Key, kvp.Value);

-            }

-            sb->Append("}");

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-

-        System::String ^ result = gcnew System::String(sb->ToString());

-        return result;

-    }

-

-    /// <summary>

-    /// A function to display a ampq/list message packaged as a List.

-    /// </summary>

-    /// <param name="list">The AMQP list</param>

-    System::String ^ Message::ListAsString(System::Collections::ObjectModel::Collection<System::Object^> ^ list)

-    {

-        System::Text::StringBuilder ^ sb = gcnew System::Text::StringBuilder("[");

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            System::String ^ leading = "";

-

-            for each (System::Object ^ obj in list)

-            {

-                sb->Append(leading);

-                leading = ", ";

-

-                if (QpidTypeCheck::ObjectIsMap(obj))

-                {

-                    sb->Append(MapAsString((System::Collections::Generic::Dictionary<

-                        System::String^, System::Object^> ^)obj));

-                }

-                else if (QpidTypeCheck::ObjectIsList(obj))

-                {

-                    sb->Append(ListAsString((System::Collections::ObjectModel::Collection<

-                        System::Object^> ^)obj));

-                }

-                else if (nullptr == obj)

-                {

-                    // no display for null objects

-                }

-                else

-                    sb->Append(obj->ToString());

-            }

-            sb->Append("]");

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-

-        System::String ^ result = gcnew System::String(sb->ToString());

-        return result;

-    }

-

-    System::String ^ Message::AsString(System::Object ^ obj)

-    {

-        if (QpidTypeCheck::ObjectIsMap(obj))

-            return MapAsString((System::Collections::Generic::Dictionary<

-            System::String^, System::Object^> ^)obj);

-        else if (QpidTypeCheck::ObjectIsList(obj))

-            return ListAsString((System::Collections::ObjectModel::Collection<

-            System::Object^> ^)obj);

-        else

-            return obj->ToString();

-    }

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Message.h b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
deleted file mode 100644
index c706d11..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Message.h
+++ /dev/null
@@ -1,489 +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.

-*/

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Message.h"

-

-#include "QpidMarshal.h"

-#include "Address.h"

-#include "Duration.h"

-#include "QpidException.h"

-#include "TypeTranslator.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    ref class Address;

-    ref class Duration;

-

-    /// <summary>

-    /// Message is a managed wrapper for a ::qpid::messaging::Message

-    /// </summary>

-

-    public ref class Message

-    {

-

-    private:

-        // The kept object in the Messaging C++ DLL

-        ::qpid::messaging::Message * nativeObjPtr;

-

-        // per-instance lock object

-        System::Object ^ privateLock;

-

-        // Disallow use after object is destroyed

-        void ThrowIfDisposed();

-

-    public:

-        // Create empty message

-        Message();

-

-        // Create from String

-        Message(System::String ^ theStr);

-

-        // Create from object

-        Message(System::Object ^ theValue);

-

-        // Create from byte array

-        Message(array<System::Byte> ^ bytes);

-

-        // Create from byte array slice

-        Message(array<System::Byte> ^ bytes, int offset, int size);

-

-        // System destructor/finalizer entry points

-        ~Message();

-        !Message();

-

-        // Copy constructor

-        Message(const Message ^ message);

-        Message(const Message % message);

-

-        // unmanaged clone

-        Message(const ::qpid::messaging::Message & msgp);

-

-        // assignment operator

-        Message % operator=(const Message % rhs)

-        {

-            msclr::lock lk(privateLock);

-            ThrowIfDisposed();

-

-            if (this == %rhs)

-            {

-                // Self assignment, do nothing

-            }

-            else

-            {

-                if (NULL != nativeObjPtr)

-                    delete nativeObjPtr;

-                nativeObjPtr = new ::qpid::messaging::Message(

-                    *(const_cast<Message %>(rhs).NativeMessage) );

-            }

-            return *this;

-        }

-

-        //

-        // IsDisposed

-        //

-        property bool IsDisposed

-        {

-            bool get()

-            {

-                return NULL == nativeObjPtr;

-            }

-        }

-

-

-        //

-        // NativeMessage

-        //

-        property ::qpid::messaging::Message * NativeMessage

-        {

-            ::qpid::messaging::Message * get ()

-            {

-                return nativeObjPtr;

-            }

-        }

-

-        //

-        // ReplyTo

-        //

-        property Address ^ ReplyTo

-        {

-            void set (Address ^ address)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setReplyTo(*(address->NativeAddress));

-            }

-

-            Address ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                const ::qpid::messaging::Address & addrp =

-                    nativeObjPtr->::qpid::messaging::Message::getReplyTo();

-

-                return gcnew Address(addrp);

-            }

-        }

-

-        //

-        // Subject

-        //

-        property System::String ^ Subject

-        {

-            void set (System::String ^ subject)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setSubject(QpidMarshal::ToNative(subject));

-            }

-

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew String(nativeObjPtr->getSubject().c_str());

-            }

-        }

-

-

-        //

-        // ContentType

-        //

-        property System::String ^ ContentType

-        {

-            void set (System::String ^ ct)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setContentType(QpidMarshal::ToNative(ct));

-            }

-

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew String(nativeObjPtr->::qpid::messaging::Message::getContentType().c_str());

-            }

-        }

-

-

-        //

-        // MessageId

-        //

-        property System::String ^ MessageId

-        {

-            void set (System::String ^ messageId)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setMessageId(QpidMarshal::ToNative(messageId));

-            }

-

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew String(nativeObjPtr->getMessageId().c_str());

-            }

-        }

-

-

-        //

-        // UserId

-        //

-        property System::String ^ UserId

-        {

-            void set (System::String ^ uId)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setUserId(QpidMarshal::ToNative(uId));

-            }

-

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew String(nativeObjPtr->getUserId().c_str());

-            }

-        }

-

-

-        //

-        // CorrelationId

-        //

-        property System::String ^ CorrelationId

-        {

-            void set (System::String ^ correlationId)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setCorrelationId(QpidMarshal::ToNative(correlationId));

-            }

-

-            System::String ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return gcnew String(nativeObjPtr->getCorrelationId().c_str());

-            }

-        }

-

-

-        //

-        // Priority

-        //

-        property unsigned char Priority

-        {

-            void set (unsigned char priority)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setPriority(priority);

-            }

-

-            unsigned char get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return nativeObjPtr->getPriority();

-            }

-        }

-

-

-        //

-        // Ttl

-        //

-        property Duration ^ Ttl

-        {

-            void set (Duration ^ ttl)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                ::qpid::messaging::Duration dur(ttl->Milliseconds);

-

-                nativeObjPtr->setTtl(dur);

-            }

-

-            Duration ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                Duration ^ dur = gcnew Duration(nativeObjPtr->getTtl().getMilliseconds());

-

-                return dur;

-            }

-        }

-

-        //

-        // Durable

-        //

-        property bool Durable

-        {

-            void set (bool durable)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setDurable(durable);

-            }

-

-            bool get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return nativeObjPtr->getDurable();

-            }

-        }

-

-        //

-        // Redelivered

-        //

-        property bool Redelivered

-        {

-            bool get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return nativeObjPtr->getRedelivered();

-            }

-

-            void set (bool redelivered)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                nativeObjPtr->setRedelivered(redelivered);

-            }

-        }

-

-        //

-        // Property

-        //

-        void Message::SetProperty(System::String ^ name, System::Object ^ value);

-

-        //

-        // Properties

-        //

-        property System::Collections::Generic::Dictionary<

-            System::String^, System::Object^> ^ Properties

-        {

-            System::Collections::Generic::Dictionary<

-                System::String^, System::Object^> ^ get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                System::Exception ^ newException = nullptr;

-

-                System::Collections::Generic::Dictionary<System::String^, System::Object^> ^ dict =

-                    gcnew System::Collections::Generic::Dictionary<System::String^, System::Object^> ;

-

-                try

-                {

-                    ::qpid::types::Variant::Map map;

-                    map = nativeObjPtr->getProperties();

-                    TypeTranslator::NativeToManaged(map, dict);

-                }

-                catch (const ::qpid::types::Exception & error)

-                {

-                    String ^ errmsg = gcnew String(error.what());

-                    newException    = gcnew QpidException(errmsg);

-                }

-

-                if (newException != nullptr)

-                {

-                    throw newException;

-                }

-

-                return dict;

-            }

-

-

-            void set (System::Collections::Generic::Dictionary<

-                System::String^, System::Object^> ^ properties)

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                System::Exception ^ newException = nullptr;

-

-                try

-                {

-                    ::qpid::types::Variant::Map variantMap;

-                    TypeTranslator::ManagedToNative(properties, variantMap);

-                    nativeObjPtr->setProperties(variantMap);

-                }

-                catch (const ::qpid::types::Exception & error)

-                {

-                    String ^ errmsg = gcnew String(error.what());

-                    newException    = gcnew QpidException(errmsg);

-                }

-

-                if (newException != nullptr)

-                {

-                    throw newException;

-                }

-            }

-        }

-

-

-        void SetContent(System::String ^ content);

-

-        void SetContent(cli::array<System::Byte> ^ bytes);

-

-        void SetContent(cli::array<System::Byte> ^ bytes, int offset, int size);

-

-        void SetContentObject(System::Object ^ managedObject);

-

-        // get content as string

-        System::String ^ GetContent();

-

-        // get content as dictionary

-        void GetContent(System::Collections::Generic::Dictionary<

-            System::String^,

-            System::Object^> ^ dict);

-

-        // get content as map

-        void GetContent(System::Collections::ObjectModel::Collection<

-            System::Object^> ^);

-

-        // get content as bytes

-        void GetContent(cli::array<System::Byte> ^ arr);

-

-        // get content as object

-        System::Object ^ GetContentObject();

-

-        //

-        // ContentSize

-        //

-        property System::UInt64 ContentSize

-        {

-            System::UInt64 get ()

-            {

-                msclr::lock lk(privateLock);

-                ThrowIfDisposed();

-

-                return nativeObjPtr->getContentSize();

-            }

-        }

-

-

-        // A message has been returned to managed code through GetContent().

-        // Display the content of that System::Object as a string.

-        System::String ^ AsString(System::Object ^ obj);

-

-        System::String ^ MapAsString(System::Collections::Generic::Dictionary<

-            System::String^, System::Object^> ^ dict);

-

-        System::String ^ ListAsString(System::Collections::ObjectModel::Collection<

-            System::Object^> ^ list);

-

-        //TODO: EncodingException

-

-        // Note: encode/decode functions are in TypeTranslator

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
deleted file mode 100644
index bf02134..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
+++ /dev/null
@@ -1,42 +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.

-*/

-

-#pragma once

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-using namespace System;

-

-[Serializable]

-public ref class QpidException : System::Exception

-{

-public:

-

-    QpidException()

-        : System::Exception() {}

-

-    QpidException(String^ estring)

-        : System::Exception(estring) {}

-

-};

-

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
deleted file mode 100644
index f4aa342..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
+++ /dev/null
@@ -1,82 +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.

-*/

-

-#pragma once

-

-using namespace System;

-using namespace System::Text;

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-

-

-// Helper functions for marshaling.

-

-private ref class QpidMarshal

-{

-private:

-    QpidMarshal::QpidMarshal() {}

-

-public:

-

-    /// <summary>

-    /// Convert managed String into native UTF8-encoded string

-    /// TODO: figure out some encoding other than UTF-8

-    /// </summary>

-

-    static std::string ToNative (System::String^ managed)

-    {

-        if (managed->Length == 0)

-        {

-            return std::string();

-        }

-

-        array<unsigned char>^ mbytes = Encoding::UTF8->GetBytes(managed);

-        if (mbytes->Length == 0)

-        {

-            return std::string();

-        }

-

-        pin_ptr<unsigned char> pinnedBuf = &mbytes[0];

-        std::string native((char *) pinnedBuf, mbytes->Length);

-        return native;

-    }

-

-

-    static System::String^ ToManaged( std::string native )

-    {

-        if( native.length() == 0 )

-        {

-            return gcnew System::String( "" );

-        }

-

-        pin_ptr<unsigned char> pinnedBuf = (unsigned char *)native.c_str();

-        array<unsigned char>^ mbytes = gcnew array<unsigned char>( (int)native.length() );

-

-        for( unsigned int idx = 0; idx < native.length(); idx++ )

-            mbytes[ idx ] = pinnedBuf[ idx ];

-

-        return Encoding::UTF8->GetString( mbytes );

-    }

-};

-

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
deleted file mode 100644
index a3fdaf9..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
+++ /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.

-*/

-#pragma once

-

-#include <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// QpidTypeCheck determines if a given managed object represents

-    /// a qpid type per the scheme presented by the messaging DLL.

-    ///

-    // The supported mapping is:

-    /// * a managed Dictionary and a Qpid Messaging Map

-    /// * a managed Collection and a Qpid Messaging List

-    /// </summary>

-

-    typedef System::Collections::Generic::Dictionary<

-                System::String^,

-                System::Object^>

-                    QpidMap;

-

-    typedef System::Collections::ObjectModel::Collection<

-                System::Object^>

-                    QpidList;

-

-    private ref class QpidTypeCheckConstants sealed

-    {

-    private:

-        QpidTypeCheckConstants::QpidTypeCheckConstants() {}

-

-    public:

-        static System::Type const ^ const mapTypeP = System::Type::GetType(

-            "System.Collections.Generic.Dictionary`2[System.String,System.Object]");

-        static System::Type const ^ const listTypeP = System::Type::GetType(

-            "System.Collections.ObjectModel.Collection`1[System.Object]");

-    };

-

-

-    public ref class QpidTypeCheck sealed

-    {

-    private:

-        QpidTypeCheck::QpidTypeCheck() {}

-

-    public:

-

-        static bool ObjectIsMap (System::Object ^ theValue)

-        {

-            if (nullptr == theValue)

-                return false;

-            else

-                return (*theValue).GetType() == QpidTypeCheckConstants::mapTypeP;

-        }

-

-        static bool ObjectIsList(System::Object ^ theValue)

-        {

-            if (nullptr == theValue)

-                return false;

-            else

-                return (*theValue).GetType() == QpidTypeCheckConstants::listTypeP;

-        }

-    };

-}}}}

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
deleted file mode 100644
index f7287af..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-========================================================================

-    DYNAMIC LINK LIBRARY : Org.Apache.Qpid.Messaging Project Overview

-========================================================================

-

-AppWizard has created this Org.Apache.Qpid.Messaging DLL for you.

-

-This file contains a summary of what you will find in each of the files that

-make up your Org.Apache.Qpid.Messaging application.

-

-Org.Apache.Qpid.Messaging.vcproj

-    This is the main project file for VC++ projects generated using an Application Wizard.

-    It contains information about the version of Visual C++ that generated the file, and

-    information about the platforms, configurations, and project features selected with the

-    Application Wizard.

-

-Connection.[cpp h]

-Duration.[cpp h]

-Message.[cpp h]

-Receiver.[cpp h]

-Sender.[cpp h]

-Session.[cpp h]

-    Managed code Interop layer modules to provide access to functions exported by

-    qpidcommon.dll.

-

-AssemblyInfo.cpp

-    Contains custom attributes for modifying assembly metadata.

-

-/////////////////////////////////////////////////////////////////////////////

-Other notes:

-

-AppWizard uses "TODO:" to indicate parts of the source code you

-should add to or customize.

-

-Current TODOs include:

-

- * Add locking as needed

- * Add remaining modules and methods

- * Capture and repackage exceptions emitted from messaging DLLs

-

-/////////////////////////////////////////////////////////////////////////////

diff --git a/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
deleted file mode 100644
index 2d6b2f5..0000000
--- a/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
+++ /dev/null
@@ -1,418 +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 <windows.h>

-#include <msclr\lock.h>

-#include <oletx2xa.h>

-#include <string>

-#include <limits>

-

-#include "qpid/messaging/Receiver.h"

-#include "qpid/messaging/Session.h"

-#include "qpid/messaging/Message.h"

-#include "qpid/messaging/exceptions.h"

-

-#include "Receiver.h"

-#include "Address.h"

-#include "Session.h"

-#include "Message.h"

-#include "Duration.h"

-#include "QpidException.h"

-

-namespace Org {

-namespace Apache {

-namespace Qpid {

-namespace Messaging {

-

-    /// <summary>

-    /// Receiver is a managed wrapper for a ::qpid::messaging::Receiver

-    /// </summary>

-

-    // Disallow access if object has been destroyed.

-    void Receiver::ThrowIfDisposed()

-    {

-        if (IsDisposed)

-            throw gcnew ObjectDisposedException (GetType()->FullName);

-    }

-

-

-    // unmanaged clone

-    Receiver::Receiver(const ::qpid::messaging::Receiver & r,

-        Org::Apache::Qpid::Messaging::Session ^ sessRef)

-        : parentSession(sessRef)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Receiver (r);

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // unmanaged clone

-    // undefined

-

-    // Destructor

-    Receiver::~Receiver()

-    {

-        this->!Receiver();

-    }

-

-

-    // Finalizer

-    Receiver::!Receiver()

-    {

-        if (NULL != nativeObjPtr)

-        {

-            msclr::lock lk(privateLock);

-

-            if (NULL != nativeObjPtr)

-            {

-                delete nativeObjPtr;

-                nativeObjPtr = NULL;

-            }

-        }

-    }

-

-

-    // Copy constructor look-alike (C#)

-    Receiver::Receiver(const Receiver ^ receiver)

-        : parentSession(receiver->parentSession)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try

-        {

-            privateLock = gcnew System::Object();

-            nativeObjPtr = new ::qpid::messaging::Receiver(

-                *(const_cast<Receiver ^>(receiver)->NativeReceiver));

-        }

-        catch (const ::qpid::types::Exception & error)

-        {

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-        if (newException != nullptr)

-        {

-            throw newException;

-        }

-    }

-

-    // Copy constructor implicitly dereferenced (C++)

-    Receiver::Receiver(const Receiver % receiver)

-        : parentSession(receiver.parentSession)

-    {

-        System::Exception ^ newException = nullptr;