Bug 1011640

The re-based commits are on aconway-bz1011640. 
http://git.app.eng.bos.redhat.com/?p=rh-qpid.git;a=shortlog;h=refs/heads/aconway-bz1011640

The branch contains the list of all the individual commits for future reference, they should probably be squashed into a single commit when putting them on the 0.22-mrg branch.

The list of commits: 

r1524570 NO-JIRA: HA Primary should not log messages for unreplicated queues and exchanges.
r1524568 NO-JIRA: HA minor log improvement in StatusCheck
r1524567 NO-JIRA: added -l USER option to rsynchosts script.
r1523828 NO-JIRA: missing includes that are really needed
r1523094 QPID-4944: HA fix failure of test_failover_send_receive on slow machines.
r1522711 QPID-4944: HA re-enable test_failover_send_receive
r1522031 QPID-5132: HA crash in test_tx_join_leave caused by double delete of queue.
r1521987 NO-JIRA: HA Rationalize naming of Membership functions
r1521639 NO-JIRA: Demote fail over message from notice to info.
r1521192 QPID-4327: HA support for TX transactions - fix TX error messages.
r1521191 QPID-4327: HA support for TX transactions - consistent use of QueueRegistry::get
r1521190 QPID-4327: HA support for TX transactions - fix auth bugs.
r1520391 No-JIRA: HA fix broken cross reference in HA docs.
r1520133 NO-JIRA: repair build for VisualStudio 2010 and newer Boost vector::push_back now has two signatures that confuse boost. Use an explicit callback and do the push_back there. This is a replay of r1418544.
r1520108 NO-JIRA: HA minor fixes to test framework & comments.
r1519846 QPID:4327: HA support for TX transactions - fix cleanup at transaction end.
r1519806 NO-JIRA: Remove obsolete cluster_test.cpp test.
r1519738 NO-JIRA: HA minor cleanup of  disconnect logic.
r1518982 QPID-4327: HA clean up transaction artifacts at end of TX.
r1518975 NO-JIRA: Remove obsolete (never implemented) cluster design docs.
r1517815 NO-JIRA: Minor corrections to qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
r1511051 NO-JIRA: Remove use of "with" statement to support older versions of Python
r1511028 NO-JIRA: Remove un-necessary #include <boost/pointer_cast.hpp>
r1510988 NO-JIRA: HA remove use of boost_hash, failes to build on some compilers.
r1510678 QPID-4327: HA Handle brokers joining and leaving during a transaction.
r1510645 NO-JIRA: Remove deleted file ha/hash.h from CMakeLists.txt.
r1510597 NO-JIRA: Corrected use of boost_hash, failing to build on some compilers.
r1510596 NO-JIRA: Remove use of boost::make_shared, not availble on some older versions.
r1509861 QPID-4327: HA Fix windows compile errors introduced by recent commits.
r1509428 QPID-4327: HA logging fixes.
r1509424 QPID-4327: HA TX transactions, blocking wait for prepare
r1509423 QPID-4327: HA TX transactions: basic replication.
r1509422 QPID-4327: HA get rid of Primary::get() singleton.
r1509421 QPID-4327: Added TransactionObserver interface.
r1509420 QPID-4327: Renamed ConfigurationObserver as BrokerObserver.
r1509419 QPID-4327: Refactor to simplify TxAccept.
r1509418 QPID-4327: Optimize brokertest.ready() to improve test runtimes.
r1503254 QPID-4987: Fix URL link to Qpid docs.
r1501259 QPID-4944: HA skip test test_failover_send_receive till fixed.
r1500107 QPID-4327: Minor edits to ha-transactions.md
r1499789 QPID-4944: HA Sporadic failure: test_failover_send_receive
r1497883 QPID-4328: HA support for transactions initial design doc.
r1497549 QPID-4961: Fix make distcheck problems with qpidd-p0 script.
r1494606 QPID-4745: Remove spurious --port option in qpidd-p0
r1494306 QPID-4745: Alternative port allocation for tests, instead of 'qpidd --port=0'
r1494290 NO-JIRA: Fix compile errors in Windows build.
r1493873 NO-JIRA: Fix typo "sock.close" in qpid/python/qpid/util.py
r Revert "Re-enable HA test: QPID-4944: HA re-enable test_failover_send_receive"
r Revert "bz 969039: QPID-4944: HA fix failure of test_failover_send_receive on slow machines."
r git merge --squash 0.22-mrg-crolke-win-qpid-proton
r1524506 bz1009493: QPID-5143: don't include transport in default url as it overrides any connection option
r1524505 bz1009422: QPID-5141: always set content object on 0-10 path (unless explicitly asked not to)
r Removed a line from git merge
r1523094 bz 969039: QPID-4944: HA fix failure of test_failover_send_receive on slow machines.
r1522711 Re-enable HA test: QPID-4944: HA re-enable test_failover_send_receive
r git merge --squash 0.22-mrg-crolke-bz995039-winsdk
r1521926 bz1006980: QPID-5131: make 1.0 content available to xml exchange
r1521919 bz1006962: QPID-5130: map type to exchange-type when translating old x-declare clause into node properties
r git merge --squash 0.22-mrg-kgiusti-bz971894
r git merge --squash 0.22-mrg-BZ1003674
r1520417 bz987961: QPID-5114: WinSDK ships qpid-send.exe and qpid-receive.exe in binRelease
r1520066 bz1004474: QPID-5110: don't lose track of correct index even in the face of incorrectly typed properties
r1519739 bz1003509 and bz1003841: NO-JIRA: Remove obsolete qpid-cluster and qpid-cluster-store tools.
r1518955 bz1004002: QPID-5040: fix for string and symbol types on AmqpValue section (also clear message on fetch())
r git merge --squash 0.22-mrg-astitcher-bz949739
r git merge --squash 0.22-mrg-astitcher-bz995039
r Revert "git merge --squash 0.22-mrg-astitcher-bz949739"
r git merge --squash 0.22-mrg-astitcher-bz949739
r Per discussion on Sep. 10, 2013: Revert "Added to 0.22-mrg: Continue to carry deprecated fromString() on MRG 2.x releases"
r git merge --squash 0.22-mrg-BZ1001772
r git merge --squash 0.22-mrg-BZ967734
r git merge --squash 0.22-mrg-BZ981636
r1517498 bz1000587: QPID-5098: better handling of link failures and close
r1515793 BZ999499: QPID-5085: ensure messages released 'behind' a cursor on a priority queue don't get missed
r1514907 bz997919: QPID-5078: ensure listeners are always notified if a message was left on the queue
r1514465 bz999505: QPID-5077: improvement to SASL logic to handle entirely asynchronous dialogue
r Revert "bz962461: QPID-5067: Changed language bindings to use UTF-8 encoding on strings."
r bz996573: squash 0.22-mrg-BZ996573
r1512482 bz962461: QPID-5067: Changed language bindings to use UTF-8 encoding on strings.
r1512346 bz996092: QPID-5062: pass through security details from SSL transport to enable EXTERNAL authentication
r1512283 bz996075: QPID-5053: release exclusive queue ownership when session ends (clear the set _after_ iterating over it!)
r1512245 bz996094: QPID-5060: remove exchange and durable for properties map, as they apply to topic itself rather than queue and are tracked by explicit properties
r1512218 bz996078: QPID-5061: do exclusivity checks before registering link to avoid cancelling a subscription that did not succeed
r1511762 bz996057: QPID-5054: check whether topic actually exists in delete request
r1508523 bz996100: QPID-5026: match source with target and vice-versa
r1511740 bz453533: QPID-5055: initialise some paged queue variables
r1511045 bz453533: QPID-5042: use more portable encode and decode (merged r1511013 from trunk)
r1510696 bz691411: QPID-5041: ensure persistence id is not lost when annotation is added
r1510657 bz990972: QPID-5035: Respect data-dir setting from config file
r1509311 bz977290: QPID-5034: WinSDK README contains stale web site URL
r1505823 bz874516: QPID-5011: C++ Broker ACL allows one connection when user quota is zero Compute limit-check result even for first connection.
r1509016 bz987961: QPID-5017: WinSDK build leaves release executables stranded in bin directory Delete them during install post-processing
r1506068 bz1506068: NO_JIRA Corrected the error message thrown when the message id is not of the correct form.
r1506095 bz915333: NO_JIRA Changed the exception thrown for an invalid destination from a regular JMSException to an InvalidDestinationException. This is patch from Pavel Morevec.
r1492761 bz987535: QPID-4921: check pointer before using it
r1478170 bz985919: QPID-4801: Changed the log message to be of type DEBUG.
r1469466 bz894375: QPID-3689: Fix previous change of command line option handling Now introduced new command line option type that is a pure command line switch which can take no boolean argument.
r1501259 Disable HA test: QPID-4944: HA skip test test_failover_send_receive till fixed.
r1502193 bz983517: QPID-4986: ensure correct handler is called for message-id typed properties
r1502192 bz983514: QPID-4985: ensure calculated buffer size is accurate
r bz981638: Merged from 0.22-mrg-BZ981638
r1497748 bz981640: QPID-4965: check filters on assert
r1497204 Windows build fix: QPID-4955: Don't install SYSV style service control files on Windows (fixes Windows breakage from previous commit)
r1497074 bz981642: QPID-4919: repair r1497036 for windows builds
r1497036 bz981642: QPID-4919: Allow definition of topics in AMQP 1.0, composed of an exchange and subscription queue configuration
r bz977891: Merged from 0.22-mrg-BZ977891
r1469045 bz888501: NO-JIRA: fix sporadic federation test_pull_from_queue_recovery test failures
r1498671 bz916953: QPID-4969: C++ Broker headers exchange allows creation of bindings with duplicate keys Patch from Gordon Sim to correct issues in initial fix. Now successive bind requests are accepted when the key, queue, and exchange are identical if and only if all of the binding args are also identical.
r1497203 bz975046: QPID-4955: Fix to previous commit
r1500085 bz969039: NO-JIRA: HA Changed output directory for ha_tests.py to avoid other testsc overwriting.
r1499789 bz969039: QPID-4944: HA Sporadic failure: test_failover_send_receive
r1499788 bz969039: QPID-4944: HA Sporadic failure - logging improvements used to investigate.
r1498630 bz953662: QPID-4971: Uninitialized variables in QueueSettings
r1497926 bz916953: QPID-4969: Headers exchange allows bindings with duplicate managementId.
r1497749 bz979385: QPID-4966: ensure timeout is honoured while waiting of rmessages
r1497148 bz975046: QPID-4955: CMake install puts config files in the wrong place - Also removed ability to specify daemon and client config file   locations individually as that isn't straightforwardly possible   with the CMake install capability.
r1480656 bz782403: QPID-3838 If stric-jms flag is used qpid.subject is prefixed with "JMS_" to ensure we are in compliance with the JMS spec. Without this fix we fail the JEE TCK.
r1469088 bz768114: QPID-3689: Change tcp nodelay to be the default This change also alters the implementation of simple switch like options when using boost version 1.35 and later. We now allow these switches to also take an optional "=yes" or "=no" (and similar) argument.
r1497024 bz978468: QPID-4950: ensure exchange stats are updated with correct content size for messages
r1496985 bz978379: QPID-4953: recognise temp queue shorthand in 0-10 codepath
r Merged from 0.22-mrg-astitcher-bz975949
r1497282 bz978902: QPID-4957: ensure bindings created on attaching link are deleted alog with the subscription queue
r1497477 HA test issue: QPID-4944: HA skip test test_failover_send_receive till fixed.
r1492778 Resolve test issues: NO-JIRA: restrict broker to listen only on loopback interface (which is all that gets used by clients) in order to avoid port collisions
r1496630 bz976398: QPID-4949: explicitly delete the management agent during the Broker destructor
r1496623 bz959446: NO-JIRA: Corrections for the python API doc; a patch from Ernie Allen
r1496619 bz913415: QPID-4811: Add control over session timeout; a patch from Ernie Allen
r1496467 bz959447: NO-JIRA: fixed two minor typos in doxygen
r1494644 bz975937: QPID-4935: handle case where peer to sender settles without setting a delivery state
r bz970748 - Bring sys/windows/Time.cpp up to sys/posix/Time.cpp
r bz970748 - fix windows compile issue
r bz970748 Add exports for windows TODO: file sys/windows/Time.cpp needs attention before it has parity with posix version
r1495466 bz969039: QPID-4944: HA Sporadic failure in ha_tests: tes_failover_send_receive and test_expected_backup_timeout
r bz970748: merged from 0.22-mrg-aconway-bz970748-2
r bz(s): 975422, 975423, 975430, 975434, 975444, 975446, 975451, 975460, 975463 (AMQP 1.0 enhancements)
r BZ 975088 0.22-4 windows build fails - Relocate moved files * QPID-4733 skipped processing a file for non-Unix platforms * bld-winsdk.ps1 adjusted for LICENSE and NOTICE files moved in distro
r NO-BZ: touch up for windows build
r Added to 0.22-mrg: Continue to carry deprecated fromString() on MRG 2.x releases
r Change shared lib versions for product MRG
r1484391 bz969049: NO-JIRA: remove unnecessary includes from test script
r1487960 bz969049: QPID-4893: prevent uninitialised buffered messages being transfered
r bz691411: Backporting patch for bz691411 to 0.22-mrg. Add ability to set and retrieve message sequence in queue annotation
r BZ963243: Fixes for QPID-4706 (apply selectors with source is an exchange, r1480239) and QPID 4716 (set durability of subscription queue, r1465047). Also fixes previous merge errors.
r1481021 bz928935: QPID-4826: Patch Perl bindings memory leak
r1478311 bz872111: QPID-4806: Suppress traceback when access denied; a patch from Ernie Allen
r1478309 bz823489: QPID-4805: Don't override qpidd.conf defined values for journal files; a patch from Ernie Allen
r1471120 bz710429 and bz915774: QPID-4771: Add --broker and --sasl-mechanism command line options to qpid-tool; this is a patch from Ernie Allen
r1468683 bz895515: QPID-4744: add option for separate SSL keyfile to qpid-tool
r1483079 bz828442: QPID-4849 The previous code was assuming that "CN" was the first entry in the name string. Changed the code to first find "CN" and then extract from there. testMultipleCertsInSingleStore verifies this change.
r1486327 bz957871: QPID-4650: C++ Broker method to redirect messages between two queues. (4 of 4) Self test on RHEL 6 hangs frequently. Fall out of test and leave a dangling session. This appears to avoid the hang. Cherry pick r1486327, cdaa2b9
r1486089 bz957871: QPID-4650: C++ Broker method to redirect messages between two queues. (3 of 4) Previous commit had file content for these two files twice. Cherry pick r1486089, 0592eb5
r1486081 bz957871: QPID-4650: C++ Broker method to redirect messages between two queues. (2 of 4) Commit new files. Cherry pick r1486081, 782917c
r bz957871: QPID-4650: C++ Broker method to redirect messages between two queues. (1 of 4) Cherry pick from trunk r1485836, 82779c7
r1485331 bz950501: QPID-4872: when retrying ssl reads or writes, use previous arguments
r1478313 bz908224: QPID-4774: Honor reconnect_timeout in Connection; a patch from Ernie Allen
r1471158 bz574571: QPID-2453: Allow the session to keep operating after content codec errors; a patch from Ernie Allen
r1471146 bz696919: QPID-4772: Assume text/plain for content type if no other indication is given; a patch from Ernie Allen
r1471150 bz772028: QPID-4140: Use the session.acked list to determine the number of unsettled messages; a patch from Ernie Allen
r1469345 bz719589: QPID-4750: Fix unhandled exception; patch from Ernie Allen
r1483771 bz964168: QPID-4857: Fixed passing Perl Message to C++ code
r1482598 bz962461: QPID-4843: Fixed the Perl spout.pl example.
r1482597 bz962461: QPID-4842: Ruby spout.rb calls wrong API to set message properties.
r1478471 bz846671: QPID-4792: convert between UUIDs and GUIDs as needed for Microsoft APIs
r1465113 bz715284: QPID-4721: .NET Binding WinSdk does not build hello_world and hello_xml Add the files to the CMakeLists.txt file.
r1477112 bz962311: QPID-4631: C++ Broker federated links are protected by ACL policy. This issue evolved a bit between the original discussion and the final commit. See https://reviews.apache.org/r/10658/ for the details.
r1486666 bz960049: NO-JIRA: match the frequency of rate failure warnings to stats report frequency
r1486625 bz969049: QPID-4890: added workaround to test to handle issues with closing stdin of subprocesses under older python interpreters
r1486115 bz963243: QPID-4888: correct handling of link naming
r1486113 bz964224: QPID-4884: prevent segfault when translating x-declare into 1.0 node properties
r1485759 bz970748: NO-JIRA: HA Add missing FailoverExchange.h/cpp to distribution rules.
r1485510 bz970748: NO-JIRA: Added missing const qualifiers to Buffer get functions.
r1482795 bz963245: QPID-4846: prevent assertion when translating empty 0-10 message content into 1.0
r1471442 bz 862899 QPID-4758: Extend the qpidd --wait option to work at shutdown Patch from Ernie Allen and Pavel Moravec. Note: This patch is for the posix platform broker; The windows broker does not use a --wait option and is unaffected by this patch.
r1480927 bz959452: QPID-4825: Add SOVERSION link to shared libraries
r1480327 bz961014: QPID-4820: fix incorrect AMQP 0-10 typecodes
r1479855 bz959447: QPID-4808: Augmented documentation of connection options and added description of the 'protocol' option
r1478510 bz782070: QPID-4810: No TCP if SSL initialisation fails and TCP/SSL mux enabled
r1478418 bz955674: QPID-4775: C++ Broker add ACL property checks for delete queue and exchange. 0-18-based patch from Pavel Moravec was adjusted for trunk. Removed size properties from list of queue deletion check parameters.
r1478398 bz588504: QPID-4807: Add new broker option to disable listening on specific transport type
r1478133 bz825075: QPID-4801: Show error when config file cannot be read.
r1478115 bz970748: NO-JIRA: Trivial python client fix, pass timeout in Sender.send.
r1478023 bz958444: QPID-4796 - Fixed intermittent test failure in stats test.
r1477975 bz955578: QPID-4786: Only have one thread processing session queue at a time
r1477907 bz901590: QPID-4767 [legacystore] QMF commands to create a persistent queue with an illegal number of journal files or journal file size should be rejected, QPID-4794 Resizing qpid legacystore journal does not update queue arguments provided by QMF
r1467053 bz970748: QPID-4738: Add "qpid-ha status --all" option.
r1464930 bz928951: QPID-4701: Turn off visibility=hidden for gcc 4.2.1 due to problems with messaging exceptions
r1477784 Bz453533: QPID-4339: some more export symbol directives needed for unit_test compilation on windows
r1477771 Bz453533: QPID-4339: add export symbol directives
r1477698 Bz453533: QPID-4339: fix for older compilers/c++ libraries
r1477366 Bz453533: QPID-4339: fix for windows build
r1477236 Bz453533: QPID-4339: simple paged queue implementation
r1476409 Bz797092: QPID-4651: C++ Broker add --log-disable option Reviewed at https://reviews.apache.org/r/10799/
r1476305 Bz889552: QPID-4780: Bug 889552 - HA broker deadlock after loss of primary broker.
r1475803 Bz796765: QPID-3828: When sending large messages loss of connection is not detected even with heartbeats enabled [Patch from gordon Sim]
r1475723 Bz703891: QPID-4764: tweaks to locking in receiver and session to avoid deadlock
r1470667 Bz739863: QPID-4765: "Incorrect parameter validation for legacystore wcache-page-size and jfile-size-pgs"
r1470104 Bz906814: QPID-4759 : make --help output show default value for --sasl-config
r1470065 Bz733758: QPID-4757: C++ Broker report sasldb failures more clearly when problem may be a permission issue.
r1469054 Bz 865689: QPID-4736: Demote journal log messages from warn to info when message arises from journal configuration choice.
r1467107 Bz 949014: QPID-4728: add 'credit' parameter to Federation Bridge configuration.
r1466652 Bz 953662: QPID-4735: ACL file size/count upper limit checks incorrect
r1465719 Bz 808105: QPID-4727:C++ Broker ACL keyword to reference default exchange.

-> CLOSED.  Task completed.

Copied branch aconway-bz1011640 to 0.22-mrg-aconway-bz1011640 to respect naming conventions.