summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
* QPID-3642, QPID-3640: Add Dead Letter Queue functionality for 0-10 path. ↵Keith Wall2011-11-285-12/+77
| | | | | | | | Also, it fixes issue with setting of redelivered flag for pre-fetched messages as DLQ functionality relies on this flag being set correctly. Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1207031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3642,QPID-3643: Add Dead Letter Queue functionality for 0-8/0-9/0-9-1 ↵Keith Wall2011-11-2819-84/+573
| | | | | | | | paths, fixes isBound methods on FanoutExchange Applied patch from Keith Wall <keith.wall@gmail.com>, Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1207029 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3474: Maintain connectionid/username Map from only ↵Keith Wall2011-11-252-16/+31
| | | | | | JMXManagedObjectRegistry (Improved separation of concerns). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1206086 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3474: Use JMX notification handback data to ensure that open/close/fail ↵Keith Wall2011-11-242-13/+73
| | | | | | events are logged with username only, rather than a complete list of pricipals. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1205911 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3641: ACLV2 Simplifications and Improvements for Java BrokerKeith Wall2011-11-247-108/+132
| | | | | | | | | | | | | Improvements and simplifications to ACL V2 for the Java Broker: 1) Removed 'EXECUTE' operation (we now just have ACCESS and UPDATE like C++ broker) 2) Enable users with management rights for a procedure to complete that procedure without matching AMQP rights (configurable) 3) Fix up system tests (make clearer, remove need for lots of support files) 4) Fix disparity in DENY_LOG and DENY-LOG values between brokers. 5) Get rid of transitive/expand permission rules Work from Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1205782 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3559: SimpleDateFormat used in thread unsafe manner in JMX Managed ↵Keith Wall2011-11-201-18/+32
| | | | | | | | Queue interface. Resolved thread safe issue. Added supporting unit and system test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1204296 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3622: Add Sorted Queue funtionalityKeith Wall2011-11-2017-207/+1126
| | | | | | Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1204295 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add missing licence headers to various files in the java treeRobert Gemmell2011-11-171-0/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1203385 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2703: 0-8..0-9-1 Transaction rollback/recover does not restore consumer ↵Keith Wall2011-11-176-17/+22
| | | | | | | | | credit. This change restores consumer credit after rollback/recover by restoring credit on reciept of basic.reject from the consumer. This change is basically as QPID-2506, but with additional changes to avoid the 0-10 path. Work by Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1203137 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3617: AMQQueueMBean.viewMessages: Viewing message without priority set ↵Keith Wall2011-11-171-1/+1
| | | | | | ends with NullPointerException git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1203135 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3592: ensure that the 'used credit' values are decremented when message ↵Robert Gemmell2011-11-1111-53/+42
| | | | | | transfer commands 'completed' following a message.stop command attempt to restore their credit (to no effect due to the 0 credit limit) when using 0-10 Window credit mode. Add unit test, and break CreditManager dependency on ServerMessages by passing the required size value rather than the message itself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1200801 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3490: creating queue via JMX now binds the queue to the default ↵Keith Wall2011-11-112-5/+20
| | | | | | | | exchange; prevented unregistration of the default exchange. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1200790 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3539: NoLocal should occur at the connection level and not the session ↵Keith Wall2011-11-102-12/+39
| | | | | | | | level (0-10). Also fixed typing issue that prevented Java Broker understanding the no-local queue argument when encoded as String (as sent by Python tests). Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1200335 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3518: Introduce client side ability to detect server side support.Keith Wall2011-11-096-6/+63
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1199662 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3446: Unregister existing subscriptions when closing the connections ↵Robert Gemmell2011-11-074-17/+31
| | | | | | | | [during shutdown], update lock usage in order to avoid deadlock. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1198834 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3583: Update trunk version from 0.13 to 0.15Justin Ross2011-11-031-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1197304 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3570: update MessageTransferMessage and TransferMessageReference to use ↵Robert Gemmell2011-11-015-104/+95
| | | | | | the reference counting system, helping ensure that persisted 0-10 message [meta]data is removed from the store when dequeued from all queues instead of just being orphaned for cleanup during store recovery git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195929 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3558: Add broker Maven and OSGi artifacts to buildAndrew Donald Kennedy2011-10-311-0/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3428: update to stop duplicate 0-10 session registrations into the ↵Robert Gemmell2011-10-304-8/+9
| | | | | | management layer, fixes a leak of the session and its associated connection at session removal time. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195212 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3561: stop allocating such a large buffer up front when encoding the ↵Robert Gemmell2011-10-301-1/+1
| | | | | | 0-10 metadata for persistence git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195210 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3517: Inconsistent SSL configuration keys in Java Broker in config.xmlKeith Wall2011-10-162-13/+33
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1184882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3417: C++ broker - support adding arrival timestamp to received messages.Kenneth Anthony Giusti2011-10-121-0/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1182490 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3346: move message group feature into trunk.Kenneth Anthony Giusti2011-10-071-3/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1180050 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3444: issue an invalid argument execution exception if the exchange ↵Robert Gemmell2011-09-252-8/+21
| | | | | | name is null or the empty string. Update some constants to ensure the error code is logged with the correct message git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1175625 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3332: Separate open/idle transaction timeout tests to remove the ↵Keith Wall2011-09-231-1/+1
| | | | | | possibility of an unexpected log message. Remove TransactionTimeoutConfigTest as this only duplicated tests aleady performed by TransactionTimeoutTest. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1174842 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2672: Unroutable persistent messages should be immediately removed from ↵Keith Wall2011-09-156-73/+87
| | | | | | store. Added new operational logging message (EXH-1003 - Discarded Message) that reports when the Broker drops an unroutable message. Added new System Test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1171079 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3486: Make connector server port used for JMX configurable.Keith Wall2011-09-145-128/+172
| | | | | | Commited work from Andrew MacBean <andymacbean@gmail.com> any myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1170612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3428: make the Java broker validate 0-10 Session names, enabling it to ↵Robert Gemmell2011-09-134-3/+84
| | | | | | | | | satisfy the clients new ClientID verification feature. Misc updates to the clients verification process. Applied patch from Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1169982 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3459: Increments delivery counter before transfering message to client ↵Robert Gemmell2011-09-122-2/+2
| | | | | | | | in order to count delivery attempts. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1169730 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2627 : Remove dependency on MINARobert Godfrey2011-09-0913-279/+548
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1167311 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2901: fixes racing conditions on broker side when TopicDeletePolicy is ↵Robert Gemmell2011-09-072-1/+15
| | | | | | | | closing the consumer Session but the broker is trying to deliver next message to the Subscription of this closing Session. Applied patch from Oleksandr Rudyy <orudyy@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1166246 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3467: replace the 'connection id' with the Username of the logged in ↵Robert Gemmell2011-09-073-15/+51
| | | | | | | | user for the ManagementActor, since the value for the connection id was arrived at using an incorrect assumption that the id number in the thread name for a particular RMI thread is specific to a given JMX connection when it isnt. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1166134 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3473 : Replace use of MINA IO with transport IO (joint work with Robbie ↵Robert Godfrey2011-09-079-96/+196
| | | | | | Gemmel) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1166069 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3463: Adds catching of Throwable on broker startupRobert Gemmell2011-09-061-1/+1
| | | | | | Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1165572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2720: prevent NPE's in event we didnt fully set up the PluginManagerRobert Gemmell2011-08-261-9/+12
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1162128 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3266: Tidy up housekeeping configuration option for scheduling frequencyKeith Wall2011-08-263-12/+31
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1162121 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3452: Broker now unregisters any remaining subscriptions on receipt of ↵Keith Wall2011-08-251-0/+21
| | | | | | SessionDetach to prevent SubFlushRunner and QueueRunner sending erroneous frames causing a ProtocolViolationException on the client. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1161492 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2904: Avoid race condition between SubFlushRunner and MinaAcceptor ↵Keith Wall2011-08-221-8/+17
| | | | | | | | threads. Send lock was not being held during MessageStop processing. Applying patch by Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1160304 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2720: make the PluginManager able to work with a pre-existing BundleContextRobert Gemmell2011-08-215-79/+123
| | | | | | | Manually applied patch from Danushka Menikkumbura (no longer applied after intervening commits), then updated PluginManager close() to always close the ServiceTrackers it creates, removed the static field/methods causing test failures which lead to previously reverting the patch, enabled passing a pre existing BundleContext into the Broker instance at startup instead, and finally removed the unused MockPluginManager. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1160000 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3414: Refactoring. List of packages to be exported as OSGi system ↵Robert Gemmell2011-08-214-48/+240
| | | | | | | | | packages now held in separate properties file. Applied patch by Keith Wall git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159999 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3439: add intermediate task class for Signal handling using reflection ↵Robert Gemmell2011-08-212-29/+109
| | | | | | to access/implement the Signal handling classes/interfaces, removing dependency on the com.sun heirarchy from ServerConfiguration and thus the associated compiler warnings git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159997 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3430: enable excluding protocol versions from the SSL port(s) on the ↵Robert Gemmell2011-08-181-37/+49
| | | | | | | | command line Applied patch from Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3429: ensure that SSL is enabled correctly in MinaNetworkHandler. ↵Robert Gemmell2011-08-182-15/+3
| | | | | | | | Refactor SSLContextFactory to be a factory, and present a useful interface for both client and server side use. Added keystore for the Java broker, renamed existing client trust/key stores for clarity. Fix SSL port configuration. Added new SSL tests, and ensure these are *always* run in the Java 0-10 profiles. Committing work by myself and Keith Wall. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159250 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3385: remove old ID generator left over after earlier commitRobert Gemmell2011-08-151-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157729 13f79535-47bb-0310-9956-ffa450edef68
* Undoing commits of stuff that was meant for my 1-0 sandboxRobert Godfrey2011-08-1410-958/+930
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157632 13f79535-47bb-0310-9956-ffa450edef68
* Initial checkin of AMQP 1-0 Java Prototype workRobert Godfrey2011-08-1410-930/+958
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157566 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2873: ensure that queues in the configuration file are always bound to ↵Robert Gemmell2011-08-132-34/+33
| | | | | | the default exchange with their name, unknown exchanges properly cause exception to be thrown, and you cant use custom bindings against the default exchange git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157410 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: the Java build was broken by r1156604, add stubs to allow compilationRobert Gemmell2011-08-131-0/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1157409 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3387: use the subscription ID to track rejection rather than the ↵Robert Gemmell2011-08-084-14/+9
| | | | | | subscription itself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1155138 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3386: move all server Subscription creation into the ↵Robert Gemmell2011-08-089-69/+133
| | | | | | SubscriptionFactoryImpl, ensure all Subscription implementations share a common ID sequence generator git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1155137 13f79535-47bb-0310-9956-ffa450edef68