summaryrefslogtreecommitdiff
path: root/qpid/java/broker
Commit message (Collapse)AuthorAgeFilesLines
...
* QPID-3801 : [Java] Move JMS Selector code into commonRobert Godfrey2012-02-0218-2855/+117
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3800: add the ability to disable particular protocol versions ↵Robert Gemmell2012-02-024-13/+96
| | | | | | broker-wide to save having to exclude them from individual ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@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@1239496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java Broker] Remove duplication between two password file ↵Robert Godfrey2012-02-018-933/+606
| | | | | | database implementations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@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@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@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@1238868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of output converters and optimise ↵Robert Godfrey2012-01-308-913/+59
| | | | | | startup time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237772 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-3011-560/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@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@1237577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-293-8/+29
| | | | | | | | | | | | | | | 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@1237504 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] code tidyupsRobert Godfrey2012-01-2974-749/+326
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-283-30/+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@1237088 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-2773-295/+566
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle ↵Robert Godfrey2012-01-279-9/+47
| | | | | | happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236647 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-27373-1503/+1608
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@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@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@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@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@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@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@1232785 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix issue with default group assignment pointed out by RobbieRobert Godfrey2012-01-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232058 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3762: make sure to close the IoSender when the IoReciever indicates the ↵Robert Gemmell2012-01-161-1/+8
| | | | | | TCP connection went away, fixes leak for forcefully clsoed 0-9-1 connections git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232032 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3761: rename the fallback config to ensure it isnt just picked up by ↵Robert Gemmell2012-01-162-5/+5
| | | | | | Log4J automatically scanning the classpath git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3697: SortedQueue synchronisation can cause deadlockKeith Wall2012-01-134-3/+86
| | | | | | | Sorted queue enqueue() should lock on a private rather than the lock of the object to avoid the possibility of a deadlock with a thread performing subscription operations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1231095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3753 : [Java Broker] Improve automatic conversion of messages between ↵Robert Godfrey2012-01-126-27/+88
| | | | | | 0-8/9/9-1 and 0-10 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230661 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix bug which causes failure in 0-9-1 tests, namely ↵Robert Godfrey2012-01-111-3/+3
| | | | | | SimpleAMQQueue.QueueEntryListener assuming that all listeners are of the same type git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Remove debugging log statementsRobert Godfrey2012-01-111-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230013 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Add alternative (C++ style) grouping and apply comments from ↵Robert Godfrey2012-01-114-144/+489
| | | | | | Robbie Gemmel git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229996 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3717 - Fixes based on review by Robbie GemmellRobert Godfrey2012-01-111-9/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229943 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3730: remove ReadWriteJobQueue, it is no longer necessary as the only ↵Robert Gemmell2012-01-095-50/+8
| | | | | | things now using the thread pool are write jobs, so there is no need/benefit to request it be write-biased. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229112 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove unused codeRobert Gemmell2012-01-092-5/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946 , QPID-2379 : QMF and Federation fixes (now works again with ↵Robert Godfrey2012-01-0726-143/+1178
| | | | | | qpid-config, qpid-route, qpid-tool) and store (durable) routes in the DB git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228748 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)Keith Wall2012-01-073-89/+2
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228583 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3704: OutOfOrderQueue#checkSubscriptionsNotAheadOfDelivery cannot ↵Keith Wall2012-01-051-7/+3
| | | | | | consider _lastSeenEntry when determing if _releasedEntry should be retarded git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227582 13f79535-47bb-0310-9956-ffa450edef68
* QPID-464 : Attempt to log error using log4j before shutting downRobert Godfrey2012-01-041-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227163 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3714 : Fix for NPE when a transient message (or when using the Memory ↵Robert Godfrey2012-01-041-0/+8
| | | | | | Store) has no body git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227162 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3714 : Fix for NPE in the SecurityManager when a null routing key is ↵Robert Godfrey2012-01-041-1/+9
| | | | | | used in 0-10 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227142 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : [Java Broker] Implement Message GroupingRobert Godfrey2012-01-038-44/+301
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1226930 13f79535-47bb-0310-9956-ffa450edef68
* QPID-464 : Set the default uncaught exception handler to abruptly terminate ↵Robert Godfrey2012-01-023-27/+91
| | | | | | | | the JVM (Note this commit also contains fixes for CurrentActorTest as it was discovered that this test was throwing uncaught exceptions from created Threads - i.e. not the main test thread) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1226557 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3713 : Implement producer side flow control for 0-10 in Java BrokerRobert Godfrey2012-01-026-16/+115
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1226382 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3714 : [Java] Performance ImprovementsRobert Godfrey2011-12-2887-2288/+2660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistence: Store message in same transaction as enqueue if possible Memory: Remove unnecessary (un)boxing Reduce unnecessary copying of message data Cache short strings Cache queues for a given routing key on an Exchange (0-9) Use a fixed size buffer for preparing frames to write out Other: Reduce calls to System.currentTimeMillis (0-10) Special case immutable RangeSets, in particular RangeSets of a single range/point (0-10) Special case delivery properties and message properties in headers (0-9) send commit-ok as soon as data committed to store Cache publishing access control queries (0-9) Optimised long and int typed values for FieldTables (0-9) Retain FieldTable encoded form (0-9) Cache queue and topic destinations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1225178 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3707: Fix ClassCastException when processing QueueUnbind for 0-9-1 ↵Keith Wall2011-12-221-5/+18
| | | | | | protocol. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1222502 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3698: remove unnecessary test - MessageStoreShutdownTestKeith Wall2011-12-201-81/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1221313 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3682: Shutdown Plugin ImprovementsKeith Wall2011-12-163-34/+33
| | | | | | | | | | | | | Various improvements to shutdown plugin: 1) Give the ShutdownPlugin instance a name to allow it to be permission via ACL METHOD rules. 2) Refactored to extend DefaultManagedObject. 3) Added method/parameter annotations to improve usability from the UI. 4) Fix date format parsing pattern used by the plugin Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1215112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3687 : Improve Java Broker performanceRobert Godfrey2011-12-1516-186/+770
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1214760 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3684: Remove the Message Store Tool and its associated script and ↵Keith Wall2011-12-1520-3520/+0
| | | | | | | | configuration Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1214670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3680: Header exchange bindings not being created via JMX Management ConsoleKeith Wall2011-12-142-39/+129
| | | | | | Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1214206 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3676: Correct issues found by findbugs marked as blockersKeith Wall2011-12-132-121/+122
| | | | | | Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1213636 13f79535-47bb-0310-9956-ffa450edef68