summaryrefslogtreecommitdiff
path: root/java/broker/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* Update from trunk r1375509 through r1450773asyncstoreKim van der Riet2013-02-28279-19168/+10539
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated code to include recent refactoring by Gordon (gsim) - see ↵Kim van der Riet2012-08-272-52/+60
| | | | | | QPID-4178. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1377715 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated branch - merged from trunk r.1368650Kim van der Riet2012-08-03211-7573/+12647
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3858: Updated branch - merged from trunk r.1333987Kim van der Riet2012-05-04158-2316/+10875
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3855: only increment activeConsumerCount during registration if the ↵Robert Gemmell2012-02-191-2/+5
| | | | | | subscription is active. Add unit test to identify the issue and check behaviour following various state change notifications. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1291026 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: stop catching Throwable, we generally shouldnt continue when faced ↵Robert Gemmell2012-02-171-1/+1
| | | | | | with Errors git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1245419 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3850: add switch into default uncaught exception handler to prevent the ↵Robert Gemmell2012-02-171-3/+7
| | | | | | | | broker from exiting if necessary Applied patch from Oleksandr Rudyy <orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1245418 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3844: allow queryMBeans to succeed without ACL checking, tools like ↵Robert Gemmell2012-02-161-3/+4
| | | | | | | | JConsole / Qpid MC need this to function at all Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244946 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3843: ensure ACL rule evaluation for the ALL operation accounts for the ↵Robert Gemmell2012-02-161-2/+2
| | | | | | | | object type and properties. Fix length used for property wildcarding checks. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244934 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3848: relax the enforcement of exchange type checking during passive ↵Robert Gemmell2012-02-152-2/+2
| | | | | | | | | exchange-declares to allow empty/null values Applied patch by Gordon Sim git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244771 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3840: added automated tests for the Java Broker's qpid-passwd script ↵Keith Wall2012-02-151-29/+19
| | | | | | | | and Passwd class Applied patch from Andrew MacBean <andymacbean@gmail.com> and Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244406 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3842: Java Broker should report platform and memory size on startupKeith Wall2012-02-142-3/+29
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1244276 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3837: Update message to use the string name of the type. Told you i ↵Robert Gemmell2012-02-141-2/+2
| | | | | | should have tested it first :P git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1243858 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3837: align the 0-10 exception message for an exchange redeclare ↵Robert Gemmell2012-02-131-2/+2
| | | | | | | | | attempt with the equivalent 0-9-1 message for clarity and consistency I should test this first, but it is just a string so...<rolls dice> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1243709 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3829: use a seperate object for reference checking to stop the ↵Robert Gemmell2012-02-135-31/+18
| | | | | | | | | AMQMessage holding its underlying 0-8/0-9/0-9-1 connection/io objects in memory after they are closed. Also stops an NPE on the 0-8/0-9/0-9-1 subscriptions when evaluating no-local after store recovery. Enables NoLocalAfterRecoveryTest again, though updated to make it simpler and more reliable. This test should be removed if changes for QPID-3605 are undertaken. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1243379 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3824 - Additional queue statistics, posix memory statistics, and ↵Ted Ross2012-02-091-0/+288
| | | | | | broker-scope statistics git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1242526 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3823: ServerSession unblock(AMQQueue) can cause NPE when trying to ↵Keith Wall2012-02-094-67/+85
| | | | | | | | remove a queue from _blockingQueues Map that is not present Applied patch from Andrew MacBean <andymacbean@gmail.com> and Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1242408 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3821: Uncaught exception thrown in QueueRunner.run() could cause ↵Keith Wall2012-02-092-21/+30
| | | | | | QueueRunner to remain stuck in RUNNING state permanently git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1242339 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3809: Java Broker killed by java.net.SocketException: Broken pipe ↵Keith Wall2012-02-071-6/+18
| | | | | | | | (killed by uncaught exception handler) Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1241433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3816: add client version to connection open loggingRobert Gemmell2012-02-064-9/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1241257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3756: Reorder Java Broker's connection close process so that ↵Keith Wall2012-02-061-4/+9
| | | | | | | | | ConnectionCloseOk is sent only after first updating its internal state. This change means that the connection mbean will be deregistered from JMX before sending ConnectionCloseOk, thus removing the possibility of the race condition. The client side process is unaffected by this change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1241024 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3815: remove duplicate setting of the NetworkConnection, this was ↵Robert Gemmell2012-02-061-1/+0
| | | | | | already done via the delegate ProtocolEngines constructor git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240868 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove factory method only used by testRobert Gemmell2012-02-061-6/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240866 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3814: ensure the 0-10 client sends its version number during ↵Robert Gemmell2012-02-059-73/+48
| | | | | | ConnectionStart(Ok) process, align properties better across protocol versions, general tidy up of the property handling git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240813 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3812: ExceptionListenerTest sporadically fails on java-mms-0.10Keith Wall2012-02-051-5/+9
| | | | | | Remove possibility of race condition by updating Broker state *before* sending the connection reply. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240708 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3813: allow configuring the default version reply to an unsupported ↵Robert Gemmell2012-02-044-23/+74
| | | | | | protocol version initiation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240644 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3805: Remove allow-all/deny-all security plugins from Java Broker.Keith Wall2012-02-024-206/+5
| | | | | | Remove allow-all/deny-all security plugins as equivilent functionality is offerred by the ACL plugin. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239889 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3802: Broker command line processing --help (-h) and --version (-v) no ↵Keith Wall2012-02-022-52/+77
| | | | | | | | longer work Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239759 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3801 : [Java] Move JMS Selector code into commonRobert Godfrey2012-02-0215-2223/+104
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3800: add the ability to disable particular protocol versions ↵Robert Gemmell2012-02-023-13/+44
| | | | | | broker-wide to save having to exclude them from individual ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239579 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : Fix AbstractPasswordFilePrincipalDatabase to remove possibility ↵Robert Godfrey2012-02-021-6/+13
| | | | | | of leaked open stream git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java Broker] Remove duplication between two password file ↵Robert Godfrey2012-02-016-902/+585
| | | | | | database implementations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : guard against the possibility that the HWM is older than the ↵Robert Godfrey2012-02-011-1/+1
| | | | | | queue head git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : guard against the possibility that the HWM is older than the ↵Robert Godfrey2012-02-011-0/+8
| | | | | | queue head git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1239094 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of BytesDataOutput inner class, and ↵Robert Godfrey2012-01-311-155/+1
| | | | | | shared code in SessionAdapt[eo]rs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1238868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of output converters and optimise ↵Robert Godfrey2012-01-307-912/+58
| | | | | | startup time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237772 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-3010-472/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-305-783/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-292-4/+16
| | | | | | | | | | | | | | | qpid.ssl.trustStoreCertType have misleading names and would be better called qpid.ssl.[Key|Trust]ManagerFactory.algorithm * Introduced two properties qpid.ssl.KeyManagerFactory.algorithm and qpid.ssl.TrustManagerFactory.algorithm to allow a client user to override the algorithm name used when Qpid client constructs a KeyManager or TrustManager. * Continued to support qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType (now marked as deprecated) * Introduced a new Java Broker configuration key connector/ssl/keyManagerFactoryAlgorithm * Continued to support broker configuration key connector/ssl/certType (now marked as deprecated and will issue warning if used). * Changed the default from hardcoded 'SunX509' to the value(s) returned by KeyManagerFactory#getDefaultAlgorithm() and TrustManagerFactory#getDefaultAlgorithm(). This allows the Java Broker and Client to be used out of the box on non-Sun JDKs without having to set qpid.ssl.KeyManagerFactory.algorithm or qpid.ssl.TrustManagerFactory.algorithm. * Updated client docbook documentation. Tested both Java Broker and Client on IBM JDK and ensured all 0-10 and 0-9-1 profiles pass (including SSLTest which was failing prior to this change). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237504 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] code tidyupsRobert Godfrey2012-01-2972-732/+300
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-281-14/+2
| | | | | | | | | | retired impls) from the Java Broker's config.xml * Remove remaining references to MINA transport configuration keys: enableDirectBuffers/enablePooledAllocator/filterchain from code and example config files. * Remove references to compressBufferOnQueue from config XMLs. The implementation that used it was removed back in 2007 by QPID-275. * Remove references to broker-side configuration key enableJMSXUserID. This broker feature was removed by QPID-943 (which replaced the functionality with an equivilent client-side option). The old Broker side key plays no part in the client-side function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1237088 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-2749-204/+486
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle ↵Robert Godfrey2012-01-278-7/+41
| | | | | | happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236647 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-27287-1184/+1281
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3559: AMQQueueMBean: Switched timestamp formatting to static ↵Keith Wall2012-01-261-18/+11
| | | | | | | | FastDateFormat instance to avoid the need for synchronisation or the generation of lots of SDF and Date instance garbage. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236397 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946, QPID-2379 : code review - move statements inside try blockRobert Godfrey2012-01-261-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236332 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : [Java Broker] reduce scavenge overhead on large queuesRobert Godfrey2012-01-251-18/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1235771 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeues ↵Robert Godfrey2012-01-2119-37/+144
| | | | | | (0-9 codepath) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1234215 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeuesRobert Godfrey2012-01-206-41/+484
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1234111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3756: ManagedConnectionMBeanTest.testChannels occasionally fails on ↵Keith Wall2012-01-181-19/+31
| | | | | | | | | | | 0-10 spawned profiles This problem is caused by the connection mbean being deregistered too late (as the TCP/IP socket) is closed, thus creating a race between the client using JMX to observe connection state, and the unregistering of the bean. This patch changes the 0-10 code path to unregister the bean on receipt of ConnectionClose and before ConnectionCloseOkay is sent to the client. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1232785 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status