summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
...
* QPID-4521: ensure that the routing key is properly passed to the alternate ↵Robert Gemmell2012-12-232-1/+98
| | | | | | Topic exchange by the adapter. Add unit tests for the adapter methods. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1425515 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4503: Producer transaction timeout detection feature may produce ↵Keith Wall2012-12-202-0/+5
| | | | | | | | spurious open/idle alerts and close client connections/sessions without good cause Address second race condition: Transaction update time should be reset on session commit or session rollback git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424427 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4515: improved broker logging, particularly when receiving/sending AMQP ↵Phil Harvey2012-12-204-41/+110
| | | | | | | | 0-8/0-9 frames and when committing transactions. Work done by Keith (kwall) and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424382 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4503: Producer transaction timeout detection feature may produce ↵Keith Wall2012-12-143-20/+13
| | | | | | | | | | | | | | | | suprious open/idle alerts and close client connections/sessions without good cause Race conditon existed between the initial check that determined transaction timeout detection was required and the subsequent re-observeration required to perform the open and idle calculation. In the unlucky timing, the state of the transaction changed between these two points. (To produce the time-since-epoch type the transaction needs to be committed between these two points). Changed checkTransactionStatus so that transactionStartTime and transactionUpdateTime are observed once only. There still exists the possibility that the transaction status change change between the reading of transactionStartTime and transactionUpdateTime times, but I do not see how this could produce a suprious report (or close). The alternative (to take a locks to ensure consistent observations are made) seems unjustifiably costly. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1421884 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4377: add missing licence headers to various files in the Java treeRobert Gemmell2012-12-118-6/+160
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1420285 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4489: ensure the IoSender is closed when the IoReceiver closes before a ↵Robert Gemmell2012-12-031-1/+23
| | | | | | protocol version initiation is received git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1416716 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4476: ensure that the Principal in the AuthenticationResult has the ↵Robert Gemmell2012-11-271-31/+66
| | | | | | same format (the username) in both sasl and non-sasl cases, reworking handling of authentication success/failure/error to improve user experience slightly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1414257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4472 : [Java Test] Fix MultiVersionProtocolEngineTest to work with AMQP ↵Robert Godfrey2012-11-261-0/+26
| | | | | | 1.0 connections. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413724 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4472 : [Java Broker] NPE with non-SASL AMQP 1.0 ConnectionRobert Godfrey2012-11-262-2/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413627 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4470: Allow 'maximum queue depth' queue alerting threshold to be set ↵Keith Wall2012-11-252-13/+29
| | | | | | from JMX/AMQP git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2796 : Implement hearbeating in Java Broker (all protocol versions) and ↵Robert Godfrey2012-11-257-13/+168
| | | | | | Java Client (0-8/9/9-1 path) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413376 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4377: Update trunk versions to 0.21Justin Ross2012-11-191-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1411381 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4335, QPID-4353: Refactored broker plugins to use simplified ↵Robert Gemmell2012-10-1293-3727/+1759
| | | | | | | | | | | | | | | | ServiceLoader-based model rather than embedding Felix to use OSGi. Removed the ability to reload security configuration because this feature is not very useful in its current form and was making our code hard to refactor. Modified all tests to use jars rather than classes. This makes them closer to real-world deployments, e.g. the META-INF/services file is read from within the jar. Also moved various system tests from their respective modules into "systests". This removes the need for most modules to depend on systests, thus simplifying our dependency graph. Applied patch from myself, Keith Wall and Phil Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1397519 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4334: removed the firewall plugin and moved its functionality into the ↵Keith Wall2012-09-281-106/+100
| | | | | | | | Access Control plugin. Applied patch from Philip Harvey <phil@philharveyonline.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1391430 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4333: remove the 'queue reconfiguration' process and various clases ↵Robert Gemmell2012-09-2410-707/+13
| | | | | | | | leftover from SCD Work by Keith Wall and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1389451 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4313: Address review comments from QPID-4109 (Reenable LoggingManagement)Keith Wall2012-09-213-17/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1388457 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4333: remove the Slow Consumer Detection plugin and associated ↵Robert Gemmell2012-09-2017-1977/+0
| | | | | | | | documentation Work by Keith Wall and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1388047 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4297: Broker should not rely on Subject.getPrincipals.iterator().next() ↵Keith Wall2012-09-113-8/+7
| | | | | | to find 'username principal' git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1383639 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4292: add ACL rule to authorise access to the web management UIKeith Wall2012-09-107-61/+118
| | | | | | | | | | | * added object name MANAGEMENT to represent both JMX and Web Management layers * Change both JMX/Web entry points to permission access with an access management check * Updated examples and docbook * Made Principals serialised to avoid container warnings when Qpid principals are placed within a HttpSession. Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1382947 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4255: Add "log out" functionality to web UIKeith Wall2012-09-062-0/+22
| | | | | | | | | | | * Added logout link to the Web Management UI (displayed once a user is logged in). * Added operation logging (open/close event) to report the fact that the user has logged in, logged out (or gone away i.e. web session timeout). * Allow Jetty web session timeout to be overridden from the config.xml Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1381637 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4283: Make web management capable of using external authentication manager.Keith Wall2012-09-043-1/+52
| | | | | | | | | | | also: * remove test servlets * rename management.html => index.html * allow sasl-auth to be disabled Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380626 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4271: improve behaviour when embedding the broker inside a containerKeith Wall2012-09-047-21/+105
| | | | | | | | | | | | Avoid potential ThreadLocal leaks on Container owned threads for CurrentActor, AMQShortString and SecurityManager. Have LogRecorder unregistered itself from Log4J. Allow SIGHUP handling to be turned off (inappropiate to install signal handling when deployed inside Container. Allow use of custom RMI socket factory to be disabled. (The registration of a custom RMI socket with the JRE cannot be reversed (deficiency in JRE API) and this causes a large perm-gen leak). Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380625 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4238: escape tags for queue and virtualhost names with dots in them ↵Robert Gemmell2012-09-024-3/+53
| | | | | | | | | when accessing the XML configuration, works around CommonsConfiguration behaviour with element names containing dots Applied patch from Jakub Scholz git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380037 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4253: add configuration for basic-auth on http / https management and ↵Robert Gemmell2012-09-021-0/+10
| | | | | | set to disabled / enabled respectively by default git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1380016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4261: extend BindingURLs to allow specifying exchange ↵Robert Gemmell2012-09-011-1/+1
| | | | | | | | | durable/autodelete/internal options, use the values when sending exchange declares during producer and consumer creation. Fix ExchangeDeclareHandler to set auto-delete properly (though we dont actually support it, and it was removed from the protocol in 0-9-1). Isolate AMQProtocolHandler use to the 0-8/0-9/0-9-1 specific Session/Producer/Consumer implementations that actually need it instead of letting it bleed through the abstraction and 0-10 implementations that dont use it. Add some other clarifying comments. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1379748 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4270: Change web management plugin to log management operational log ↵Keith Wall2012-08-302-18/+14
| | | | | | messages. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1379139 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4242 : [Java Broker] Remove QMFv1 implementationRobert Godfrey2012-08-29111-11092/+282
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1378496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4237: modified FileGroupDatabase to ensure that it always closes its ↵Robert Gemmell2012-08-271-2/+24
| | | | | | | | file input/output streams. Applied patch from Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1377724 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4237: added convenience method to AuthenticatedResult to facilitate ↵Robert Gemmell2012-08-271-3/+13
| | | | | | | | implementation of third party authentication managers. Applied patch from Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1377723 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4236, QPID-4237, QPID-4245: Added group management functionality, and ↵Robert Gemmell2012-08-2475-503/+3791
| | | | | | | | | | | | | | | | | | | exposed it via the web management interface. Removed group definition functionality from the ACL plugin. The ACL plugin uses groups but no longer defines them. Introduced SubjectCreator as a facade to AuthenticationManager and group management classes. Applied access control to user and group management. Fixed bug in choosing between update and creation in RestServlet. Moved lots of RestTest helper methods to RestTestHelper. Fixed authentication, authorisation, and status logging when using the web ui. Applied patch from Philip Harvey <phil@philharveyonline.com>, Keith Wall and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1376968 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4189: Add unit tests for ConfiguredObjectToMapConverterKeith Wall2012-08-031-28/+34
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1369015 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4187: Improve operational management logging: - make ManagementActor ↵Robert Gemmell2012-08-032-33/+89
| | | | | | | | thread-safe, stop caching of log string without context principal set, use separate instance of ManagementActor with pre-set principal for opening and closing notifications for JMX connections Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1368979 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4172: HouseKeepingTask now reverts thread name before exiting to reduce ↵Robert Gemmell2012-08-022-2/+51
| | | | | | | | confusion when inspecting thread dumps. Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1368519 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4182: Set the default minimumAlertRepeatGap value to 30 secondsRobert Gemmell2012-08-024-14/+24
| | | | | | Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1368506 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4183 : Implement Session/ConnectionModel interfaces in AMQP 1.0 code to ↵Robert Godfrey2012-08-025-5/+360
| | | | | | restore functionality git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1368414 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4171: Fix enqueue ordering for persistent messsagesKeith Wall2012-08-014-22/+165
| | | | | | Applied patch from Philip Harvey <phil@philharveyonline.com> and Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1367990 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4167: Fix setting of queue attributes via web management console and ↵Robert Gemmell2012-07-312-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1367796 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4124: Improved logging that is produced when the various transaction ↵Robert Gemmell2012-07-314-32/+192
| | | | | | | | timeouts are exceeded. Remove duplication of messages and reorder logging/closing. Work by myself, Keith Wall, Phil Harvey. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1367522 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-271-1/+4
| | | | | | persisted git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1366339 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4164: Prevent the erroneous re-storing of recovered messages during ↵Keith Wall2012-07-251-21/+29
| | | | | | move/copyMessage management functions. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1365832 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4149: Add REST functionality to delete exchanges, queues and bindings, ↵Robert Gemmell2012-07-197-39/+130
| | | | | | | | add queue/exchange/binding delete operations into web UI Applied patch from Oleksandr Rudyy <orudyy@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1363298 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3998: Add HTTPS support for the REST management interfaceRobert Gemmell2012-07-137-13/+70
| | | | | | Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1361239 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4131: On 0-8...0-9-1 code path broker now closes the connection when ↵Keith Wall2012-07-123-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. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1360651 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3998, QPID-3999: System tests for Rest API, small fixups for the ↵Robert Gemmell2012-07-119-10/+91
| | | | | | | | adapters and web ui. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1360121 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add some logging around the DtxBranch timeout functionality to aid ↵Robert Gemmell2012-07-101-8/+72
| | | | | | debugging git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1359916 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4125 : [Java Broker] allow coalescing of commits for multiple channels ↵Robert Godfrey2012-07-104-29/+185
| | | | | | on same connection git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1359673 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4121: AMQProtocolEngine now uses lock to prevent the thread-unsafe use ↵Keith Wall2012-07-103-15/+31
| | | | | | | | of AMQChannel's transaction which caused it to throw a ConcurrentModificationException. Applied patch from Philip Harvey <phil@philharveyonline.com> and Keith Wall <kwall@apache.org>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1359595 13f79535-47bb-0310-9956-ffa450edef68
* QPID-4111: Move trunk version numbers to 0.19Justin Ross2012-07-092-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1359235 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