Merged revisions 619974,620011,620014,620016-620017,620479,620481,620566,620584,620619,620622,620831,620854,620861-620862,620889,627128,627133,627141,627153-627155,627157,627171,627187 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/trunk

........
  r619974 | rhs | 2008-02-08 18:30:04 +0000 (Fri, 08 Feb 2008) | 1 line
  
  made xa tests run, and made QpidTestCase more robust
........
  r620011 | rhs | 2008-02-08 22:05:50 +0000 (Fri, 08 Feb 2008) | 1 line
  
  whitespace cleanup
........
  r620014 | aconway | 2008-02-08 22:23:23 +0000 (Fri, 08 Feb 2008) | 7 lines
  
  
  cpp/examples/direct, fanout: Converted listener.cpp to SubscriptionManager.
  
  All python/cpp combos run as part of cpp/examples make check.
  
  Fixed problems with verify scripts and VPATH builds.
........
  r620016 | cctrieloff | 2008-02-08 22:24:33 +0000 (Fri, 08 Feb 2008) | 2 lines
  
  yum correction
........
  r620017 | aconway | 2008-02-08 22:27:38 +0000 (Fri, 08 Feb 2008) | 10 lines
  
  
  From Ted Ross, https://issues.apache.org/jira/browse/QPID-782
  
  The attached patch makes the following changes:
  
  The --load-dir option has been renamed to --module-dir
  The --no-modules option and been replaced by the --no-module-dir option. This new option suppresses ONLY the loading of modules from the directory.
  The --no-data-dir option has been added to suppress the use of a data directory.
  Logging has been added for data directory lock and unlock.
........
  r620479 | gsim | 2008-02-11 13:00:45 +0000 (Mon, 11 Feb 2008) | 3 lines
  
  Check valid listener (or handler) exist and log error if not. See QPID-783.
........
  r620481 | gsim | 2008-02-11 13:10:38 +0000 (Mon, 11 Feb 2008) | 3 lines
  
  Added a test (currently disabled) that highlights a deadlock in the client when commands are sent to the broker concurrently with acks (e.g. when the dispatcher thread is running with auto-acking and messages are sent on another thread).
........
  r620566 | rhs | 2008-02-11 18:23:12 +0000 (Mon, 11 Feb 2008) | 1 line
  
  bumped release for Beta 3
........
  r620584 | rhs | 2008-02-11 19:21:01 +0000 (Mon, 11 Feb 2008) | 1 line
  
  fixed computation of ranged acks, fix needed for failing RecoverTest
........
  r620619 | aconway | 2008-02-11 21:43:32 +0000 (Mon, 11 Feb 2008) | 1 line
  
  Fix errors in verify scripts.
........
  r620622 | aconway | 2008-02-11 21:50:17 +0000 (Mon, 11 Feb 2008) | 1 line
  
  Remove dependency on sys::Socket for management ID of connections.
........
  r620831 | rhs | 2008-02-12 15:44:14 +0000 (Tue, 12 Feb 2008) | 1 line
  
  added help text for the clean-results target
........
  r620854 | gsim | 2008-02-12 16:35:45 +0000 (Tue, 12 Feb 2008) | 3 lines
  
  Explicitly reset shared pointer; brokers destructor not called if started through -d otherwise it seems...
........
  r620861 | gsim | 2008-02-12 16:54:05 +0000 (Tue, 12 Feb 2008) | 3 lines
  
  Fixed typo
........
  r620862 | aconway | 2008-02-12 16:54:42 +0000 (Tue, 12 Feb 2008) | 2 lines
  
  Create /var/lib/qpidd correctly.
........
  r620889 | aconway | 2008-02-12 18:04:11 +0000 (Tue, 12 Feb 2008) | 1 line
  
  Quote all non-printable ASCII characters (not just control characters)
........
  r627128 | aconway | 2008-02-12 21:39:55 +0000 (Tue, 12 Feb 2008) | 1 line
  
  Create a tar file of verify scripts suitable for untarring into and installed examples directory.
........
  r627133 | aconway | 2008-02-12 21:48:52 +0000 (Tue, 12 Feb 2008) | 2 lines
  
  Add -g to build flags to get debug info.
........
  r627141 | aconway | 2008-02-12 21:57:36 +0000 (Tue, 12 Feb 2008) | 2 lines
  
  Fix verify error in Makefile.am
........
  r627153 | rhs | 2008-02-12 22:21:20 +0000 (Tue, 12 Feb 2008) | 1 line
  
  increased the test timeout
........
  r627154 | rhs | 2008-02-12 22:22:20 +0000 (Tue, 12 Feb 2008) | 1 line
  
  synchronize access to lastWrite future
........
  r627155 | rhs | 2008-02-12 22:23:02 +0000 (Tue, 12 Feb 2008) | 1 line
  
  added default getConnection()
........
  r627157 | rhs | 2008-02-12 22:26:26 +0000 (Tue, 12 Feb 2008) | 1 line
  
  added a test for message send followed by immediate connection close; fixed connection close handshaking
........
  r627171 | aconway | 2008-02-12 23:09:06 +0000 (Tue, 12 Feb 2008) | 6 lines
  
  Patches from Ted Ross:
  
  Fix for bignumber problem in the management console.
  
  Fix for broker crash when sessions are closed via management.
........
  r627187 | rhs | 2008-02-12 23:52:01 +0000 (Tue, 12 Feb 2008) | 1 line
  
  applied patch from rajith to fix reply-to
........


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

1 files changed, 2 insertions, 2 deletions

diff --git a/qpid/python/examples/request-response/verify.in b/qpid/python/examples/request-response/verify.in
index c02a423bcb..f681253b3c 100644
--- a/qpid/python/examples/request-response/verify.in
+++ b/qpid/python/examples/request-response/verify.in
@@ -1,4 +1,4 @@
-==== ./client.py.out | remove_uuid64
+==== client.py.out | remove_uuid64
 Request: Twas brilling, and the slithy toves
 Request: Did gyre and gimble in the wabe.
 Request: All mimsy were the borogroves,
@@ -9,6 +9,6 @@ Response: DID GYRE AND GIMBLE IN THE WABE.
 Response: ALL MIMSY WERE THE BOROGROVES,
 Response: AND THE MOME RATHS OUTGRABE.
 No more messages!
-====  server.py.out | remove_uuid64
+==== server.py.out | remove_uuid64
 Request server running - run your client now.
 (Times out after 100 seconds ...)