Merged out from trunkQPID-2519

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

70 files changed, 115 insertions, 69 deletions

diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt
index da8e39e944..1b28cfd031 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/cpp/examples/CMakeLists.txt
@@ -77,25 +77,14 @@ macro(add_example subdir example)
 endmacro(add_example)
 
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/README.verify
-               ${CMAKE_CURRENT_SOURCE_DIR}/verify
-               ${CMAKE_CURRENT_SOURCE_DIR}/verify_all
          DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
          COMPONENT ${QPID_COMPONENT_EXAMPLES})
 if (MSVC)
   install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/examples.sln
-				 ${CMAKE_CURRENT_SOURCE_DIR}/old-examples.sln
            DESTINATION ${QPID_INSTALL_EXAMPLESDIR}
            COMPONENT ${QPID_COMPONENT_EXAMPLES})
 endif (MSVC)
 
-add_subdirectory(direct)
-add_subdirectory(failover)
-add_subdirectory(fanout)
-add_subdirectory(pub-sub)
-#add_subdirectory(qmf-agent)
 add_subdirectory(qmf-console)
-add_subdirectory(request-response)
-add_subdirectory(tradedemo)
-add_subdirectory(xml-exchange)
 add_subdirectory(messaging)
+add_subdirectory(old_api)
diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am
index c6cc308d98..6b2bb73587 100644
--- a/cpp/examples/Makefile.am
+++ b/cpp/examples/Makefile.am
@@ -16,15 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-SUBDIRS = direct fanout pub-sub request-response failover qmf-console tradedemo messaging
-if HAVE_XML
-  SUBDIRS += xml-exchange
-  broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module $(top_builddir)/src/.libs/xml.so"	
-endif
-if !HAVE_XML
-  exclude_examples_regexp="xml"	# Exclude XML examples.
-  broker_args = "--no-module-dir --data-dir \"\" --auth no"	
-endif
+SUBDIRS = qmf-console messaging old_api
 
 MAKEDIST=.libs/Makefile
 
@@ -37,13 +29,9 @@ $(MAKEDIST): Makefile
 examplesdir=$(pkgdatadir)/examples
 dist_examples_DATA = README.txt $(MAKEDIST)
 
-EXTRA_DIST = README.verify verify verify_all examples.sln CMakeLists.txt
+EXTRA_DIST = examples.sln CMakeLists.txt
 
 # For older versions of automake
 abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
 
-# Verify the examples in the buid tree.
-check-local: 
-	$(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir) $(broker_args) $(exclude_examples_regexp)
-
diff --git a/cpp/examples/examples.sln b/cpp/examples/examples.sln
index 8511fe3cce..6f96105d97 100644
--- a/cpp/examples/examples.sln
+++ b/cpp/examples/examples.sln
@@ -32,6 +32,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messaging_drain", "messagin
 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}") = "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", "{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}"

+EndProject

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

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -88,6 +96,22 @@ Global
 		{D3115AC9-91C4-4D79-BCAC-DE837C70F1EA}.Release|Win32.Build.0 = Release|Win32

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

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

