summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/ClientSessionTest.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merged revisions 649909-650455 via svnmerge from Aidan Skinner2008-04-221-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/trunk ........ r649915 | gsim | 2008-04-20 13:10:37 +0100 (Sun, 20 Apr 2008) | 6 lines QPID-920: converted c++ client to use final 0-10 protocol * connection handler converted to using invoker & proxy and updated to final method defs * SessionCore & ExecutionHandler replace by SessionImpl * simplified handling of completion & results, removed handling of responses ........ r650127 | arnaudsimon | 2008-04-21 13:45:48 +0100 (Mon, 21 Apr 2008) | 1 line QPID-939 Added "ID:" to message ID ........ r650159 | gsim | 2008-04-21 15:37:03 +0100 (Mon, 21 Apr 2008) | 4 lines QPID-920: send message-accept for acks (as well as completion) * AckPolicy now maintains a set of transfered messages for cumulative accepts ........ r650198 | aconway | 2008-04-21 17:36:08 +0100 (Mon, 21 Apr 2008) | 6 lines src/qpid/RangeSet.h: generic set implementation using ranges. - no heap allocation for simple sets (<= 3 ranges) - binary searches for o(log(n)) performance in complex sets ........ r650210 | aconway | 2008-04-21 18:34:49 +0100 (Mon, 21 Apr 2008) | 1 line Fix compile error on rhel5. ........ r650221 | aconway | 2008-04-21 19:59:31 +0100 (Mon, 21 Apr 2008) | 2 lines Better workaround for boost::ptr_map incompatibility between boost 1.33 and 1.34, based on public properties of ptr::map types rather than version numbers. ........ r650227 | aconway | 2008-04-21 20:19:42 +0100 (Mon, 21 Apr 2008) | 2 lines Disable compilation of amqp_0_10 codec until ready for integration. ........ r650250 | gsim | 2008-04-21 21:34:49 +0100 (Mon, 21 Apr 2008) | 4 lines * raise error when controls other than attached are received on unattached channel * corrected exception handling in client and on broker (broker to issue detach) ........ r650273 | aconway | 2008-04-21 22:22:09 +0100 (Mon, 21 Apr 2008) | 1 line Fix packaging problems for rpmbuild. ........ r650439 | gsim | 2008-04-22 11:33:12 +0100 (Tue, 22 Apr 2008) | 7 lines QPID-648: (based on patch from mfarrellee@redhat.com) * apply authentication to final 0-10 codepath * consolidate conditional compilation of sasl-related code * improved handling of connection close during connection establishment in client ........ r650450 | gsim | 2008-04-22 13:05:52 +0100 (Tue, 22 Apr 2008) | 3 lines QPID-944: do no-local checking where requested when there is an exclusive subscription active ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@650478 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 648217-649481 via svnmerge from Aidan Skinner2008-04-181-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/trunk ........ r648272 | aconway | 2008-04-15 15:54:46 +0100 (Tue, 15 Apr 2008) | 1 line Fix build error: MapValue SIZE was too small for Struct32. ........ r648288 | astitcher | 2008-04-15 16:41:21 +0100 (Tue, 15 Apr 2008) | 4 lines Refactored the IO framework that sits on top of Poller so that it uses a generalised IOHandle. This means that you can define new classes derived from IOHandle (other than Socket) that can also be added to a Poller and waited for. ........ r648292 | nsantos | 2008-04-15 16:46:38 +0100 (Tue, 15 Apr 2008) | 1 line add svn revision include to specfile ........ r648297 | aconway | 2008-04-15 16:57:58 +0100 (Tue, 15 Apr 2008) | 2 lines Cleanup of size calculations and handling UnknownStruct ........ r648308 | nsantos | 2008-04-15 17:12:01 +0100 (Tue, 15 Apr 2008) | 1 line QPID-921: applied qpid-patch36.diff on behalf of Ted Ross ........ r648329 | aconway | 2008-04-15 18:00:40 +0100 (Tue, 15 Apr 2008) | 2 lines Disabled failing tests, working on fixing the issues. ........ r648338 | aconway | 2008-04-15 18:10:59 +0100 (Tue, 15 Apr 2008) | 1 line Comment out failing test, repairing. ........ r648362 | aconway | 2008-04-15 19:23:55 +0100 (Tue, 15 Apr 2008) | 4 lines Correct Struct32 encoding: size/code/data. Proper re-encoding for unknown struct codes. ........ r648418 | aconway | 2008-04-15 22:32:35 +0100 (Tue, 15 Apr 2008) | 1 line Fix build error - missing op << for Struct32. ........ r648661 | arnaudsimon | 2008-04-16 11:32:23 +0100 (Wed, 16 Apr 2008) | 1 line QPID-928 Added a pause period for letting the finalyzer a chance to notify all the Mina connector threads before we check for spurious threads. ........ r648681 | arnaudsimon | 2008-04-16 13:28:31 +0100 (Wed, 16 Apr 2008) | 1 line QPID-897: this test was intermittently timing out when messages are not prefetched. This is a temporary fix until we use a configurable timeout. ........ r648692 | rhs | 2008-04-16 14:32:13 +0100 (Wed, 16 Apr 2008) | 1 line QPID-901: updates to the java client to use the 0-10 final spec instead of the 0-10 preview spec; this includes improvements to the codegen process as well as some modifications to the shared code path in the client to not lose per message state when consumers are closed. ........ r648699 | rhs | 2008-04-16 14:58:35 +0100 (Wed, 16 Apr 2008) | 1 line QPID-901: add back ExceptionHelper.java to fix the build ........ r648706 | aconway | 2008-04-16 15:32:33 +0100 (Wed, 16 Apr 2008) | 2 lines Fix bug in Blob::assign assigning from an empty blob. ........ r648724 | aconway | 2008-04-16 16:33:51 +0100 (Wed, 16 Apr 2008) | 3 lines Fix encoding for sized structs. ........ r648726 | aconway | 2008-04-16 16:45:01 +0100 (Wed, 16 Apr 2008) | 3 lines Separate new codec from liqqpidcommon to improve link times. To be included in libqpidcommon when we are ready to replace framing codec. ........ r648770 | aconway | 2008-04-16 19:01:28 +0100 (Wed, 16 Apr 2008) | 2 lines Removed complex_types.h from Makefile.am. ........ r648771 | rhs | 2008-04-16 19:03:22 +0100 (Wed, 16 Apr 2008) | 1 line QPID-901: don't depend on constant values matching up when converting between JMS and AMQP delivery modes ........ r648782 | aconway | 2008-04-16 19:23:14 +0100 (Wed, 16 Apr 2008) | 1 line Add missing files to packaging. ........ r648784 | rhs | 2008-04-16 19:25:29 +0100 (Wed, 16 Apr 2008) | 1 line QPID-901: updated the JMS examples to use legal delivery mode values as they are now checked with the 0-10 final updates ........ r648904 | astitcher | 2008-04-17 01:19:14 +0100 (Thu, 17 Apr 2008) | 7 lines Refactored IO Thread creation so that it happens in the Broker class - There is now a single Poller created by the Broker class that is passed to the Acceptor for use in network IO. It can also now be passed to anything else that wants to put work in the IO threads - The Broker class itself is now responsible for actually creating the threads ........ r649016 | arnaudsimon | 2008-04-17 10:20:24 +0100 (Thu, 17 Apr 2008) | 1 line QPID-919 Changed AMQBrokerDetails to throw an URL exception when the port number is not specified. ........ r649059 | gsim | 2008-04-17 13:21:38 +0100 (Thu, 17 Apr 2008) | 3 lines Some fixes to the transitional spec defs. ........ r649070 | arnaudsimon | 2008-04-17 13:44:35 +0100 (Thu, 17 Apr 2008) | 1 line QPID-796 Made connection URL property + use session level method ........ r649099 | arnaudsimon | 2008-04-17 14:47:29 +0100 (Thu, 17 Apr 2008) | 1 line QPID-884 Added cpp profile that does not use a store. Also updated profile for taking auth into account and updated broker.clean as per QPID-904 ........ r649126 | nsantos | 2008-04-17 15:31:01 +0100 (Thu, 17 Apr 2008) | 1 line add full path to qpidd in init script, as it fails in some environments with just the command name ........ r649130 | aconway | 2008-04-17 15:42:09 +0100 (Thu, 17 Apr 2008) | 4 lines Added missing .h files to Makefile.am to fix make rpmbuild. Add non-const Message::data() Make log/Statement.h public. ........ r649159 | aconway | 2008-04-17 17:01:05 +0100 (Thu, 17 Apr 2008) | 4 lines src/Makefile.am: Fix problems with rpmbuild. src/tests/README: Updated information about boost test. ........ r649294 | astitcher | 2008-04-17 22:46:22 +0100 (Thu, 17 Apr 2008) | 2 lines Patch for improved compatibility with gcc 3.4 and boost 1.33 ........ r649339 | aconway | 2008-04-18 01:54:14 +0100 (Fri, 18 Apr 2008) | 3 lines src/tests/python_tests: fix exit status if QPID_NO_PREVIEW is set. src/qpid/framing/AMQFrame.h: frame header setters/getters with 0-10 naming. ........ r649409 | arnaudsimon | 2008-04-18 09:43:53 +0100 (Fri, 18 Apr 2008) | 1 line QPID-798 Make property per connection and/or system wide; change name to SYNC_PERSISTENT to denote only used on persistent messages ........ r649436 | arnaudsimon | 2008-04-18 10:50:13 +0100 (Fri, 18 Apr 2008) | 1 line QPID-936: added missing session close op ........ r649479 | kpvdr | 2008-04-18 13:09:42 +0100 (Fri, 18 Apr 2008) | 1 line Fix to prevent possible Timer deadlocks by holding onto mutex while calling fire() ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@649585 13f79535-47bb-0310-9956-ffa450edef68
* QPID-832 sync cpp with trunkAidan Skinner2008-04-141-0/+220
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@647727 13f79535-47bb-0310-9956-ffa450edef68
* QPID-832 delete for resync with trunk (cpp, ruby) and M2.1 (java/broker)Aidan Skinner2008-04-141-220/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@647726 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Aidan Skinner2008-02-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 628737,628827,628846,628875,629196,629199,629253,629263,629385,629403-629404,629503,629510,629514,629679,629747,629749-629750,629796,629800,629802,629806,629883,629986,629991,629999,630075 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk ........ r628737 | rhs | 2008-02-18 13:42:44 +0000 (Mon, 18 Feb 2008) | 1 line bumped spec release ........ r628827 | aconway | 2008-02-18 17:27:11 +0000 (Mon, 18 Feb 2008) | 2 lines Added sleep to verify script to avoid startup races. ........ r628846 | aconway | 2008-02-18 19:18:25 +0000 (Mon, 18 Feb 2008) | 1 line Fix problem with verify script in ../../bin. ........ r628875 | aconway | 2008-02-18 21:54:02 +0000 (Mon, 18 Feb 2008) | 9 lines Fixed race condition in the examples: when a listener program prints its "ready" message, the commands it has sent to the broker may not yet be complete. This results in sporadic lost messages if the producer is started immediately (e.g. by a script.) - Added Session::sync(), wait till all commands to date have completed. - Call sync() before printing "ready" in listener example programs - Removed sleep from verify script ........ r629196 | rhs | 2008-02-19 19:19:57 +0000 (Tue, 19 Feb 2008) | 1 line added AMQP 0-10 final ........ r629199 | rhs | 2008-02-19 19:23:34 +0000 (Tue, 19 Feb 2008) | 1 line fixed svn:eol-style ........ r629253 | aconway | 2008-02-19 22:33:29 +0000 (Tue, 19 Feb 2008) | 2 lines STL-style intrsive linked lists, single (ISList) and double (IList) ........ r629263 | aconway | 2008-02-19 22:58:41 +0000 (Tue, 19 Feb 2008) | 4 lines sys::RefCountedMap - reference-counted weak map of reference-counted objects. Ensures objects are atomically deleted and removed from the map. ........ r629385 | arnaudsimon | 2008-02-20 08:22:57 +0000 (Wed, 20 Feb 2008) | 1 line added init after broker shutdown and changed receiveNowait to receive(1000) ........ r629403 | arnaudsimon | 2008-02-20 10:11:03 +0000 (Wed, 20 Feb 2008) | 1 line added store prop ........ r629404 | arnaudsimon | 2008-02-20 10:11:41 +0000 (Wed, 20 Feb 2008) | 1 line added xa destinations ........ r629503 | aconway | 2008-02-20 15:26:05 +0000 (Wed, 20 Feb 2008) | 3 lines Added non-optional enum { SYNC, ASYNC } parameter to newSession. Updated API doc in client/SessionBase.h ........ r629510 | aconway | 2008-02-20 15:36:18 +0000 (Wed, 20 Feb 2008) | 1 line Update examples with ASYNC mode to newSession ........ r629514 | aconway | 2008-02-20 15:54:59 +0000 (Wed, 20 Feb 2008) | 2 lines Disabled RefCountedMap test - failing with valgrind error. RefCountedMap is not yet in use anywhere, will fix before I use it. ........ r629679 | aconway | 2008-02-21 02:58:37 +0000 (Thu, 21 Feb 2008) | 15 lines AMQP 0-10 type system: - new lightweight templated serialization framework - all fixed-size built-in types tested and working - all vbin & str types implemented, tests disabled need to fix encoding. The following types remain to be implemented: byte-ranges 2 byte ranges within a 64-bit payload sequence-set 2 ranged set representation map 0xa8 4 a mapping of keys to typed values list 0xa9 4 a series of consecutive type-value pairs array 0xaa 4 a defined length collection of values of a single type struct32 0xab 4 a coded struct with a 32-bit size ........ r629747 | arnaudsimon | 2008-02-21 11:07:36 +0000 (Thu, 21 Feb 2008) | 1 line added flag for tagging header without a payload ........ r629749 | arnaudsimon | 2008-02-21 11:09:43 +0000 (Thu, 21 Feb 2008) | 1 line changed for notifying message arrival when the header does not have a payload ........ r629750 | arnaudsimon | 2008-02-21 11:11:13 +0000 (Thu, 21 Feb 2008) | 1 line changed for creating durable queue for a durable subscriber ........ r629796 | aconway | 2008-02-21 14:24:24 +0000 (Thu, 21 Feb 2008) | 1 line Fix verify script problem ........ r629800 | arnaudsimon | 2008-02-21 14:38:38 +0000 (Thu, 21 Feb 2008) | 1 line changed for runing only with an 0.8 broker (this is testing 0.8 connection) ........ r629802 | arnaudsimon | 2008-02-21 14:39:37 +0000 (Thu, 21 Feb 2008) | 1 line added consumer2.close as messages may be delivered to this not used consumer ........ r629806 | arnaudsimon | 2008-02-21 14:41:51 +0000 (Thu, 21 Feb 2008) | 1 line added message releasing when messag listener is set ........ r629883 | gsim | 2008-02-21 17:40:42 +0000 (Thu, 21 Feb 2008) | 9 lines Start moving towards final 0-10 spec: * marked preview spec as 99-0 to distinguish it from 0-10 (which will now be used for the final version) * modified python client to treat 99-0 as 0-10 for now * modified broker to have two paths for the two different versions: 99-0 uses PreviewConnection, PreviewConnectionHandler and PreviewSessionHandler which are straight copy & pastes of the Connection, ConnectionHandler and SessionHandler now associated with 0-10 (so we can migrate the 0-10 path to the final spec without affecting clients working with the preview version) ........ r629986 | rhs | 2008-02-21 20:51:11 +0000 (Thu, 21 Feb 2008) | 1 line modified test harness to clean up data dir when broker crashes ........ r629991 | rhs | 2008-02-21 21:04:43 +0000 (Thu, 21 Feb 2008) | 1 line combined test cases and eliminated race condition ........ r629999 | gsim | 2008-02-21 21:23:37 +0000 (Thu, 21 Feb 2008) | 3 lines Fixes to prevent problems with async store when queue is deleted before all messages are completed or dequeued ........ r630075 | aconway | 2008-02-22 02:57:19 +0000 (Fri, 22 Feb 2008) | 2 lines Extended amqpgen.rb to cover 0-10 final model. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@630165 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Aidan Skinner2008-02-131-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merged revisions ↵Aidan Skinner2008-02-111-107/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 615958,615968,616353,616396,616402,616404,616445,616454,616507,616511,616542,616545,616715,616736,616927,616929,617188,617286,617303,617305,617320-617321,617510-617511,617513,617524,617527,617533,617543,617556,617582,617590,617592,617594,617596-617597,617607,617662,618412,618428,618436-618437,618450,618462,618519,618770,618982,618984,618986,618989,619012,619043,619148,619182,619189,619192,619200,619204,619424,619538,619604,619611,619626,619636,619646,619888,619903,619941 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/trunk ................ r615958 | aconway | 2008-01-28 17:17:06 +0000 (Mon, 28 Jan 2008) | 1 line Convert ClientSessionTest to boost. ................ r615968 | aconway | 2008-01-28 17:42:22 +0000 (Mon, 28 Jan 2008) | 1 line Added disabled test and FIXME note to fix client-side race. ................ r616353 | aconway | 2008-01-29 14:48:59 +0000 (Tue, 29 Jan 2008) | 9 lines Deleted unused classes, adjusted files that still mention them. D src/qpid/framing/ChannelAdapter.cpp D src/qpid/framing/ChannelAdapter.h D src/qpid/framing/HandlerUpdater.h D src/tests/BrokerChannelTest.cpp D src/tests/MockChannel.h ................ r616396 | aconway | 2008-01-29 15:45:29 +0000 (Tue, 29 Jan 2008) | 3 lines Provide public read-access to IListNode pointers, so frame handlers can use then to find the next frame. ................ r616402 | aconway | 2008-01-29 15:48:35 +0000 (Tue, 29 Jan 2008) | 2 lines Remove references to defunct broker::ChannelHandler ................ r616404 | aconway | 2008-01-29 15:49:55 +0000 (Tue, 29 Jan 2008) | 2 lines Log peer address with SEND/RECV messages. ................ r616445 | aidan | 2008-01-29 16:38:53 +0000 (Tue, 29 Jan 2008) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-616438" from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ................ r616454 | aidan | 2008-01-29 17:25:32 +0000 (Tue, 29 Jan 2008) | 13 lines Merged revisions 579126,579137 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r579126 | rgreig | 2007-09-25 09:42:53 +0100 (Tue, 25 Sep 2007) | 2 lines QPID-582: fix some 1.6 compile errors ........ r579137 | rgreig | 2007-09-25 10:00:34 +0100 (Tue, 25 Sep 2007) | 2 lines QPID-582 fix Java 6 compile errors ........ ................ r616507 | aconway | 2008-01-29 20:29:46 +0000 (Tue, 29 Jan 2008) | 2 lines Re-enabled build of cluster code when openais is installed. ................ r616511 | aconway | 2008-01-29 20:39:26 +0000 (Tue, 29 Jan 2008) | 1 line Added Observer to SessionManager for cluster use. ................ r616542 | rajith | 2008-01-29 22:24:40 +0000 (Tue, 29 Jan 2008) | 1 line added support to notify connection.close to the JMSExceptionListener ................ r616545 | rajith | 2008-01-29 22:30:20 +0000 (Tue, 29 Jan 2008) | 1 line I accidently commited some modifications done for a quick test, I reversed those changes ................ r616715 | arnaudsimon | 2008-01-30 10:38:11 +0000 (Wed, 30 Jan 2008) | 1 line changed default port value for tcp ................ r616736 | gsim | 2008-01-30 12:18:53 +0000 (Wed, 30 Jan 2008) | 3 lines Parse out the userid and password from the response; a small step on the road to authentication. ................ r616927 | aconway | 2008-01-30 22:32:17 +0000 (Wed, 30 Jan 2008) | 4 lines Remove Socket param from Connection constructor, pass a string id instead. ................ r616929 | aconway | 2008-01-30 22:34:50 +0000 (Wed, 30 Jan 2008) | 6 lines From Ted Ross, https://issues.apache.org/jira/browse/QPID-767 Bugfix: --load-dir rejected path-name-elements beginning with or ending with '.' (boost 1.33 only) ................ r617188 | gsim | 2008-01-31 18:50:46 +0000 (Thu, 31 Jan 2008) | 4 lines Make ports accesible through socket interface. Add local port to each logged frame in the client Connector ................ r617286 | aconway | 2008-01-31 23:14:49 +0000 (Thu, 31 Jan 2008) | 3 lines Generate URLs for local host. ................ r617303 | rhs | 2008-01-31 23:50:43 +0000 (Thu, 31 Jan 2008) | 1 line fixed svn:executable and svn:eol-style ................ r617305 | rhs | 2008-01-31 23:52:15 +0000 (Thu, 31 Jan 2008) | 1 line avoid use of Throwable.initCause(e) that is illegal with java 1.6 ................ r617320 | rhs | 2008-02-01 01:03:46 +0000 (Fri, 01 Feb 2008) | 1 line ant build system ................ r617321 | rhs | 2008-02-01 01:25:27 +0000 (Fri, 01 Feb 2008) | 1 line futzed with deps for faster build, and fixed bug in manifest generation ................ r617510 | rhs | 2008-02-01 14:49:33 +0000 (Fri, 01 Feb 2008) | 1 line added junit dependency ................ r617511 | rhs | 2008-02-01 14:53:52 +0000 (Fri, 01 Feb 2008) | 1 line fixed typo ................ r617513 | rhs | 2008-02-01 14:59:49 +0000 (Fri, 01 Feb 2008) | 1 line more dependency fixes ................ r617524 | rhs | 2008-02-01 15:46:44 +0000 (Fri, 01 Feb 2008) | 1 line added support for running one test, and made test output pretty ................ r617527 | rhs | 2008-02-01 15:55:30 +0000 (Fri, 01 Feb 2008) | 1 line less confusing options ................ r617533 | aconway | 2008-02-01 16:03:02 +0000 (Fri, 01 Feb 2008) | 9 lines Added cluster URL configuration, defaults to all interfaces. src/qpid/Plugin.h - added doxygen src/qpid/Url.cpp,.h - cache string rep, op==, istream/ostream ops. src/qpid/broker/Broker.h,.cpp - removed getUrl() src/qpid/cluster/Cluster.h,.cpp - use Url class src/qpid/cluster/ClusterPlugin.cpp - added --url configuration. ................ r617543 | rhs | 2008-02-01 16:16:22 +0000 (Fri, 01 Feb 2008) | 1 line more dependency fixes ................ r617556 | rhs | 2008-02-01 16:58:16 +0000 (Fri, 01 Feb 2008) | 1 line fixed build order ................ r617582 | aconway | 2008-02-01 18:02:42 +0000 (Fri, 01 Feb 2008) | 8 lines Cluster code fixed for changes in codebase. - Using SessionManager::Observer - Better ais test setup, only need to be member of ais group. - Update cluster_client - SessionState holds handler chains. - Cluster frames include next handler ptr. ................ r617590 | gsim | 2008-02-01 18:21:01 +0000 (Fri, 01 Feb 2008) | 3 lines Initial cut of inter-broker bridging ................ r617592 | gsim | 2008-02-01 18:26:08 +0000 (Fri, 01 Feb 2008) | 3 lines Oops, missed makefile in last commit. ................ r617594 | gsim | 2008-02-01 18:27:23 +0000 (Fri, 01 Feb 2008) | 3 lines Missed a couple of new files in previous commit. ................ r617596 | gsim | 2008-02-01 18:28:14 +0000 (Fri, 01 Feb 2008) | 3 lines Use 'guest' as default uid and password for tests. ................ r617597 | aconway | 2008-02-01 18:28:46 +0000 (Fri, 01 Feb 2008) | 1 line svn:ignore properties. ................ r617607 | gsim | 2008-02-01 18:54:27 +0000 (Fri, 01 Feb 2008) | 3 lines Remove includes to files no longer generated. ................ r617662 | rhs | 2008-02-01 21:43:20 +0000 (Fri, 01 Feb 2008) | 1 line added a detailed help target and cleaned up descriptions ................ r618412 | cctrieloff | 2008-02-04 20:11:39 +0000 (Mon, 04 Feb 2008) | 1 line add interval pu/sub options to test many concurrent connections ................ r618428 | cctrieloff | 2008-02-04 20:38:19 +0000 (Mon, 04 Feb 2008) | 1 line Turn management on by defualt ................ r618436 | rhs | 2008-02-04 21:05:39 +0000 (Mon, 04 Feb 2008) | 1 line set up logging for tests ................ r618437 | rhs | 2008-02-04 21:06:35 +0000 (Mon, 04 Feb 2008) | 1 line added exception callback to ConnectonDelegate ................ r618450 | rhs | 2008-02-04 21:43:01 +0000 (Mon, 04 Feb 2008) | 1 line clear the report directory before generating test report ................ r618462 | rhs | 2008-02-04 22:11:22 +0000 (Mon, 04 Feb 2008) | 1 line added a TransportException ................ r618519 | rajith | 2008-02-05 02:37:13 +0000 (Tue, 05 Feb 2008) | 2 lines Added code to connect the network error exceptions to the JMS Exception listener. ................ r618770 | aconway | 2008-02-05 20:44:14 +0000 (Tue, 05 Feb 2008) | 16 lines Added testSendToSelf for https://bugzilla.redhat.com/show_bug.cgi?id=410551 M src/tests/ClientSessionTest.cpp Disabled management for BrokerFixture - management singleton assumes only one broker per process, causes shutdown races with fixtures. M src/tests/BrokerFixture.h Made Timer::stop() idempotent M src/qpid/broker/Timer.cpp M src/qpid/broker/Timer.h Added STL-style size() and empty() M src/qpid/sys/BlockingQueue.h M src/qpid/client/LocalQueue.cpp M src/qpid/client/LocalQueue.h ................ r618982 | arnaudsimon | 2008-02-06 12:47:27 +0000 (Wed, 06 Feb 2008) | 1 line Changed for using AUTO_ACK session ................ r618984 | arnaudsimon | 2008-02-06 12:52:19 +0000 (Wed, 06 Feb 2008) | 1 line Byte message were losing their payload see QPI-779 ................ r618986 | arnaudsimon | 2008-02-06 12:56:20 +0000 (Wed, 06 Feb 2008) | 1 line QPID-777 and QPID-778 ................ r618989 | arnaudsimon | 2008-02-06 13:40:38 +0000 (Wed, 06 Feb 2008) | 1 line Changed session mode to AUTO_ACK so mesages are removed from broker between two tests. ................ r619012 | arnaudsimon | 2008-02-06 15:14:42 +0000 (Wed, 06 Feb 2008) | 1 line Changed for using Window mode see QPID-778 ................ r619043 | arnaudsimon | 2008-02-06 16:00:22 +0000 (Wed, 06 Feb 2008) | 1 line Added close logic for releasing pre-fetched messages, see QPID-778 ................ r619148 | aconway | 2008-02-06 20:49:05 +0000 (Wed, 06 Feb 2008) | 8 lines Replaced --enable-cluster option with --with-cpg to enable/disable CPG. make rpmbuild uses --with-cpg, will fail unless openais is installed. Normal builds respect explicit --with/--without, or use CPG if installed when neither is specified. ................ r619182 | rhs | 2008-02-06 22:13:31 +0000 (Wed, 06 Feb 2008) | 1 line added close notification ................ r619189 | rajith | 2008-02-06 22:36:02 +0000 (Wed, 06 Feb 2008) | 2 lines Added code to pass in the throwable to the closedListener so that it can be included in the JMS Exception thrown via the ExceptionListener ................ r619192 | rajith | 2008-02-06 22:38:12 +0000 (Wed, 06 Feb 2008) | 2 lines Removed the System.outs from the code. ................ r619200 | aconway | 2008-02-06 22:49:10 +0000 (Wed, 06 Feb 2008) | 12 lines From Ted Ross, https://issues.apache.org/jira/browse/QPID-780 Implementation of --data-dir for qpidd. Additions by myself: - set QPID_DATA_DIR= in test env so existing tests can run with no data dir. - src/Makefile.am and qpidc.spec.in install /var/lib/qpidd directory. NOTE: qpidd with no optoins will now FAIL if it cannot write /var/lib/qpidd. Start it with --data-dir= or set QPID_DATA_DIR= in your environement to run with no data directory. ................ r619204 | rhs | 2008-02-06 22:50:54 +0000 (Wed, 06 Feb 2008) | 1 line fixed log level defaults ................ r619424 | aconway | 2008-02-07 14:25:32 +0000 (Thu, 07 Feb 2008) | 2 lines Quote unprintable control characters in log output. ................ r619538 | rhs | 2008-02-07 18:15:20 +0000 (Thu, 07 Feb 2008) | 1 line added test for exception listener; fixed NPE ................ r619604 | aconway | 2008-02-07 19:51:01 +0000 (Thu, 07 Feb 2008) | 3 lines qpidc.spec.in: Build --without-cpg, no point adding the dependency till cluster functionality is available. ................ r619611 | aconway | 2008-02-07 20:02:14 +0000 (Thu, 07 Feb 2008) | 2 lines Disable QPID_DATA_DIR for verify tests. ................ r619626 | nsantos | 2008-02-07 20:18:54 +0000 (Thu, 07 Feb 2008) | 1 line create missing dir ................ r619636 | aconway | 2008-02-07 21:06:01 +0000 (Thu, 07 Feb 2008) | 2 lines Removed signal-unsafe code from shutdown handler. ................ r619646 | aconway | 2008-02-07 21:31:21 +0000 (Thu, 07 Feb 2008) | 3 lines Clean shutdown of broker: Moved signal unsafe code from Broker::shutdown to ~Broker, moved shutdown logging from shutdown handler to main() in qpidd.cpp ................ r619888 | rhs | 2008-02-08 13:50:55 +0000 (Fri, 08 Feb 2008) | 1 line simplied QpidTestCase's interface for running non vm brokers and set up build system to run cpp tests easily ................ r619903 | aconway | 2008-02-08 15:01:30 +0000 (Fri, 08 Feb 2008) | 11 lines Refactored verify scripts, added verify for python Examples. To verify an example: <qpid-trunk>/bin/verify <example-dir> See comments in bin/verify for more details. Changes: - Each example dir has its own verify script and verify.in. - Added sys.stdout.flush() to som python examples so verify can tell when they're ready. - Made python examples svn:executable. - C++ examples/Makefile.am runs python examples ................ r619941 | aconway | 2008-02-08 17:02:55 +0000 (Fri, 08 Feb 2008) | 3 lines Added verify scripts to run mixed python/cpp examples. bin/verify_all runs all examples. ................ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/thegreatmerge@620468 13f79535-47bb-0310-9956-ffa450edef68
* Improved/additional client API tests.Alan Conway2008-01-241-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced InProcessBroker with a more accurate loopback BrokerFixture. - Added asserts for mutex/condition/thread errors in debug build. - Added client tests for several exception conditions. - Added peer address to log ouput, client/server distinguished by (addr) or [addr] - Fixed various deadlocks & races exposed by the new asserts & tests. File-by-file: New BrokerFixture replaces InProcessBroker D src/tests/InProcessBroker.h M src/tests/BrokerFixture.h M src/tests/SocketProxy.h M src/tests/Makefile.am Made it run a bit faster. M src/tests/quick_perftest Redundant D src/tests/APRBaseTest.cpp Updated tests to use BrokerFixture M src/tests/ClientChannelTest.cpp M src/tests/exception_test.cpp M src/tests/ClientSessionTest.cpp Print thread IDs in decimal, same as GDB. M src/qpid/log/Logger.cpp Assert mutex/condition ops in debug build. M src/qpid/sys/posix/check.h M src/qpid/sys/posix/Mutex.h M src/qpid/sys/posix/Condition.h M src/qpid/sys/posix/Thread.h Added toFd() so SocketProxy can use ::select() M src/qpid/sys/Socket.h M src/qpid/sys/posix/Socket.cpp Fixes for races & deadlocks shown up by new tests & asserts. Mostly shutdown/close issues. M src/qpid/client/ConnectionHandler.h M src/qpid/client/ConnectionImpl.cpp M src/qpid/client/Demux.h M src/qpid/client/SessionCore.cpp M src/qpid/client/ConnectionHandler.cpp M src/qpid/client/Connector.h M src/qpid/client/Demux.cpp M src/qpid/client/Dispatcher.cpp M src/qpid/client/ConnectionImpl.h Logging peer address. M src/qpid/sys/AsynchIOAcceptor.cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@615063 13f79535-47bb-0310-9956-ffa450edef68
* src/tests/ClientSessionTest.cpp: Disabled hanging test: testDisconnectResume. Alan Conway2007-12-111-20/+12
| | | | | | | | src/tests/SocketProxy.h: fixed exception handling. src/tests/exception_test.cpp: fixed compile error. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@603273 13f79535-47bb-0310-9956-ffa450edef68
* src/tests/SocketProxy.h: proxy between local client & server to simulate ↵Alan Conway2007-12-101-5/+7
| | | | | | | | | | | network disconnect. src/qpid/client/Connector.h: remove friend hack for previous flawed disconnect approach. src/tests/BrokerFixture.h: "" src/tests/ClientSessionTest.cpp, exception_test.cpp: use ProxyConnection git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@602980 13f79535-47bb-0310-9956-ffa450edef68
* Summary:Alan Conway2007-12-071-26/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replaced InProcessBroker with BrokerFixture, uses a full loopback broker for more realistic tests. - Extracted non-generated parts of Session_0_10 into SessionBase. - Sundry small fixes. src/tests/BrokerFixture.h - in process broker with loopback connections. - tests can force a disorderly disconnect. src/qpid/client/Connector.h - back door to private members for BrokerFixture. - close() in destructor to avoid leaks. src/qpid/client/ConnectionImpl.h,cpp: - close() in destructor, to fix hang when destroyed without being closed. src/qpid/client/CompletionTracker.h,.cpp: - Fixed race in close/add. src/qpid/client/SessionBase.h,cpp: - Extracted all non-generated code from Session_0_10 into SessionBase - Added sync() src/tests/exception_test.cpp: Converted to boost & BrokerFixture src/tests/ClientChannelTest.cpp, ClientSessionTest.cpp: Use BrokerFixture git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@602182 13f79535-47bb-0310-9956-ffa450edef68
* Disable recoding of frames for replay where replay will not be required.Gordon Sim2007-11-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@598992 13f79535-47bb-0310-9956-ffa450edef68
* Added framing::BodyHolder:Alan Conway2007-11-221-25/+1
| | | | | | | | | | | | | | - Uniform holder for all body types, replaces MethodHolder. - Uses in_place constructors to avoid avoid body copy. framing::AMQFrame: - Holds body in heap-allocated intrusive_ptr<BodyHolder> - Uses in_place constructors to avoid avoid body copy. Removed/downgraded to TODO many redundant FIXME comments. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@597513 13f79535-47bb-0310-9956-ffa450edef68
* client::SubscriptionManager:Alan Conway2007-11-071-1/+1
| | | | | | | | | | | | | | | | | - Added autoStop support. - Added LocalQueue subscriptions. - Expose AckPolicy settings to user. client::Message: - incoming Messages carry their session for acknowledge perftest: (see perftest --help for details...) - allow multiple consumers. - 3 queue modes: shared, fanout, topic. - set size of messages git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@592869 13f79535-47bb-0310-9956-ffa450edef68
* Client API: fix keyword parameter ambiguities for beta client API.Alan Conway2007-10-301-16/+17
| | | | | | | | | | | | | | Classes: - client::no_keyword::Session_0_10 - plain defaulted signatures - client::Session_0_10 - keyword API. Keyword API changes: - keywords in client::arg namespace, user says: s.bind(arg::queue="x"...) - user can omit with: using namespace client::arg; s.bind(queue="x"...) - No trailing "_" required on session functions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@590498 13f79535-47bb-0310-9956-ffa450edef68
* Rename client::Session as client::Session_0_10Alan Conway2007-10-291-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@589794 13f79535-47bb-0310-9956-ffa450edef68
* Session resume support in client & broker: Client can resume a sessionAlan Conway2007-10-261-46/+105
| | | | | | | | | | | | | | | | | | | | | | | | | after voluntary suspend() or network failure. Frames lost in network failure are automatically re-transmitted for transparent re-connection. client::Session improvements: - Locking to avoid races between network & user threads. - Replaced client::StateManager with sys::StateMonitor - avoid heap allocation. qpid::Exception clean up: - use QPID_MSG consistently to format exception messages. - throw typed exceptions (in reply_exceptions.h) for AMQP exceptions. - re-throw correct typed exception on client for exceptions from broker. - Removed QpidError.h rubygen/templates/constants.rb: - constants.h: Added FOO_CLASS_ID and FOO_BAR_METHOD_ID constants. - reply_constants.h: Added throwReplyException(code, text) log::Logger: - Fixed shutdown race in Statement::~Initializer() git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@588761 13f79535-47bb-0310-9956-ffa450edef68
* * src/tests/ClientSessionTest.cpp: Suspend/resume tests.Alan Conway2007-09-281-0/+24
| | | | | | | | | | | | | | | * broker/SessionManager.cpp, broker/SessionHandler.cpp: Implement suspend/resume * client/ScopedAssociation.h, SessionCore.h, SessionHandler.h: Simplified relationships. - Removed ScopedAssociation. - SessionHandler: is now a member of SessionCore. - SessionCore: shared_ptr ownership by Session(s) and ConnectionImpl. - Using framing::FrameHandler interfaces. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@580403 13f79535-47bb-0310-9956-ffa450edef68
* 2007-09-24 Alan Conway <aconway@redhat.com>Alan Conway2007-09-241-0/+3
| | | | | | | | | | | | | | | * cpp/src/qpid/broker/SessionManager.cpp: Manage suspended sessions. Replaces SuspendedSessions. * cpp/src/qpid/broker/SessionState.cpp: Work with SessionManager. * cpp/src/qpid/broker/SessionHandler.cpp: Owns SessionState. * cpp/src/qpid/broker/Connection.h, .cpp: Owns session handlers. * cpp/src/qpid/broker/Broker.h: Added SessionManager member. * cpp/src/Makefile.am: Added broker/SessionManager.cpp * amqp.0-10-preview.xml: Added session-busy and channel-busy constants. * cpp/src/tests/.valgrind.supp-default: Added suppresssions for F7. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@578975 13f79535-47bb-0310-9956-ffa450edef68
* Added Dispatcher class (plus test). This converts incoming MessageTransfer ↵Gordon Sim2007-09-181-2/+61
| | | | | | framesets to Messages and pumps them to registered listeners. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@576935 13f79535-47bb-0310-9956-ffa450edef68
* In ClientChannel: Use subscribe and flush in place of get; use ↵Gordon Sim2007-09-121-0/+2
| | | | | | | | | | per-subscriber flow control for managing prefetches. In brokers Session: set credit to 0 when subscription is created (modified python tests accordingly) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@574979 13f79535-47bb-0310-9956-ffa450edef68
* Support for keyword args in session interfaceGordon Sim2007-09-101-7/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@574323 13f79535-47bb-0310-9956-ffa450edef68
* Client side support for message and delivery properties in header segments.Gordon Sim2007-09-101-4/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@574176 13f79535-47bb-0310-9956-ffa450edef68
* Implementation of execution.result on the client side Gordon Sim2007-09-061-0/+71
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@573359 13f79535-47bb-0310-9956-ffa450edef68