summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge from trunk tag to-cmake-25mar09 (r758432)Stephen D. Huston2009-03-25147-3105/+9244
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/cmake@758465 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1631 : Convert MessageStore to TransactionLog and RoutingTable. Updated ↵Martin Ritchie2009-02-1335-304/+460
| | | | | | all references and provided a test to ensure that whilst we are transitioning the configuration we can use the old MessageStore classes that now implement both interfaces without any config updates. Updates to the configuration can come when the store are renamed *TransactionLog git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744184 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1630 : Updated MessageFactory to be responsible for assigning ↵Martin Ritchie2009-02-1321-377/+548
| | | | | | | | | | messagIDs. Several tests needed updating as they relied upon specified messageIDs. Added a recovery mode to the MessageFactory where by new messages can have their ids specified but only as long as the new id is larger than the last one. Recovered messages are always persistent. Simplified a interfaces as a result of not requiring the messageID to be passed through. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744140 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1511 : Adds authentication and ssl encryption capabilities to the RMI ↵Aidan Skinner2009-02-134-77/+689
| | | | | | | | based JMXConnectorServer in use, enforces use of the custom MBeanInvocationhandlerImp when using the RMI based JMX, and implements a customised RMI registry to prevent external changes being possible. Updated Management console accordingly. Patch from Robbert Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744113 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1629 : Convered AMQMessage to Interface and created concrete ↵Martin Ritchie2009-02-1335-1428/+1367
| | | | | | | | | | | | | | Transient/PersistentAMQMessage implementations Removed the use of WeakReferences from PersistentAMQMessage and therefore the need to have a StoreContext on get requests. NOTE: this checking will break persistent recovery. Coverted all uses of *MessageHandle to AMQMessage. A number of tests (SimpleAMQQueueTest, TxAckTest.TestMessage, AbstractHeaderExchangeTestBase.Message) still use a custom constructor on Transient/PersistentAMQMessage. This is because they have their own Message implemntations that are used for testing. However, I'm sure they could be modified to override the required functionality rather than attempt to use the existing Factory and Wrap the resulting Message. A new JIRA to address this QPID-1659. QPID-1628 : The update to MessageFactory removes the commented out code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744079 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1628 : Further tiding up of imports no longer requried.Martin Ritchie2009-02-1321-36/+50
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744076 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1629 : Fully test MessageHandles before moveMartin Ritchie2009-02-134-4/+372
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@744074 13f79535-47bb-0310-9956-ffa450edef68
* QPID-430: Fix message age alerting so that it works on queues which are ↵Aidan Skinner2009-02-117-23/+19
| | | | | | | | | | | | otherwise inactive. AMQQueue, VirtualHost, MockAMQQueue: change name of removeExpiredIfNoSubscribers to checkMessageStatus. AMQQueueMBean: remove unthrown exception SimpleAMQQueue: add notification checks to checkMessageStatus, remove catch for JMException which checkForNotification no longer throws. NullApplicationRegistry: set small housekeeping check period so that it runs freuqently and tests don't need to sleep for excessive periods of time AMQQueueAlertTest: remove subsequent send, notification alerts shouldn't depend on queue activity. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743357 13f79535-47bb-0310-9956-ffa450edef68
* QPDI-1583: Implement support for comma-seperated lists of networks and ↵Aidan Skinner2009-02-113-31/+100
| | | | | | hostnames. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743311 13f79535-47bb-0310-9956-ffa450edef68
* TestIoSession: default address and port to avoid illegal arguments when ↵Aidan Skinner2009-02-111-2/+2
| | | | | | creating an address. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743306 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1583'Aidan Skinner2009-02-114-0/+556
| | | | | | | Conflicts: qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743304 13f79535-47bb-0310-9956-ffa450edef68
* Remove MockIoSession, replace with TestIoSession everywhere.Aidan Skinner2009-02-104-300/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@743028 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1626: Add per-virtualhost authorization plugins.Aidan Skinner2009-02-0924-242/+807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PluginManager: add support for getting ACLPluginFactories from OSGi and the ones we already know about. *ApplicationRegistry*: return an ACLManager, not an ACLPlugin from getAccessManager. ACLManager: use PluginManager to get all the available plugins. When being asked to authorize a particular request, hold a vote amongst all the plugins as to whether to allow or deny access. ACLPlugin: return a ALLOWED/DENIED/ABSTAIN vote result. Fix typo in method name. ACLPluginFactory: Factory class for ACLPlugins. AccessResult: just use class SimpleName instead of getPluginName PrincipalPermissions: return AuthzResult instead of boolean. Might want to maek use of Abstain for things it doesn't actually acare about instead of defaulting to Allowed. AllowAll, DenyAll, BasicACLPlugin, SimpleXML: add Factory, return AuthzResult instead of boolean. VirtualHost: get a new ACLManager and configure it with the virtualhost security section. Ensure that old config files which have the access_control_list outside of the main security.access section continue to work. MockPluginManager: add mock class for tests PluginTest: not having any plugins now returns an empty set, not null MockAMQQueue: support name attribute ACLManagerTest: tests for ACLManager class ExchangeDenier, QueueDenier: new test classes for ACLManagerTest PrincipalPermissionsTest: check for correct return result, not true/false anymore Move plugin configuration to <security> section, not <security><access> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742626 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1652 : Created MessagePublishInfoImpl and Unit Test, removed the ↵Martin Ritchie2009-02-0914-457/+28
| | | | | | several annoynmous classes that did all the same work. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@742496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1628 : Moved Redelivered from AMQMessage to QueueEntryMartin Ritchie2009-02-0620-127/+218
| | | | | | Added PropertyExpressionTest to test Redelivered Property git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@741634 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1626: Make ACLPlugin a more sensible interface, get rid of the giant ↵Aidan Skinner2009-02-0419-313/+537
| | | | | | | | | | switch in SimpleXML. Handlers shouldn't rely on the plugin throwing an exception for flow control, they now check the return value and do the right thing themselves. AllowAll, DenyAll now extend BasicACLPlugin. PrinciplePermissions(Test): futz with the interface a little so that it's easier to call from an ACLPlugin implementation. Leave the giant switch alone as it's quite fragile, and throws rocks at cats. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@740769 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1493 : Patch from Robert Gemmell : Corrected inaccurate exception.Martin Ritchie2009-01-261-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@737753 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1533 : Patch from Robert Gemmell, Fixes the reload tab in ↵Martin Ritchie2009-01-266-10/+31
| | | | | | UserManagement to actually reload the PrincipalDatabase file from disk. Not just the jmxaccess rights file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@737746 13f79535-47bb-0310-9956-ffa450edef68
* Remove unused class JmsConsumerAidan Skinner2009-01-221-110/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@736715 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1600: Add tests for PrincipalPermissions, document arguments to ↵Aidan Skinner2009-01-202-0/+176
| | | | | | authorise and grant. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@735993 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1573: Move unit tests that were living in systests into appropriate ↵Aidan Skinner2009-01-1915-2/+2961
| | | | | | module. Fix up a few bugs in other tests that this exposed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@735735 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1563: Use createTempFileAidan Skinner2009-01-092-19/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@733016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1524 : Added missing locking that could cause simultaneous delivery by ↵Martin Ritchie2008-12-171-0/+5
| | | | | | multiple threads on the MockSubscription git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727421 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1538 : Reverted r727068Martin Ritchie2008-12-171-21/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727343 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1536 : Reverted r727057Martin Ritchie2008-12-174-34/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727336 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537 : Reverted r727070Martin Ritchie2008-12-1714-25/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727335 13f79535-47bb-0310-9956-ffa450edef68
* Reverted r727089Martin Ritchie2008-12-171-17/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727333 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537 : Added a test to ensure the version is correctly set for ↵Martin Ritchie2008-12-161-0/+17
| | | | | | AMQUserManagementMBena git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727089 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537 : Version all the MBeans to allow changes in the API contracts. ↵Martin Ritchie2008-12-1614-21/+25
| | | | | | Set AMQUserManagementMBean to version 2 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727070 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1538 : Ensure that RMI connections use our custom InvokerMartin Ritchie2008-12-161-14/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727068 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1536 : Convert Base64MD5PrincipalDatabase to accept plain text password ↵Martin Ritchie2008-12-164-20/+34
| | | | | | input and do the hashing locally. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@727057 13f79535-47bb-0310-9956-ffa450edef68
* Added the ASF license header to the following files.Rajith Muditha Attapattu2008-12-162-1/+41
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@726943 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1469: style fixAidan Skinner2008-12-151-115/+114
| | | | | | | patch from gemmellr@dcs.gla.ac.uk git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@726776 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1524 : Added a catch to print out the message order to help rule out ↵Martin Ritchie2008-12-111-10/+27
| | | | | | message loss potential in the test. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@725663 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1469: Fix NullPointerException, add test for deleteUser which would ↵Aidan Skinner2008-12-092-0/+158
| | | | | | | | expose this. Patch from gemmellr@dcs.gla.ac.uk git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724787 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1503: Add more tests for Base64MD5PasswordFilePrincipalDatabase, fix ↵Aidan Skinner2008-12-092-9/+61
| | | | | | buglets. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724779 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1503 : Updates based on code reviewMartin Ritchie2008-12-094-89/+21
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724743 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1503 : Update to Base64 to correctly save password file. Pulled User ↵Martin Ritchie2008-12-051-0/+121
| | | | | | out of Base64MD5 to allow better testing. Added unit test case for Base64 and User git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@723795 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1503 : Update to Base64 to correctly save password file. Pulled User ↵Martin Ritchie2008-12-053-124/+466
| | | | | | out of Base64MD5 to allow better testing. Added unit test case for Base64 and User git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@723792 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1482 : Patch provided by Robert Gemmell, To allow PLAIN authentication ↵Martin Ritchie2008-12-031-66/+7
| | | | | | via JMX Console. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@722865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1501 : Remove @Override annotations to allow compilation under JDK 1.5Martin Ritchie2008-12-023-28/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@722670 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1390 : Added test to validate that new SASL providers are unregistered ↵Martin Ritchie2008-10-241-0/+120
| | | | | | by the broker on ApplicationRegistry shutdown git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707678 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1315: Fix style issue, iterator control usage as per review comments ↵Aidan Skinner2008-10-242-11/+15
| | | | | | from rgodfrey. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707672 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1394 : Registration of JCAProvider is incorrect in client and broker ↵Martin Ritchie2008-10-242-7/+11
| | | | | | SASL configurations git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707658 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1390 : Allow Authentication Manager to correctly closeMartin Ritchie2008-10-243-2/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707657 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1385 : Extracted annonymous class from AMQChannel.resend(boolean), ↵Martin Ritchie2008-10-238-62/+827
| | | | | | Added new Mock Objects to the broke to allow direct testing of the new class. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707344 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1315:Aidan Skinner2008-10-172-157/+114
| | | | | | | | | | BasicBytesFlowControl doesn't wait long enough to determine if the 3rd message is going to be delivered accidently. It also ack'd every message, which was not it's intent, so use acknowledgeThis() instead. Refactor common code out of processQueue and flushSubscription into attemptDelivery. Make sure sendLock is held when closing the consumer. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@705657 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1101 : Reverted change, for some reason I can't seem to find where this ↵Martin Ritchie2008-10-151-6/+1
| | | | | | code was used, agree it was a poor approach. Will document a better one on QPID-1103 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704945 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1314: move metadata store up a few lines as per review comment.Aidan Skinner2008-10-151-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704936 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1356: move commit even higher, before the auth check.Aidan Skinner2008-10-151-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@704928 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status