summaryrefslogtreecommitdiff
path: root/qpid/java/broker
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3489: Added org.apache.qpid.server.message to exported packages for brokerAndrew Donald Kennedy2011-11-291-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1207741 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add licence headersRobert Gemmell2011-11-173-0/+60
| | | | | | | merge from trunk r1203385 and r1203390 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1203391 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2703: 0-8..0-9-1 Transaction rollback/recover does not restore consumer ↵Robert Gemmell2011-11-177-17/+26
| | | | | | | | | | | | 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. merged from trunk r1203137 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1203316 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3617: AMQQueueMBean.viewMessages: Viewing message without priority set ↵Robert Gemmell2011-11-171-1/+1
| | | | | | | | | ends with NullPointerException merged from trunk r1203135 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1203314 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3592: actually add test fileRobert Gemmell2011-11-111-0/+63
| | | | | | | Merged from trunk r1200801 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1200992 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. Merged from trunk r1200801 (minus changes to python test excludes, which never existed on the 0.14 branch). git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1200985 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3446: Unregister existing subscriptions when closing the connections ↵Robert Gemmell2011-11-114-17/+31
| | | | | | | | | | | | [during shutdown], update lock usage in order to avoid deadlock. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> and myself. Merged from trunk r1198834 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1200979 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3583: Update release-branch version from 0.13 to 0.14Justin Ross2011-11-032-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.14@1197306 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3570: update MessageTransferMessage and TransferMessageReference to use ↵Robert Gemmell2011-11-016-111/+98
| | | | | | 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-312-1/+28
| | | | 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
* NO-JIRA: add example configuration for using a persistence storeRobert Gemmell2011-10-301-6/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195211 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-3504: add the lib\opt wildcard to the classpath in the qpid.server.bat ↵Robert Gemmell2011-10-241-2/+2
| | | | | | | | file, to allow easy path for adding optional dependencies. Applied patch from Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1188098 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3517: Inconsistent SSL configuration keys in Java Broker in config.xmlKeith Wall2011-10-164-27/+61
| | | | 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-3515: update qpid-server and qpid-run to enable them to work if ↵Robert Gemmell2011-09-301-2/+2
| | | | | | QPID_HOME and QPID_WORK contain spaces and parentheses git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1177657 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3504: make the broker start script check for additional jar files in ↵Robert Gemmell2011-09-301-2/+2
| | | | | | lib/opt/ to add to its classpath using the JDK 6 classpath expansion convenience, enabling an easier way of adding the optional BDB JE jar dependency than via the existing -run:<option> classpath manipulations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1177656 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-3504: add the Java broker bdbstore to the build as an optional moduleRobert Gemmell2011-09-241-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1175235 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-157-74/+104
| | | | | | 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-149-151/+244
| | | | | | 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-0916-297/+556
| | | | 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-074-21/+89
| | | | | | | | 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-0710-97/+197
| | | | | | 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-267-18/+82
| | | | 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-217-136/+124
| | | | | | | 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-215-48/+333
| | | | | | | | | 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-213-29/+227
| | | | | | 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-184-18/+6
| | | | | | | | 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-1412-989/+950
| | | | 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-1412-950/+989
| | | | 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-134-35/+248
| | | | | | 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-087-33/+45
| | | | | | 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-0812-114/+221
| | | | | | 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
* QPID-3385: assign IDs from a generator within the ↵Robert Gemmell2011-08-0812-95/+237
| | | | | | MultiVersionProtocolEngineFactory, which is shared across all protocol versions git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1155136 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2903, QPID-3390, QPID-3392: split tests into those with and without ↵Robert Gemmell2011-08-041-1/+13
| | | | | | exchange creation arguments, add verification of exchange declare arguments, add new test to validate behaviour when supplying nonsense/unsupported arguments, exclude failign tests until functionality is implemented git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1153864 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2899: log the exceptionRobert Gemmell2011-08-031-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1153609 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status