+		{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{490473E1-FECA-1BAD-2E13-3FFA2B8669C3}.Debug|Win32.Build.0 = Debug|Win32

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

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

+		{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}.Release|Win32.ActiveCfg = Release|Win32

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

+		{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}.Release|Win32.ActiveCfg = Release|Win32

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

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

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

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

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

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/cpp/examples/messaging/drain.cpp b/cpp/examples/messaging/drain.cpp
index 5c938e9742..563e5e5060 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/cpp/examples/messaging/drain.cpp
@@ -45,12 +45,12 @@ struct Options : OptionParser
           url("127.0.0.1"),
           timeout(0),
           forever(false),
-          count(1)
+          count(0)
     {
         add("broker,b", url, "url of broker to connect to");
         add("timeout,t", timeout, "timeout in seconds to wait before exiting");
         add("forever,f", forever, "ignore timeout and wait forever");
-        add("connection-options", connectionOptions, "connection options string in the form {name1=value1, name2=value2}");
+        add("connection-options", connectionOptions, "connection options string in the form {name1:value1, name2:value2}");
         add("count,c", count, "number of messages to read before exiting");
     }
 
diff --git a/cpp/examples/messaging/server.cpp b/cpp/examples/messaging/server.cpp
index ab72694c61..aa271d91f9 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/cpp/examples/messaging/server.cpp
@@ -39,8 +39,8 @@ using std::string;
 
 int main(int argc, char** argv) {
     const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
-    std::string connectionOptions = argc > 3 ? argv[3] : "";
-    
+    std::string connectionOptions = argc > 2 ? argv[2] : "";
+
     Connection connection(url, connectionOptions);
     try {
         connection.open();
diff --git a/cpp/examples/messaging/spout.cpp b/cpp/examples/messaging/spout.cpp
index 57b955c1de..cd11a7ad81 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/cpp/examples/messaging/spout.cpp
@@ -65,7 +65,7 @@ struct Options : OptionParser
         add("property,P", properties, "specify message property");
         add("map,M", entries, "specify entry for map content");
         add("content", content, "specify textual content");
-        add("connection-options", connectionOptions, "connection options string in the form {name1=value1, name2=value2}");
+        add("connection-options", connectionOptions, "connection options string in the form {name1:value1, name2:value2}");
     }
 
     static bool nameval(const std::string& in, std::string& name, std::string& value)
diff --git a/cpp/examples/old_api/CMakeLists.txt b/cpp/examples/old_api/CMakeLists.txt
new file mode 100644
index 0000000000..701f9be860
--- /dev/null
+++ b/cpp/examples/old_api/CMakeLists.txt
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+add_subdirectory(direct)
+add_subdirectory(failover)
+add_subdirectory(fanout)
+add_subdirectory(pub-sub)
+add_subdirectory(request-response)
+add_subdirectory(tradedemo)
+add_subdirectory(xml-exchange)
diff --git a/cpp/examples/old_api/Makefile.am b/cpp/examples/old_api/Makefile.am
new file mode 100644
index 0000000000..04216ffa97
--- /dev/null
+++ b/cpp/examples/old_api/Makefile.am
@@ -0,0 +1,48 @@
+#
+# 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.
+#
+SUBDIRS =  direct pub-sub fanout request-response failover tradedemo
+if HAVE_XML
+  SUBDIRS += xml-exchange
+  broker_args = "--no-module-dir --data-dir \"\" --auth no --load-module $(top_builddir)/src/.libs/xml.so"	
+endif
+if !HAVE_XML
+  exclude_examples_regexp="xml"	# Exclude XML examples.
+  broker_args = "--no-module-dir --data-dir \"\" --auth no"	
+endif
+
+MAKEDIST=.libs/Makefile
+
+$(MAKEDIST): Makefile
+	mkdir -p .libs
+	@(echo 'all clean:' ; \
+	echo '	for d in $(SUBDIRS) ; do $$(MAKE) -C $$$$d $$@ ; done' ; \
+	) > $(MAKEDIST)
+
+examplesdir=$(pkgdatadir)/examples/old_api
+dist_examples_DATA = $(MAKEDIST)
+EXTRA_DIST = README.verify verify verify_all CMakeLists.txt
+
+# For older versions of automake
+abs_top_srcdir = @abs_top_srcdir@
+abs_top_builddir = @abs_top_builddir@
+
+# Verify the examples in the buid tree.
+check-local: 
+	$(srcdir)/verify_all $(abs_top_srcdir)/.. $(abs_top_builddir) $(broker_args) $(exclude_examples_regexp)
+
diff --git a/cpp/examples/README.verify b/cpp/examples/old_api/README.verify
index e1370764c9..e1370764c9 100644
--- a/cpp/examples/README.verify
+++ b/cpp/examples/old_api/README.verify
diff --git a/cpp/examples/direct/CMakeLists.txt b/cpp/examples/old_api/direct/CMakeLists.txt
index 2ec1b2b813..2ec1b2b813 100644
--- a/cpp/examples/direct/CMakeLists.txt
+++ b/cpp/examples/old_api/direct/CMakeLists.txt
diff --git a/cpp/examples/direct/Makefile.am b/cpp/examples/old_api/direct/Makefile.am
index b07db2cfd6..24f783fcc7 100644
--- a/cpp/examples/direct/Makefile.am
+++ b/cpp/examples/old_api/direct/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/direct
+examplesdir=$(pkgdatadir)/examples/old_api/direct
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/direct/declare_queues.cpp b/cpp/examples/old_api/direct/declare_queues.cpp
index 9a51d1982b..9a51d1982b 100644
--- a/cpp/examples/direct/declare_queues.cpp
+++ b/cpp/examples/old_api/direct/declare_queues.cpp
diff --git a/cpp/examples/direct/direct_declare_queues.vcproj b/cpp/examples/old_api/direct/direct_declare_queues.vcproj
index 083474b9ef..083474b9ef 100644
--- a/cpp/examples/direct/direct_declare_queues.vcproj
+++ b/cpp/examples/old_api/direct/direct_declare_queues.vcproj
diff --git a/cpp/examples/direct/direct_direct_producer.vcproj b/cpp/examples/old_api/direct/direct_direct_producer.vcproj
index f091fbf291..f091fbf291 100644
--- a/cpp/examples/direct/direct_direct_producer.vcproj
+++ b/cpp/examples/old_api/direct/direct_direct_producer.vcproj
diff --git a/cpp/examples/direct/direct_listener.vcproj b/cpp/examples/old_api/direct/direct_listener.vcproj
index dce1d3ec28..dce1d3ec28 100644
--- a/cpp/examples/direct/direct_listener.vcproj
+++ b/cpp/examples/old_api/direct/direct_listener.vcproj
diff --git a/cpp/examples/direct/direct_producer.cpp b/cpp/examples/old_api/direct/direct_producer.cpp
index ecc9675189..ecc9675189 100644
--- a/cpp/examples/direct/direct_producer.cpp
+++ b/cpp/examples/old_api/direct/direct_producer.cpp
diff --git a/cpp/examples/direct/listener.cpp b/cpp/examples/old_api/direct/listener.cpp
index 38bf24ec41..38bf24ec41 100644
--- a/cpp/examples/direct/listener.cpp
+++ b/cpp/examples/old_api/direct/listener.cpp
diff --git a/cpp/examples/direct/verify b/cpp/examples/old_api/direct/verify
index f598bacc1f..f598bacc1f 100644
--- a/cpp/examples/direct/verify
+++ b/cpp/examples/old_api/direct/verify
diff --git a/cpp/examples/direct/verify.in b/cpp/examples/old_api/direct/verify.in
index d1e95f1151..d1e95f1151 100644
--- a/cpp/examples/direct/verify.in
+++ b/cpp/examples/old_api/direct/verify.in
diff --git a/cpp/examples/failover/CMakeLists.txt b/cpp/examples/old_api/failover/CMakeLists.txt
index 05db8fad51..05db8fad51 100644
--- a/cpp/examples/failover/CMakeLists.txt
+++ b/cpp/examples/old_api/failover/CMakeLists.txt
diff --git a/cpp/examples/failover/Makefile.am b/cpp/examples/old_api/failover/Makefile.am
index 48846fdf79..8b1da80f2c 100644
--- a/cpp/examples/failover/Makefile.am
+++ b/cpp/examples/old_api/failover/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/failover
+examplesdir=$(pkgdatadir)/examples/old_api/failover
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/failover/declare_queues.cpp b/cpp/examples/old_api/failover/declare_queues.cpp
index a677870c53..a677870c53 100644
--- a/cpp/examples/failover/declare_queues.cpp
+++ b/cpp/examples/old_api/failover/declare_queues.cpp
diff --git a/cpp/examples/failover/failover_declare_queues.vcproj b/cpp/examples/old_api/failover/failover_declare_queues.vcproj
index c87c72affd..c87c72affd 100644
--- a/cpp/examples/failover/failover_declare_queues.vcproj
+++ b/cpp/examples/old_api/failover/failover_declare_queues.vcproj
diff --git a/cpp/examples/failover/failover_replaying_sender.vcproj b/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
index 6d22fa6770..6d22fa6770 100644
--- a/cpp/examples/failover/failover_replaying_sender.vcproj
+++ b/cpp/examples/old_api/failover/failover_replaying_sender.vcproj
diff --git a/cpp/examples/failover/failover_resuming_receiver.vcproj b/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
index ba5061e248..ba5061e248 100644
--- a/cpp/examples/failover/failover_resuming_receiver.vcproj
+++ b/cpp/examples/old_api/failover/failover_resuming_receiver.vcproj
diff --git a/cpp/examples/failover/replaying_sender.cpp b/cpp/examples/old_api/failover/replaying_sender.cpp
index 22a7e1ebd3..22a7e1ebd3 100644
--- a/cpp/examples/failover/replaying_sender.cpp
+++ b/cpp/examples/old_api/failover/replaying_sender.cpp
diff --git a/cpp/examples/failover/resuming_receiver.cpp b/cpp/examples/old_api/failover/resuming_receiver.cpp
index d1886ce861..d1886ce861 100644
--- a/cpp/examples/failover/resuming_receiver.cpp
+++ b/cpp/examples/old_api/failover/resuming_receiver.cpp
diff --git a/cpp/examples/fanout/CMakeLists.txt b/cpp/examples/old_api/fanout/CMakeLists.txt
index 3f89d67650..3f89d67650 100644
--- a/cpp/examples/fanout/CMakeLists.txt
+++ b/cpp/examples/old_api/fanout/CMakeLists.txt
diff --git a/cpp/examples/fanout/Makefile.am b/cpp/examples/old_api/fanout/Makefile.am
index 6e2e821eae..3ab43b0279 100644
--- a/cpp/examples/fanout/Makefile.am
+++ b/cpp/examples/old_api/fanout/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/fanout
+examplesdir=$(pkgdatadir)/examples/old_api/fanout
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/fanout/fanout_fanout_producer.vcproj b/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
index daff5f3cf0..daff5f3cf0 100644
--- a/cpp/examples/fanout/fanout_fanout_producer.vcproj
+++ b/cpp/examples/old_api/fanout/fanout_fanout_producer.vcproj
diff --git a/cpp/examples/fanout/fanout_listener.vcproj b/cpp/examples/old_api/fanout/fanout_listener.vcproj
index f0e91b7dc6..f0e91b7dc6 100644
--- a/cpp/examples/fanout/fanout_listener.vcproj
+++ b/cpp/examples/old_api/fanout/fanout_listener.vcproj
diff --git a/cpp/examples/fanout/fanout_producer.cpp b/cpp/examples/old_api/fanout/fanout_producer.cpp
index decd4d314d..decd4d314d 100644
--- a/cpp/examples/fanout/fanout_producer.cpp
+++ b/cpp/examples/old_api/fanout/fanout_producer.cpp
diff --git a/cpp/examples/fanout/listener.cpp b/cpp/examples/old_api/fanout/listener.cpp
index cd3071c29a..cd3071c29a 100644
--- a/cpp/examples/fanout/listener.cpp
+++ b/cpp/examples/old_api/fanout/listener.cpp
diff --git a/cpp/examples/fanout/verify b/cpp/examples/old_api/fanout/verify
index 2eaadff56b..2eaadff56b 100644
--- a/cpp/examples/fanout/verify
+++ b/cpp/examples/old_api/fanout/verify
diff --git a/cpp/examples/fanout/verify.in b/cpp/examples/old_api/fanout/verify.in
index 8f8612ce67..8f8612ce67 100644
--- a/cpp/examples/fanout/verify.in
+++ b/cpp/examples/old_api/fanout/verify.in
diff --git a/cpp/examples/old-examples.sln b/cpp/examples/old_api/old-examples.sln
index 7f2fa3e8b0..e6ec9a0d66 100644
--- a/cpp/examples/old-examples.sln
+++ b/cpp/examples/old_api/old-examples.sln
@@ -40,14 +40,6 @@ 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_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", "{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}"

-EndProject

-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}"

 EndProject

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

@@ -104,22 +96,6 @@ Global
 		{05158653-FECA-1BAD-A430-FD5330E23A2D}.Debug|Win32.Build.0 = Debug|Win32

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

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

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

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

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

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

-		{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}.Release|Win32.ActiveCfg = Release|Win32

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

-		{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}.Release|Win32.ActiveCfg = Release|Win32

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

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

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

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

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

 		{2691FE1E-FECA-1BAD-BD3A-8A467D0C5CCC}.Debug|Win32.ActiveCfg = Debug|Win32

 		{2691FE1E-FECA-1BAD-BD3A-8A467D0C5CCC}.Debug|Win32.Build.0 = Debug|Win32

 		{2691FE1E-FECA-1BAD-BD3A-8A467D0C5CCC}.Release|Win32.ActiveCfg = Release|Win32

diff --git a/cpp/examples/pub-sub/CMakeLists.txt b/cpp/examples/old_api/pub-sub/CMakeLists.txt
index 961de06d5a..961de06d5a 100644
--- a/cpp/examples/pub-sub/CMakeLists.txt
+++ b/cpp/examples/old_api/pub-sub/CMakeLists.txt
diff --git a/cpp/examples/pub-sub/Makefile.am b/cpp/examples/old_api/pub-sub/Makefile.am
index 62658ebe94..8f42ee0211 100644
--- a/cpp/examples/pub-sub/Makefile.am
+++ b/cpp/examples/old_api/pub-sub/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/pub-sub
+examplesdir=$(pkgdatadir)/examples/old_api/pub-sub
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/pub-sub/pub-sub_topic_listener.vcproj b/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
index aa0b3bcaa3..aa0b3bcaa3 100644
--- a/cpp/examples/pub-sub/pub-sub_topic_listener.vcproj
+++ b/cpp/examples/old_api/pub-sub/pub-sub_topic_listener.vcproj
diff --git a/cpp/examples/pub-sub/pub-sub_topic_publisher.vcproj b/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
index 76e51df4df..76e51df4df 100644
--- a/cpp/examples/pub-sub/pub-sub_topic_publisher.vcproj
+++ b/cpp/examples/old_api/pub-sub/pub-sub_topic_publisher.vcproj
diff --git a/cpp/examples/pub-sub/topic_listener.cpp b/cpp/examples/old_api/pub-sub/topic_listener.cpp
index d38a806303..d38a806303 100644
--- a/cpp/examples/pub-sub/topic_listener.cpp
+++ b/cpp/examples/old_api/pub-sub/topic_listener.cpp
diff --git a/cpp/examples/pub-sub/topic_publisher.cpp b/cpp/examples/old_api/pub-sub/topic_publisher.cpp
index aed5f8f033..aed5f8f033 100644
--- a/cpp/examples/pub-sub/topic_publisher.cpp
+++ b/cpp/examples/old_api/pub-sub/topic_publisher.cpp
diff --git a/cpp/examples/pub-sub/verify b/cpp/examples/old_api/pub-sub/verify
index 528d2f401e..528d2f401e 100644
--- a/cpp/examples/pub-sub/verify
+++ b/cpp/examples/old_api/pub-sub/verify
diff --git a/cpp/examples/pub-sub/verify.in b/cpp/examples/old_api/pub-sub/verify.in
index 6413c5c788..6413c5c788 100644
--- a/cpp/examples/pub-sub/verify.in
+++ b/cpp/examples/old_api/pub-sub/verify.in
diff --git a/cpp/examples/request-response/CMakeLists.txt b/cpp/examples/old_api/request-response/CMakeLists.txt
index 873a0cfa86..873a0cfa86 100644
--- a/cpp/examples/request-response/CMakeLists.txt
+++ b/cpp/examples/old_api/request-response/CMakeLists.txt
diff --git a/cpp/examples/request-response/Makefile.am b/cpp/examples/old_api/request-response/Makefile.am
index 48b3d989f0..f48762da51 100644
--- a/cpp/examples/request-response/Makefile.am
+++ b/cpp/examples/old_api/request-response/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/request-response
+examplesdir=$(pkgdatadir)/examples/old_api/request-response
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/request-response/client.cpp b/cpp/examples/old_api/request-response/client.cpp
index 679d1c5fc2..679d1c5fc2 100644
--- a/cpp/examples/request-response/client.cpp
+++ b/cpp/examples/old_api/request-response/client.cpp
diff --git a/cpp/examples/request-response/request-response_client.vcproj b/cpp/examples/old_api/request-response/request-response_client.vcproj
index 5f9eadde36..5f9eadde36 100644
--- a/cpp/examples/request-response/request-response_client.vcproj
+++ b/cpp/examples/old_api/request-response/request-response_client.vcproj
diff --git a/cpp/examples/request-response/request-response_server.vcproj b/cpp/examples/old_api/request-response/request-response_server.vcproj
index 54352b9f46..54352b9f46 100644
--- a/cpp/examples/request-response/request-response_server.vcproj
+++ b/cpp/examples/old_api/request-response/request-response_server.vcproj
diff --git a/cpp/examples/request-response/server.cpp b/cpp/examples/old_api/request-response/server.cpp
index 65a4717b35..65a4717b35 100644
--- a/cpp/examples/request-response/server.cpp
+++ b/cpp/examples/old_api/request-response/server.cpp
diff --git a/cpp/examples/request-response/verify b/cpp/examples/old_api/request-response/verify
index dee82413e7..dee82413e7 100644
--- a/cpp/examples/request-response/verify
+++ b/cpp/examples/old_api/request-response/verify
diff --git a/cpp/examples/request-response/verify.in b/cpp/examples/old_api/request-response/verify.in
index 7925dc5671..7925dc5671 100644
--- a/cpp/examples/request-response/verify.in
+++ b/cpp/examples/old_api/request-response/verify.in
diff --git a/cpp/examples/tradedemo/CMakeLists.txt b/cpp/examples/old_api/tradedemo/CMakeLists.txt
index e61fc1467d..e61fc1467d 100644
--- a/cpp/examples/tradedemo/CMakeLists.txt
+++ b/cpp/examples/old_api/tradedemo/CMakeLists.txt
diff --git a/cpp/examples/tradedemo/Makefile.am b/cpp/examples/old_api/tradedemo/Makefile.am
index f4d8686d05..445b15b367 100644
--- a/cpp/examples/tradedemo/Makefile.am
+++ b/cpp/examples/old_api/tradedemo/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/tradedemo
+examplesdir=$(pkgdatadir)/examples/old_api/tradedemo
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/tradedemo/declare_queues.cpp b/cpp/examples/old_api/tradedemo/declare_queues.cpp
index b1f2cc3510..b1f2cc3510 100644
--- a/cpp/examples/tradedemo/declare_queues.cpp
+++ b/cpp/examples/old_api/tradedemo/declare_queues.cpp
diff --git a/cpp/examples/tradedemo/topic_listener.cpp b/cpp/examples/old_api/tradedemo/topic_listener.cpp
index c488e7fb69..c488e7fb69 100644
--- a/cpp/examples/tradedemo/topic_listener.cpp
+++ b/cpp/examples/old_api/tradedemo/topic_listener.cpp
diff --git a/cpp/examples/tradedemo/topic_publisher.cpp b/cpp/examples/old_api/tradedemo/topic_publisher.cpp
index e22c185bc7..e22c185bc7 100644
--- a/cpp/examples/tradedemo/topic_publisher.cpp
+++ b/cpp/examples/old_api/tradedemo/topic_publisher.cpp
diff --git a/cpp/examples/tradedemo/tradedemo_declare_queues.vcproj b/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
index 34b5cb3b2b..34b5cb3b2b 100644
--- a/cpp/examples/tradedemo/tradedemo_declare_queues.vcproj
+++ b/cpp/examples/old_api/tradedemo/tradedemo_declare_queues.vcproj
diff --git a/cpp/examples/tradedemo/tradedemo_topic_listener.vcproj b/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
index 965be2e88b..965be2e88b 100644
--- a/cpp/examples/tradedemo/tradedemo_topic_listener.vcproj
+++ b/cpp/examples/old_api/tradedemo/tradedemo_topic_listener.vcproj
diff --git a/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj b/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
index 77fd511e15..77fd511e15 100644
--- a/cpp/examples/tradedemo/tradedemo_topic_publisher.vcproj
+++ b/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj
diff --git a/cpp/examples/verify b/cpp/examples/old_api/verify
index 9a1ed078d6..9a1ed078d6 100755
--- a/cpp/examples/verify
+++ b/cpp/examples/old_api/verify
diff --git a/cpp/examples/verify_all b/cpp/examples/old_api/verify_all
index cb4c5283fa..fbe51377b6 100755
--- a/cpp/examples/verify_all
+++ b/cpp/examples/old_api/verify_all
@@ -32,7 +32,7 @@ trap "$qpidd -q" exit
 QPID_PORT=`$qpidd -dp0 $broker_args` || { echo "Can't run qpidd" ; exit 1; }
 export QPID_PORT
 
-find="find $topsrcdir/cpp/examples"
+find="find $topsrcdir/cpp/examples/old_api"
 find="$find -mindepth 2 -name verify"
 all_examples=`$find`
 
diff --git a/cpp/examples/xml-exchange/CMakeLists.txt b/cpp/examples/old_api/xml-exchange/CMakeLists.txt
index 3fea47a208..3fea47a208 100644
--- a/cpp/examples/xml-exchange/CMakeLists.txt
+++ b/cpp/examples/old_api/xml-exchange/CMakeLists.txt
diff --git a/cpp/examples/xml-exchange/Makefile.am b/cpp/examples/old_api/xml-exchange/Makefile.am
index 9001e3fa61..3e1082cdb2 100644
--- a/cpp/examples/xml-exchange/Makefile.am
+++ b/cpp/examples/old_api/xml-exchange/Makefile.am
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-examplesdir=$(pkgdatadir)/examples/xml-exchange
+examplesdir=$(pkgdatadir)/examples/old_api/xml-exchange
 
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
diff --git a/cpp/examples/xml-exchange/README.txt b/cpp/examples/old_api/xml-exchange/README.txt
index 85caebe352..85caebe352 100644
--- a/cpp/examples/xml-exchange/README.txt
+++ b/cpp/examples/old_api/xml-exchange/README.txt
diff --git a/cpp/examples/xml-exchange/declare_queues.cpp b/cpp/examples/old_api/xml-exchange/declare_queues.cpp
index ad08642019..ad08642019 100644
--- a/cpp/examples/xml-exchange/declare_queues.cpp
+++ b/cpp/examples/old_api/xml-exchange/declare_queues.cpp
diff --git a/cpp/examples/xml-exchange/listener.cpp b/cpp/examples/old_api/xml-exchange/listener.cpp
index 11bcb9f669..11bcb9f669 100644
--- a/cpp/examples/xml-exchange/listener.cpp
+++ b/cpp/examples/old_api/xml-exchange/listener.cpp
diff --git a/cpp/examples/xml-exchange/xml_producer.cpp b/cpp/examples/old_api/xml-exchange/xml_producer.cpp
index af1a7e60c7..af1a7e60c7 100644
--- a/cpp/examples/xml-exchange/xml_producer.cpp
+++ b/cpp/examples/old_api/xml-exchange/xml_producer.cpp
diff --git a/cpp/examples/qmf-console/ping.cpp b/cpp/examples/qmf-console/ping.cpp
index fe537d48d2..e6d6d138d5 100644
--- a/cpp/examples/qmf-console/ping.cpp
+++ b/cpp/examples/qmf-console/ping.cpp
@@ -31,9 +31,7 @@ using namespace qpid::console;
 int main_int(int /*argc*/, char** /*argv*/)
 {
     //
-    // Declare connection settings for the messaging broker.  The settings default to
-    // localhost:5672 with user guest (password guest).  Refer to the header file
-    // <qpid/client/ConnectionSettings.h> for full details.
+    // Declare connection settings for the messaging broker.  
     //
     qpid::client::ConnectionSettings connSettings;
 
diff --git a/cpp/examples/qmf-console/printevents.cpp b/cpp/examples/qmf-console/printevents.cpp
index 3a0a2ab68b..ac3e449a2c 100644
--- a/cpp/examples/qmf-console/printevents.cpp
+++ b/cpp/examples/qmf-console/printevents.cpp
@@ -64,9 +64,7 @@ struct Main {
         Listener listener;
 
         //
-        // Declare connection settings for the messaging broker.  The settings default to
-        // localhost:5672 with user guest (password guest).  Refer to the header file
-        // <qpid/client/ConnectionSettings.h> for full details.
+        // Declare connection settings for the messaging broker.  
         //
         qpid::client::ConnectionSettings connSettings;