Add vcproj files for messaging/drain and messaging/spout; resolves QPID-2299

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

4 files changed, 97 insertions, 181 deletions

diff --git a/cpp/examples/examples.sln b/cpp/examples/examples.sln
index 0501c7f960..18077f9efa 100644
--- a/cpp/examples/examples.sln
+++ b/cpp/examples/examples.sln
@@ -1,13 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 10.00

 # Visual Studio 2008

-# $Id: VC9WorkspaceCreator.pm 1439 2008-07-10 14:31:19Z elliott_c $

-#

-# This file was generated by MPC.  Any changes made directly to

-# this file will be lost the next time it is generated.

-#

-# MPC Command:

-# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 examples.mwc

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "direct_declare_queues", "direct\direct_declare_queues.vcproj", "{18165D4D-FECA-1BAD-4346-8C4DF2536AA5}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "direct_direct_producer", "direct\direct_direct_producer.vcproj", "{9701E0BD-FECA-1BAD-4346-8C4DF2536AA5}"

@@ -26,20 +19,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fanout_listener", "fanout\f
 EndProject

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

 EndProject

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

+EndProject

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

+EndProject

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

 EndProject

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

 EndProject

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

-EndProject

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

 EndProject

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

 EndProject

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

 EndProject

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

-EndProject

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

 EndProject

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

@@ -48,19 +41,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub_sub_topic_listener", "p
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pub_sub_topic_publisher", "pub-sub\pub-sub_topic_publisher.vcproj", "{05158653-FECA-1BAD-A430-FD5330E23A2D}"

 EndProject

-#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf_agent", "qmf-agent\qmf_agent.vcproj", "{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}"

-#EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf-console_console", "qmf-console\qmf-console_console.vcproj", "{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf_console_console", "qmf-console\qmf-console_console.vcproj", "{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf-console_ping", "qmf-console\qmf-console_ping.vcproj", "{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf_console_ping", "qmf-console\qmf-console_ping.vcproj", "{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf-console_printevents", "qmf-console\qmf-console_printevents.vcproj", "{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf_console_printevents", "qmf-console\qmf-console_printevents.vcproj", "{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf-console_queuestats", "qmf-console\qmf-console_queuestats.vcproj", "{B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmf_console_queuestats", "qmf-console\qmf-console_queuestats.vcproj", "{B21825EA-FECA-1BAD-2E13-3FFA2B8669C3}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "request-response_client", "request-response\request-response_client.vcproj", "{2691FE1E-FECA-1BAD-BD3A-8A467D0C5CCC}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "request_response_client", "request-response\request-response_client.vcproj", "{2691FE1E-FECA-1BAD-BD3A-8A467D0C5CCC}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "request-response_server", "request-response\request-response_server.vcproj", "{46817425-FECA-1BAD-BD3A-8A467D0C5CCC}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "request_response_server", "request-response\request-response_server.vcproj", "{46817425-FECA-1BAD-BD3A-8A467D0C5CCC}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tradedemo_declare_queues", "tradedemo\tradedemo_declare_queues.vcproj", "{9057502D-FECA-1BAD-23CE-CD4095BD3C8B}"

 EndProject

@@ -140,14 +131,6 @@ Global
 		{95E7DF39-FECA-1BAD-8826-8C64F27AA1C5}.Release|Win32.Build.0 = Release|Win32

 		{95E7DF39-FECA-1BAD-8826-8C64F27AA1C5}.Release|x64.ActiveCfg = Release|x64

 		{95E7DF39-FECA-1BAD-8826-8C64F27AA1C5}.Release|x64.Build.0 = Release|x64

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.Build.0 = Debug|Win32

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|x64.ActiveCfg = Debug|x64

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|x64.Build.0 = Debug|x64

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|Win32.ActiveCfg = Release|Win32

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|Win32.Build.0 = Release|Win32

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|x64.ActiveCfg = Release|x64

-		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|x64.Build.0 = Release|x64

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

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

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

