summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge from trunkQPID-6262-JavaBrokerNIOKeith Wall2015-03-129-53/+91
|\ | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666219 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6436: Address review comments and fix issues caused by ACL refactoringAlex Rudyy2015-03-129-34/+91
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666212 13f79535-47bb-0310-9956-ffa450edef68
* | Merge from trunkKeith Wall2015-03-121-0/+3
|\ \ | |/ | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666206 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6446: Temporary disable the test until root issue is resolvedAlex Rudyy2015-03-121-0/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666159 13f79535-47bb-0310-9956-ffa450edef68
* | Merge from trunkKeith Wall2015-03-1212-353/+58
|\ \ | |/ | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666204 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6444: remove unused functionsGordon Sim2015-03-112-17/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665954 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6440: [Java Broker] Web UI, correct problem that causes checkbox values ↵Keith Wall2015-03-101-1/+6
| | | | | | | | | | | | to be corrupted in edit dialogues git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665735 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6438: [Java Broker] Add support for POST method into REST interfaces in ↵Alex Rudyy2015-03-1024-310/+274
| | | | | | | | | | | | order to create configured objects via POST git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665732 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6436: Allow user to update its own preferences without explicit permissionsAlex Rudyy2015-03-101-0/+7
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665731 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6439 : [Java Broker] config upgrader should upgrade key/trust stores ↵Robert Godfrey2015-03-101-0/+5
| | | | | | | | | | | | using the (omitted) default type git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665702 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6359: Remove the release script we no longer useJustin Ross2015-03-101-319/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665626 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6436: [Java Broker] Move ACL functionality scattered over the ↵Alex Rudyy2015-03-1044-1081/+1274
| | | | | | | | | | | | configured objects into SecurityManager and AbstractConfiguredObjects git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1665410 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6437 : ensure session/link flow notifies occurRobert Godfrey2015-03-072-34/+32
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664839 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6347 : ensure link enpoints are notified outside of holding the ↵Robert Godfrey2015-03-062-38/+66
| | | | | | | | | | | | connection lock git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664731 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6437 : ensure no locks are held when link endpoint listeners are notifiedRobert Godfrey2015-03-061-2/+7
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664714 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6434: [Java Client Docs] Correct a couple typos and simplify detail.Keith Wall2015-03-061-18/+14
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664663 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6428: Remove now redundant changeAttributes overrideKeith Wall2015-03-062-6/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664662 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6434: [Java Client] Update existing JMS client documentation for AMQP ↵Alex Rudyy2015-03-061-0/+27
| | | | | | | | | | | | 0.8/0.9.x to cover the effect of setting maxprefetch to 0 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664592 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6427: Problem building trunk qpid cpp on RHEL 5aconway2015-03-054-6/+6
| | | | | | | | | | | | Fixed a couple of legitimate compiler warnings, worked around a couple of compiler weaknesses. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664517 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6427: Fixed unit test build problem on RHEL 5.aconway2015-03-051-3/+7
| | | | | | | | | | | | RHEL5 compiler choked on some boost template magic, simplified the test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664479 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6433 : notify link listener flow state changed for link specific flowRobert Godfrey2015-03-052-5/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664334 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6397: [C++ broker] segfault when processing QMF method during periodic ↵Pavel Moravec2015-03-051-1/+3
| | | | | | | | | | | | processing git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664313 13f79535-47bb-0310-9956-ffa450edef68
| * add missing licence headerRobert Gemmell2015-03-051-0/+20
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664309 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6433 : notify link listeners of flow state change outside of the ↵Robert Godfrey2015-03-041-5/+7
| | | | | | | | | | | | connection endpoint lock git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664160 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-4710: adjust version checking used by new tx interop tests so as not to ↵Gordon Sim2015-03-041-3/+16
| | | | | | | | | | | | fail existing tests when either ptoron python lib is not on path or is 0.7 or earlier git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664144 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6432: when looking for the JMSType value use the message Subject first ↵Robert Gemmell2015-03-041-0/+6
| | | | | | | | | | | | if present git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664114 13f79535-47bb-0310-9956-ffa450edef68
| * Fix possible double-free discussed in QPID-6368Stephen D. Huston2015-03-031-4/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663828 13f79535-47bb-0310-9956-ffa450edef68
* | Merge from trunkKeith Wall2015-03-1281-1435/+1766
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666200 13f79535-47bb-0310-9956-ffa450edef68
* | Fix failing unit testKeith Wall2015-03-111-0/+4
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665936 13f79535-47bb-0310-9956-ffa450edef68
* | Bug fix: Delay shutting download the Port's executor until the port has no ↵Keith Wall2015-03-112-3/+27
| | | | | | | | | | | | remaining connections git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665911 13f79535-47bb-0310-9956-ffa450edef68
* | Refactor use of futuresRobert Godfrey2015-03-105-251/+384
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665614 13f79535-47bb-0310-9956-ffa450edef68
* | Fix exception handlingRobert Godfrey2015-03-101-1/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665463 13f79535-47bb-0310-9956-ffa450edef68
* | Add sync/async varients to most ACO methodsKeith Wall2015-03-0959-406/+1494
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1665306 13f79535-47bb-0310-9956-ffa450edef68
* | rewrite closeRobert Godfrey2015-03-0514-101/+169
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1664366 13f79535-47bb-0310-9956-ffa450edef68
* | merge from trunkKeith Wall2015-03-030-0/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663733 13f79535-47bb-0310-9956-ffa450edef68
* | Bug fix: Prevent NPE possibility if closing an object takes too long.Keith Wall2015-03-032-3/+4
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663731 13f79535-47bb-0310-9956-ffa450edef68
* | merge from trunkKeith Wall2015-03-0362-565/+2059
|\ \ | |/ | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663719 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6428 : [Java Broker] Use StoreConfigurationChangeListener to manage ↵Robert Godfrey2015-03-039-145/+145
| | | | | | | | | | | | storage of all configured objects git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663573 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6425 : [Java Broker] Allow for local and global name equivalence on ↵Robert Godfrey2015-03-027-4/+152
| | | | | | | | | | | | virtual hosts git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663189 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6424 : Implement Connection.Redirect in 0-8/9/9-1Robert Godfrey2015-03-0130-106/+1139
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663170 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6423 : [Java Broker] Allow plugin of custom user queue reports using ↵Robert Godfrey2015-03-0112-0/+1217
| | | | | | | | | | | | the REST API git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663082 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6405: Dont't use a Python Conditional Expression to maintain ↵Keith Wall2015-03-011-1/+2
| | | | | | | | | | | | compatibility with Python 2.4 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663039 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6421: fix typo in README, testing GitHub integrationRobert Gemmell2015-02-271-1/+1
| | | | | | | | | | | | This closes #5 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662778 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-4710: [AMQP 1.0] Support for transactions in qpid::messaging C++ client.Alan Conway2015-02-2746-448/+1712
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the "transactional retire and settle immediately" option for transactions as specified in AMQP 1.0 in the qpid::messaging C++ client. NOTE: Transactions over AMQP 1.0 require proton 0.9 or greater. With older versions, attempting a transactions over AMQP 1.0 will raise a link-detached exception "Node not found: tx-transaction" 1. Added descriptor list to Variant with support in Encoder and PnData. Required to support transactions, need to be able to create described lists. Variant changes are source and binary compatible. A Variant now has a Variant::List of descripors which can be numeric or string. Nested descriptors are implemented by putting multiple descriptors in the list. Other minor changes: - Variant refactor: don't delete impl on every assignment. - Add Variant constructors that take a string encoding. (new constructors, not defaulted arguments, so the change is binary and source compatible.) - Growable buffer support for Encoder. - Printing described Variant prints descriptors in form @descriptor value 2. Added transaction support to AMQP 1.0 client code Added messaging/amqp/Transaction.h,cpp: transaction logic - communicate with coordinator, send declare/dischange messages. - add tx state info to transfers and acknowledgements. - Sync session after discharge. - A transactional session automatically acks any message retrieved by fetch/get to bring them into the transaction. This is consistent the 0-10 client. Minor fixes to existing client code: - Fix use of pn_drain API in C++ client to work with C++ and Java brokers. - Make amqp::Exception derive from qpid::Exception 3. Fixes to existing broker code: - Incoming.cpp fix: start async completion before processing message. - Delay accept of dischage message till commit is complete. - newSession - handle failover during session creation. 4. Added tests interop_tests.py: transaction tests that can run against an external broker, see comments. ha_tests.py: Enable transaction tests over AMQP 1.0. Minor test fixes: - brokertest.py don't set default logging if QPID_LOG env vars set. - brokertest.py Pass kwargs to broker() create function. - qpid-receive: capacity should never be larger than message count. - Accept user:pass as well as user/pass in Url. - brokertest.py: Always do a ready() check on all brokers. If proton < 0.9 is used, transaction tests will be skipped or will downgrade to the amqp0-10 protocol with a printed warning. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662743 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6419 : [Java Broker] Queue counts can become corrupt in case of rapid ↵Robert Godfrey2015-02-277-7/+28
| | | | | | | | | | | | acknowledgement git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662683 13f79535-47bb-0310-9956-ffa450edef68
| * NO-JIRA: Avoid outputting the build type more than onceAndrew Stitcher2015-02-261-2/+1
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662597 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6415: Core dump in ha_tests and interlink_tests with proton 0.9 (test fix)Alan Conway2015-02-261-0/+1
| | | | | | | | | | | | Minor test fix to avoid core dumps git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662583 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6415: Core dump in ha_tests and interlink_tests with proton 0.9 (missed)Alan Conway2015-02-262-2/+2
| | | | | | | | | | | | | | | | With proton 0.9 you need call pn_connectin_free before pn_transport_free. Missed 2 cases in the previous commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662526 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6415: Core dump in ha_tests and interlink_tests with proton 0.9Alan Conway2015-02-261-1/+1
| | | | | | | | | | | | With proton 0.9 you need call pn_connectin_free before pn_transport_free. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662509 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-6418 : [Java Broker] Fix testRobert Godfrey2015-02-261-1/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1662489 13f79535-47bb-0310-9956-ffa450edef68