summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes from trunk0.32.xRobert Godfrey2015-05-061-2/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677960 13f79535-47bb-0310-9956-ffa450edef68
* Merge changes from trunkRobert Godfrey2015-05-062-7/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677957 13f79535-47bb-0310-9956-ffa450edef68
* update version numbers on 0.32.x branchRobert Godfrey2015-05-0660-64/+64
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677955 13f79535-47bb-0310-9956-ffa450edef68
* Make a branch for 0.32.x primarily in case we wish to perform maintenance ↵Robert Godfrey2015-05-060-0/+0
| | | | | | releases of the old JMS AMQP 1.0 client git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32.x@1677954 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6440: [Java Broker] Web UI, correct problem that causes checkbox ↵0.32Keith Wall2015-03-111-1/+6
| | | | | | | | | | | | values to be corrupted in edit dialogues Merged from trunk with command svn merge -c 1665735 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1666029 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/branches/0.32@1666002 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6439 : Merge r1665702 to 0.32 branchRobert Godfrey2015-03-111-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1665878 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6359: Lock in release versions for java qmf toolsJustin Ross2015-03-106-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1665499 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6359: Lock in 0.32 release version numbersJustin Ross2015-03-1041-42/+42
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1665475 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6437 : merged r1664714,1664731,1664839 from trunk to 0.32 branchRobert Godfrey2015-03-093-22/+53
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1665326 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6432: when looking for the JMSType value use the message Subject first ↵Robert Gemmell2015-03-061-0/+6
| | | | | | | | | if present merge from trunk r1664114 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1664568 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6433 : merged from trunk to the 0.32 branchrgodfrey2015-03-052-10/+16
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1664485 13f79535-47bb-0310-9956-ffa450edef68
* add missing licence headerRobert Gemmell2015-03-051-0/+20
| | | | | | | merge from trunk r1664309 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1664311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6419 : Merged 1662683 onto 0.32 branchRobert Godfrey2015-02-277-7/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662688 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6418 : Merged 1662473,1662489 onto 0.32 branchRobert Godfrey2015-02-2712-14/+37
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662687 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/branches/0.32@1662582 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/branches/0.32@1662581 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/branches/0.32@1662580 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6414: Skip HA tests if qpid-ha or qpid-config tools are not available.Alan Conway2015-02-263-14/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662579 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6413: Sporadic failure of HA tests causd by maxNegotiateTimeoutAlan Conway2015-02-262-15/+18
| | | | | | | | | | | | | | | | | | | | Increased maxNegotiateTimeout to the default (10 seconds). A smaller value speeds up detection of non-running brokers on remote hosts, but this is not necessary for the tests. Increased some other test timeouts and added some improved error reporting. The occasional long (> 1 second) connection delays are caused by Cyrus SASL authentication. Not clear why this takes so long, but that is a separate issue. Here's a client log excerpt showing the delay. 2015-02-25 08:29:37.461299895 [Network] trace RECV [[127.0.0.1:34247-127.0.0.1:45983]]: Frame[BEbe; channel=0; {ConnectionStartBody: server-properties={qpid.federation_tag:V2:36:str16(77800bff-a176-46c1-917a-32f136dee650)}; mechanisms=str16{V2:9:str16(ANONYMOUS), V2:5:str16(PLAIN)}; locales=str16{V2:5:str16(en_US)}; }] 2015-02-25 08:29:37.463116303 [Security] debug CyrusSasl::start(ANONYMOUS PLAIN) (Note delay > 1 sec here) 2015-02-25 08:29:38.839793753 [Security] debug min_ssf: 0, max_ssf: 256 2015-02-25 08:29:38.839851781 [Security] debug CyrusSasl::start(ANONYMOUS PLAIN): selected ANONYMOUS response: 'anonymous@wallace' 2015-02-25 08:29:38.839963162 [Client] warning Connection [127.0.0.1:34247-127.0.0.1:45983] closed git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662578 13f79535-47bb-0310-9956-ffa450edef68
* Somehow did not include these in commit r1662027 for QPID-6312Stephen D. Huston2015-02-252-59/+56
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662294 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6411: [AMQP 1.0 JMS Client ] NPE during session#unsubscribe is link is ↵Keith Wall2015-02-251-8/+28
| | | | | | | | | | refused but detach contains no error condition svn merge -c 1662051 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662184 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6408: [Java Broker] Expose the AMQP connection limits through the web ↵Keith Wall2015-02-256-38/+95
| | | | | | | | | | | | management UI Merged with command: svn merge -c 1661741 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662181 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6410: [Java Broker] Disambiguate the connection adapter name by adding ↵Keith Wall2015-02-255-11/+29
| | | | | | | | | | | | | a connection ID to the name Merged from trunk with command. svn merge -c 1661929 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662180 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1661450 changes (size_t detect) into 0.32 as approved in QPID-6312Stephen D. Huston2015-02-243-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662027 13f79535-47bb-0310-9956-ffa450edef68
* Merge SystemInfo.cpp to 0.32 - QPID-6312Stephen D. Huston2015-02-241-0/+201
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6407: Edit dialogue for BDB HA does not faithfully populate attributes ↵Keith Wall2015-02-2414-60/+35
| | | | | | | | | | | | node priority or required number of nodes Merged from trunk with command: svn merge -c 1661693 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661946 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6406: [Java Broker] ACO generates attribute set events even if the ↵Keith Wall2015-02-242-2/+87
| | | | | | | | | | | | attribute value is not changed Merged from trunk with command: svn merge -c 1661531 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661944 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6346: [Java Broker] Fix field reference when file reader is unsupportedKeith Wall2015-02-241-1/+1
| | | | | | | | | | Merged from trunk with command: svn merge -c 1661207 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6398: [Java Broker] Update web management console UI to invoke dojo ↵Keith Wall2015-02-2468-214/+424
| | | | | | | | | | parser.parse as a promise due to changes in dojo 1.8 causing the parser to run in asynchronous fashion in some cases svn merge -c 1661166 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661935 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6364: [Java Broker] Keystore data url must be a secure attributeKeith Wall2015-02-244-5/+20
| | | | | | | | | | Merged from trunk with command: svn merge -c 1661165 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661933 13f79535-47bb-0310-9956-ffa450edef68
* QPID-6247: Updates to configuration files should maintain existing file ↵Keith Wall2015-02-2412-208/+454
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | permissions Merged from trunk with commands: svn merge -c 1661162 https://svn.apache.org/repos/asf/qpid/trunk svn merge -c 1661530 https://svn.apache.org/repos/asf/qpid/trunk git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1661931 13f79535-47bb-0310-9956-ffa450edef68
| * delete troublesome mergeinfojava-network-refactorAidan Skinner2009-10-140-0/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@825317 13f79535-47bb-0310-9956-ffa450edef68
| * Merge from trunkAidan Skinner2009-10-1427-112/+568
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@825292 13f79535-47bb-0310-9956-ffa450edef68
| * Merge from trunkAidan Skinner2009-10-11327-5807/+13050
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68
| * Fix bind error messageAidan Skinner2009-09-181-2/+2
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816614 13f79535-47bb-0310-9956-ffa450edef68
| * MINANetworkDriverTest: Make sure we sleep for at least the alloted time.Aidan Skinner2009-09-181-16/+20
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816613 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2104 AMQProtocolHandler: hand the actual write off to a seperate threadAidan Skinner2009-09-181-2/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816612 13f79535-47bb-0310-9956-ffa450edef68
| * Merge from trunkAidan Skinner2009-09-17198-2945/+4998
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816261 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2024 QPID-2105: Remove now unnecessary classes like Event, PoolingFilter, Aidan Skinner2009-09-1711-1003/+113
| | | | | | | | | | | | | | | | | | ReadWriteThreadModel. Move the couple of necessary methods to Job. Fix imports. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@816232 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2015: Remove AMQIoTransportProtocolSession. Release the executor ↵Aidan Skinner2009-09-164-150/+2
| | | | | | | | | | | | service in the same class as it's acquired git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815729 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2105: Merging the patch didn't uncomment this test, stoopid git. Aidan Skinner2009-09-161-3/+3
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815708 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2106: Don't close connections if the broker has asked it to close andAidan Skinner2009-09-164-12/+40
| | | | | | | | | | | | | | | | | | there's still stuff to process. Let the cleanup thread do that so that publishes which are denied don't result in instant connection death. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815705 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2105: Make NetworkDriver.open use a SSLContextFactory, not an SSLEngine.Aidan Skinner2009-09-1624-487/+479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow an existing SocketConnector to be passed into a MINANetworkDriver, for use with the ExistingSocket bit of TransportConnection. Move the ExistingSocket stuff to one place, use MINANetworkDriver in TransportConnection and make AMQProtocolHandler implement ProtocolEngine. Remove MINA specific gubbins from AMQProtocolHandler and AMQProtocolSession. Move fireAsynchEvent to Job Add getLocalAddress to AMQProtocolEngine Move TestNetworkDriver to common Use correct class for logger in AMQProtocolEngine Check the exception is thrown properly in SimpleACLTest, make it a little less prone to obscure race conditions. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@815704 13f79535-47bb-0310-9956-ffa450edef68
| * Merge from trunk Aidan Skinner2009-09-09305-2023/+25729
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@812936 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2025: Log errors instead of printStackTracing()Aidan Skinner2009-09-042-3/+9
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@811326 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2025: remove dead classesAidan Skinner2009-09-032-342/+0
| | | | | | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@810953 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2025: Add a AMQProtocolEngine from the de-MINAfied ↵Aidan Skinner2009-09-0136-822/+1069
| | | | | | | | | | | | AMQMinaProtocolSession. Remove various now-unused classes and update references. Add tests for AMQDecoder. Net -1500 lines, +25% performance on transient messaging. Nice. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@810110 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2024: Change send to stash the future and have flush join on that so ↵Aidan Skinner2009-08-192-4/+16
| | | | | | | | | | | | | | | | | | | | that it only returns when all data has been written. Add getLocalAddress. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805809 13f79535-47bb-0310-9956-ffa450edef68
| * QPID-2024: Add ProtocolEngine and NetworkDriver interfaces and a ↵Aidan Skinner2009-08-1810-22/+1124
| | | | | | | | | | | | NetworkDriver implementation that uses MINA. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@805477 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status