@@ -156,6 +139,18 @@ Global
 		{80B58CBC-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -172,14 +167,6 @@ Global
 		{3B9EA507-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -204,14 +191,6 @@ Global
 		{E0A50687-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -228,6 +207,14 @@ Global
 		{E068EA69-FECA-1BAD-1FEE-AE349A6B75AA}.Release|Win32.Build.0 = Release|Win32

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

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

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.Build.0 = Debug|Win32

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|x64.ActiveCfg = Debug|x64

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Debug|x64.Build.0 = Debug|x64

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|Win32.ActiveCfg = Release|Win32

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|Win32.Build.0 = Release|Win32

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|x64.ActiveCfg = Release|x64

+		{A415E66A-FECA-1BAD-A430-FD5330E23A2D}.Release|x64.Build.0 = Release|x64

 		{05158653-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.ActiveCfg = Debug|Win32

 		{05158653-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.Build.0 = Debug|Win32

 		{05158653-FECA-1BAD-A430-FD5330E23A2D}.Debug|x64.ActiveCfg = Debug|x64

@@ -244,14 +231,14 @@ Global
 		{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.Build.0 = Release|Win32

 		{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Release|x64.ActiveCfg = Release|x64

 		{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Release|x64.Build.0 = Release|x64

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 = Debug|Win32

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|x64.ActiveCfg = Debug|x64

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|x64.Build.0 = Debug|x64

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.ActiveCfg = Release|Win32

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Release|Win32.Build.0 = Release|Win32

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Release|x64.ActiveCfg = Release|x64

-		{771767FB-FECA-1BAD-2E13-3FFA2B8669C3}.Release|x64.Build.0 = Release|x64

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|Win32.Build.0 = Debug|Win32

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|x64.ActiveCfg = Debug|x64

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Debug|x64.Build.0 = Debug|x64

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|Win32.ActiveCfg = Release|Win32

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|Win32.Build.0 = Release|Win32

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|x64.ActiveCfg = Release|x64

+		{C1FFDE95-3442-49AE-9985-7EEE3D45B4A3}.Release|x64.Build.0 = Release|x64

 		{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg = Debug|Win32

 		{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 = Debug|Win32

 		{72C74624-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/cpp/examples/messaging/Makefile.am b/cpp/examples/messaging/Makefile.am
index 0bf9ae9e31..53a9e4773a 100644
--- a/cpp/examples/messaging/Makefile.am
+++ b/cpp/examples/messaging/Makefile.am
@@ -56,10 +56,12 @@ map_receiver_LDADD=$(CLIENT_LIB)
 EXTRA_DIST=                  \
 	CMakeLists.txt \
 	messaging_client.vcproj \
+	messaging_drain.vcproj \
 	messaging_map_receiver.vcproj \
 	messaging_map_sender.vcproj \
 	messaging_queue_receiver.vcproj \
 	messaging_queue_sender.vcproj \
 	messaging_server.vcproj \
+	messaging_spout.vcproj \
 	messaging_topic_receiver.vcproj \
 	messaging_topic_sender.vcproj
diff --git a/cpp/examples/messaging/messaging_queue_listener.vcproj b/cpp/examples/messaging/messaging_drain.vcproj
index 5bc19b655a..4b2b99672e 100644
--- a/cpp/examples/messaging/messaging_queue_listener.vcproj
+++ b/cpp/examples/messaging/messaging_drain.vcproj
@@ -22,11 +22,10 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="9.00"

-	Name="messaging_queue_listener"

-	ProjectGUID="{7A423237-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_queue_listener"

+	Name="messaging_drain"

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

+	RootNamespace="messaging_drain"

 	Keyword="Win32Proj"

-	SignManifests="true"

 	>

 	<Platforms>

 		<Platform

@@ -42,10 +41,9 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_queue_listener\I386"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

 			CharacterSet="0"

-

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -61,12 +59,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

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

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

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -86,9 +78,6 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

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

-				Culture="1033"

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -96,7 +85,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

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

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

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

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

@@ -108,6 +97,9 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -117,16 +109,18 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_queue_listener\I386"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

 			CharacterSet="0"

-

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -142,12 +136,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

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

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

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -164,9 +152,6 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

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

-				Culture="1033"

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -174,7 +159,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

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

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

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

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

@@ -188,6 +173,9 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -197,13 +185,16 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_queue_listener\AMD64"

+			IntermediateDirectory="Debug\messaging_drain\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

 

@@ -258,7 +249,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

 				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

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

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

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

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

@@ -285,7 +276,7 @@
 		<Configuration

 			Name="Release|x64"

 			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_queue_listener\AMD64"

+			IntermediateDirectory="Release\messaging_drain\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

 

@@ -337,7 +328,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

 				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

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

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

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

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

@@ -369,40 +360,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

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

-			<File

-				RelativePath="queue_listener.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			Filter="">

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

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

+			>

 			<File

-				RelativePath="CMakeLists.txt">

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

+				RelativePath="drain.cpp"

+				>

 			</File>

 		</Filter>

 	</Files>

diff --git a/cpp/examples/messaging/messaging_topic_listener.vcproj b/cpp/examples/messaging/messaging_spout.vcproj
index a43d10ed60..dba5e40449 100644
--- a/cpp/examples/messaging/messaging_topic_listener.vcproj
+++ b/cpp/examples/messaging/messaging_spout.vcproj
@@ -22,11 +22,11 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="9.00"

-	Name="messaging_topic_listener"

-	ProjectGUID="{7A4686F1-FECA-1BAD-1FEE-AE349A6B75AA}"

-	RootNamespace="messaging_topic_listener"

+	Name="messaging_spout"

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

+	RootNamespace="messaging_spout"

 	Keyword="Win32Proj"

-	SignManifests="true"

+	TargetFrameworkVersion="196613"

 	>

 	<Platforms>

 		<Platform

@@ -42,10 +42,9 @@
 		<Configuration

 			Name="Debug|Win32"

 			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_topic_listener\I386"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

 			CharacterSet="0"

-

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -61,12 +60,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

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

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

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -86,9 +79,6 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

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

-				Culture="1033"

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -96,7 +86,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

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

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

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

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

@@ -108,6 +98,9 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -117,16 +110,18 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

 			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_topic_listener\I386"

+			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="1"

 			CharacterSet="0"

-

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -142,12 +137,6 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				AdditionalOptions=""

-				AdditionalIncludeDirectories=""

-				TypeLibraryName="$(InputName).tlb"

-				HeaderFileName="$(InputName).h"

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

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

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

@@ -164,9 +153,6 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

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

-				Culture="1033"

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -174,7 +160,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

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

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

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

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

@@ -188,6 +174,9 @@
 				Name="VCALinkTool"

 			/>

 			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

 				Name="VCXDCMakeTool"

 			/>

 			<Tool

@@ -197,13 +186,16 @@
 				Name="VCFxCopTool"

 			/>

 			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

 			OutputDirectory="."

-			IntermediateDirectory="Debug\messaging_topic_listener\AMD64"

+			IntermediateDirectory="Debug\messaging_spout\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

 

@@ -258,7 +250,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

 				AdditionalDependencies="qpidcommond.lib qpidclientd.lib"

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

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

 				LinkIncremental="2"

 				SuppressStartupBanner="true"

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

@@ -285,7 +277,7 @@
 		<Configuration

 			Name="Release|x64"

 			OutputDirectory="Release"

-			IntermediateDirectory="Release\messaging_topic_listener\AMD64"

+			IntermediateDirectory="Release\messaging_spout\AMD64"

 			ConfigurationType="1"

 			CharacterSet="0"

 

@@ -337,7 +329,7 @@
 				Name="VCLinkerTool"

 				AdditionalOptions="/machine:AMD64"

 				AdditionalDependencies="qpidcommon.lib qpidclient.lib"

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

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

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

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

@@ -369,40 +361,12 @@
 	<Files>

 		<Filter

 			Name="Source Files"

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

-			<File

-				RelativePath="topic_listener.cpp">

-			</File>

-		</Filter>

-		<Filter

-			Name="Documentation"

-			Filter="">

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

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

+			>

 			<File

-				RelativePath="CMakeLists.txt">

-				<FileConfiguration

-					Name="Debug|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					ExcludedFromBuild="TRUE">

-					<Tool

-						Name="VCCustomBuildTool"/>

-				</FileConfiguration>

+				RelativePath=".\messaging_spout.cpp"

+				>

 			</File>

 		</Filter>

 	</Files>