summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* QPID-4172: HouseKeepingTask now reverts thread name before exiting to reduce ↵Robert Gemmell2012-08-032-2/+51
| | | | | | | | | | | confusion when inspecting thread dumps. Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy<orudyy@gmail.com> merged from trunk r1368519 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1368846 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4182: Set the default minimumAlertRepeatGap value to 30 secondsRobert Gemmell2012-08-034-14/+24
| | | | | | | | | Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy<orudyy@gmail.com> merged from trunk r1368506 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1368844 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4183 : [Merge from trunk] Implement Session/ConnectionModel interfaces ↵Robert Godfrey2012-08-025-5/+360
| | | | | | in AMQP 1.0 code to restore functionality git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1368514 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4171: Fix enqueue ordering for persistent messsagesRobert Gemmell2012-08-024-22/+165
| | | | | | | | | Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy <orudyy@gmail.com> merged from trunk r1367990 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1368401 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4167: Fix setting of queue attributes via web management console and ↵Robert Gemmell2012-08-012-2/+3
| | | | | | | | | | | rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers. Work by Oleksandr Rudyy, Keith Wall and myself. merged from trunk r1367796 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1367973 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4164: only keep a hard reference to the meta data if it has yet to be ↵Robert Gemmell2012-07-311-1/+4
| | | | | | | | | persisted merged from trunk r1366339 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1367531 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4164: Prevent the erroneous re-storing of recovered messages during ↵Robert Gemmell2012-07-311-21/+29
| | | | | | | | | move/copyMessage management functions. merged from trunk r1365832 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1367529 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4149: Add REST functionality to delete exchanges, queues and bindings, ↵Robert Gemmell2012-07-207-39/+130
| | | | | | | | | | | add queue/exchange/binding delete operations into web UI Applied patch from Oleksandr Rudyy <orudyy@gmail.com> and myself. merged from trunk r1363298 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1363810 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3998: Add HTTPS support for the REST management interfaceRobert Gemmell2012-07-197-13/+70
| | | | | | | | | Applied patch from Oleksandr Rudyy <orudyy@gmail.com> merged from trunk r1361239 with test from 1363413 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1363418 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4131: On 0-8...0-9-1 code path broker now closes the connection when ↵Keith Wall2012-07-193-21/+40
| | | | | | | | | | the housekeeping thread times out a transaction. AMQChannel now uses AMQProtocolEngine's _receivedLock so that this connection-closing is thread-safe. This gives better compatibility with older clients that do not hand session closes correctly. 0-10 behaviour unaffected by this change. Merged 1360651 from trunk. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1363403 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4114: broker release now includes BDB if optional=true sys property is setKeith Wall2012-07-193-15/+31
| | | | | | | | | | Applied patch from Phil Harvey <phil@philharveyonline.com>. Merged 1359595 from trunk. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1363396 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3998, QPID-3999: System tests for Rest API, small fixups for the ↵Robert Gemmell2012-07-139-10/+91
| | | | | | | | | | | adapters and web ui. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> Merged from trunk r1360121 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1361113 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4111: Adjust versions to 0.18 on the release branchJustin Ross2012-07-092-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.18@1359232 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3923, QPID-3998: split out the IDs used for QMF (which have a different ↵Robert Gemmell2012-07-0837-163/+212
| | | | | | format) from those for the new config model, make it clearer which is being used where git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358759 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3923, QPID-3998: update the Adapter layer to either use UUIDGenerator ↵Robert Gemmell2012-07-0816-87/+203
| | | | | | itself, or use the ID directly from the entity being adapted git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358758 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4093: [Java Broker] Prevent new queues and exchanges from being created ↵Keith Wall2012-07-062-12/+14
| | | | | | on vhosts that are not active git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358217 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4112: Virtualhosts recover exchanges before queuesKeith Wall2012-07-064-30/+30
| | | | | | | Switch the recover order from queues,exchanges,... to exchanges,queues,.. so that when a queue with an alternate exchange is recovered, the exchange's uuid is already in the registry. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1358118 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4109: Re-enable LoggingManagement MBeanKeith Wall2012-07-057-250/+916
| | | | | | | | | | | | | * Re-wire up LoggingManagementMBean. * Centralise log4j specific functionality into LoggingFacade class (moving implementation from LoggingManagementMBean and QpidLog4JConfigurator together). * Implement unit-tests for MBean and Facade levels. Reenforce units tests with system tests testing logging management end to end. * Changed QpidBrokerTestCase so that log4j.configuration is _always_ used to obtain the log4j config file regardless of whether test type is spawned or internal (previously log4j.configuration was respected only for internal tests). This was require to be able to write a logging management system test that could safely change the contents of the log4j config without running the risk of effecting other tests. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1357528 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Add missing Apache licenses to Java source files; correct ↵Keith Wall2012-07-0228-133/+215
| | | | | | positioning of the license wrt to the package statement git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1356257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4093: Resolve some outstanding TODOs in new JMX moduleKeith Wall2012-07-022-6/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1356248 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3923: remove deprecated test-only AMQQueueFactory method and update ↵Robert Gemmell2012-07-0113-119/+71
| | | | | | tests accordingly, rename method for generating random IDs. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355995 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3923: update ID generation to be consistent across all ↵Robert Gemmell2012-07-0110-26/+144
| | | | | | queues/exchanges/bindings as opposed to deterministic for some and not for others git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355994 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4902: NPE from SimpleAMQQueue and RejectedExecutionExecution handlingKeith Wall2012-06-305-22/+29
| | | | | | | | Guard against NPE in setLastSeenEntry. #execute() method change to ignore REE in the case where the queue has already been stopped (logged at ERROR otherwise). Change Subscription*#_queueContext member to volatile as this member is get/set from different threads during the queue's lifecycle git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355721 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3998, QPID-3999, QPID-4093: add new management plugins for ↵Robert Gemmell2012-06-28151-9268/+8444
| | | | | | jmx/rest/webui functionality, partial merge from the java-config-and-management branch at r1355039 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1355072 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4091 : [Java Broker] correct handling of dtx set timeoutRobert Godfrey2012-06-272-24/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1354738 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4091 : [Java Broker] correct handling of dtx set timeoutRobert Godfrey2012-06-272-6/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1354728 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4061 - Added statistic: Number of unacknowledged messages in a sessionTed Ross2012-06-131-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1349865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4044: Synchronise DtxRegistry#commit and #rollback to eliminate the ↵Keith Wall2012-06-111-2/+2
| | | | | | possibility of deadlock git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1349055 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4014: increase debug logging in ConflationQueueListRobert Gemmell2012-06-101-2/+16
| | | | | | | Applied patch from Phil Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1348647 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3997: [Java Broker] Allow assignment of AuthenticationManager on a ↵Keith Wall2012-06-107-14/+91
| | | | | | | | per-port basis Address review comments from Rob Godfrey. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1348603 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4042 : [Java Broker] Add SSL Client Auth supportRobert Godfrey2012-06-0625-309/+701
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1346817 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3997: Fix test failure under JDK 1.7 when AuthenticationManagers would ↵Keith Wall2012-06-0310-385/+567
| | | | | | | | | | not always be properly closed ApplicationRegistry refactored: Resposibilities for lifecycle of AuthenticationManager objects transfered to AuthicationManagerRegistry (better separation of concerns). Implemented new pure unit test to expose the failing test and then changed algorithm so that AuthenticationManagers are closed on all paths. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1345607 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4029: add ability to selectively include a protocol version on a given ↵Robert Gemmell2012-05-298-17/+373
| | | | | | port, overriding an exclusion on the same port or it being disabled on all ports. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1344040 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3986: Improved tests and resolved some potential thread-safety issuesRobert Gemmell2012-05-293-7/+250
| | | | | | Applied patch from Oleksandr Rudyy <orudyy@gmail.com>, Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1343675 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3997: AuthenticationManagers not cleaned up on error pathKeith Wall2012-05-262-12/+5
| | | | | | | We have been seeing ApplicationRegistryShutdownTest fail regularly on JDK1.7 on Jenkins CI for the last week. This is caused by the ApplicationRegistry failing to clean up on the error path where many AuthenticationManagers are configured but one is not designated as default. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342886 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4006: [Java Broker] BDB HA.Keith Wall2012-05-253-14/+12
| | | | | | | | | | | | Close BDB environment in the event of unexpected exceptions during commit/begin tran. Install BDB exception listener to log exception arising from its own threads. Default BDB parameters for sensible defaults for standard Qpid use-cases. Ensure that closeInternal always closes the environment. Added MBean operation descriptions. Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342712 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4012: update the priority queue entry sub lists to maintain a record of ↵Robert Gemmell2012-05-251-4/+13
| | | | | | the priority index they represent, refer to this when comparing queue entries in order to avoid using the metadata later than is possible git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342667 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4006: BDB HA. Make passivation async to avoid holding up the BDB ↵Keith Wall2012-05-223-16/+53
| | | | | | | | | | thread. Introduce VirtualHost ERROR state to be used when virtual host is unable to activate or passivate itself completely. Change MULTISYNC mode to use WRITE_NO_SYNC. Stop relying on Monitor nodes to perform some tests. Work of Robbie Gemmell <robbie@apache.org> and myself. squashme git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1341584 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4010 : [Java broker] Add LDAP authenticationRobert Godfrey2012-05-183-3/+406
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340248 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3973 : [Java] Add support for non JKS key store types (patch supplied ↵Robert Godfrey2012-05-182-2/+8
| | | | | | by jsightle@redhat.com) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340191 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4007 : [Java Broker] Fix pointless equality test in Kerberos ↵Robert Godfrey2012-05-181-1/+1
| | | | | | authentication support git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1340030 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4007 : [Java Broker] Add Kerberos authentication supportRobert Godfrey2012-05-172-2/+230
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339840 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4006: add support for using BDB HA to form an active-passive cluster ↵Robert Gemmell2012-05-1722-257/+168
| | | | | | | | | | | for persistent messaging - Includes support for setting BDB configuration parameters via the store configuration, both for the existing store and the new HA variant. - Removes the MessageStoreFactory and reverts store configuration to historical values. Applied patch from Keith Wall, Andrew MacBean <andymacbean@gmail.com>, Oleksandr Rudyy <orudyy@gmail.com>, Philip Harvey <phil@philharveyonline.com>, and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339728 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3997 : [Java Broker] add ability to configure multiple ↵Robert Godfrey2012-05-1713-42/+670
| | | | | | Authenticationmanagers and map different AuthenticationManagers to different ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339578 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3997 : [Java Broker] Refactor code to make all calls to ↵Robert Godfrey2012-05-1613-25/+82
| | | | | | | | getAuthenticationManager() pass in local socket address (note that this commit does not actually implement per socket authentication managers) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339146 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3979: [Java Broker] Conflation queuesKeith Wall2012-05-111-24/+52
| | | | | | | | | | Fix bug with checking of head() within the loop that would have prevented a queue entry from being conflated. Refactor code introducing more special Queue Entry to represent the corner cases. Added systest that exercises a conflation queue with multiple producers/single consumer. Applied patch by Phil Harvey <phil@philharveyonline.com>, and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1337094 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3979: [Java Broker] Conflation queues: guard NPE identified by review ↵Keith Wall2012-05-091-5/+12
| | | | | | feedback. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1336295 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3979: [Java Broker] Last value queue memory leakKeith Wall2012-05-092-21/+275
| | | | | | The failure to remove entries from the _latestValuesMap caused leak of ConflationQueueList entries. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1336127 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3980: Last Value Queue: Replaced conflation queue entries are never ↵Keith Wall2012-05-091-4/+1
| | | | | | deleted (entries remained acquired permanently) causing leak. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1336026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3989 : [Java Broker] Add ability to run "in-memory" Derby storeRobert Godfrey2012-05-081-6/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1335667 13f79535-47bb-0310-9956-ffa450edef68