summaryrefslogtreecommitdiff
path: root/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* QPID-1639 : Added test to ensure that properties passed on QueueDeclare are ↵Martin Ritchie2009-03-061-5/+59
| | | | | | applied to queue. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@750867 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1637 : Update to test to correctly use priority queues in test. Fixed ↵Martin Ritchie2009-03-037-67/+183
| | | | | | big in inhaler/purger to ensure priority data is correctly reloaded. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749699 13f79535-47bb-0310-9956-ffa450edef68
* Prevent NullPointerException when backing store file is deleted externallyMartin Ritchie2009-03-031-7/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749697 13f79535-47bb-0310-9956-ffa450edef68
* QPID-430: Change configuration variable name in line with review remarks.Aidan Skinner2009-03-033-6/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: close all app registries after use.Aidan Skinner2009-03-021-2/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749340 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1637 : Added Purger thread for Priority Queues and when threasholds are ↵Martin Ritchie2009-03-0214-211/+673
| | | | | | | | | | | | adjusted. QueueEntries are now the point of entry to load/unload rather than the List. This is because it is only the QueueEntryList that the QueueEntry that is attached to that can correctly account for the inMemory usage. In the Priority Queue case the priority queue does not know which sub list the QueueEntry is on. As the QEI knows it makes sence to request load/unload through the entry. Set the default Maximum InMemory to -1, disabled. Removed the FlowableQueueEntryList interface, merged with QueueEntryList git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749331 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: Add test for reloading external firewall rules, fix buglets this ↵Aidan Skinner2009-03-0210-80/+299
| | | | | | test exposed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749315 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: updated server configuration testRobert Gemmell2009-03-021-12/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749285 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: remove JMXMP ConnectorServer usage from the brokers JMX ↵Robert Gemmell2009-03-022-162/+123
| | | | | | management capabilities git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749282 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1492: make the broker return the current queue depth and maximum queue ↵Robert Gemmell2009-03-024-14/+13
| | | | | | depth in bytes rather than kilbytes, matching their respective setter methods. Augment the management console's navigation queue selection list to show the appropriate numbers git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@749149 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1655: use a File object to hold reference to access file instead of a ↵Robert Gemmell2009-02-272-117/+280
| | | | | | String to fix issue with createTempFile and absolute paths. Stop catching IOExceptions in saveAccessFile() and make calling methods catch them to check for and report failure and act accordingly to reverse actions in memory. Add additional unit tests to cover access rights file manipulation. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748686 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1536: modify the B64MD5 PD to take plain text input and perform the ↵Robert Gemmell2009-02-275-106/+229
| | | | | | required hashing itself in order to present a consistent interface for user management. Alter management console to use mbean versioning to detect this and send plaintext to v2+ user management mbeans. Update RMIPasswordAuthenticator to make use of the new PD input consistency git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748680 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1502: Update the PlainPasswordFilePrincipalDatabase to be manipulatable ↵Robert Gemmell2009-02-274-44/+870
| | | | | | by the management console and cached in memory like the B64MD5 PD. Add unit tests for the PlainPD git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748641 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: fix mbean annotation, log failure to reload file. Address review ↵Aidan Skinner2009-02-272-6/+13
| | | | | | comments from robbie. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748591 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: reload the config file sections that we can when we receive ↵Aidan Skinner2009-02-275-8/+155
| | | | | | SIGHUP. Add jmx method to do so. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748561 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1635,QPID-1636,QPID-1638 : Updated QueueEntries to contain additional ↵Martin Ritchie2009-02-2720-292/+643
| | | | | | | | | | | | | | | | | | | values from AMQMessage, _flags and expiry this allows the checking of immediate delivery and expiry on unloaded messages. Updated nomenclature to use load/unload rather than the overloaded flow/recover. Created new FileQueueBackingStoreFactory to ensure that validates and creates initial flowToDiskLocation and creates a new BackingStore. Responsibility for FlowToDisk has been added to the QueueEntryLists. This will allow the easy unloading of the structure in the future. Inorder to do this the size,count and memory count properties had to be moved from the SimpleAMQQueue to the QueueEntryList. An Inhaler thread was created in addition to the synchronous loading of messages. This is initiated as a result of a flowed QEL dropping below the minimumMemory value. A test to ensure that the queue never exceeds its set memory usage and that the count does not go negative has been added to SimpleAMQQueueTest. The SimpleAMQQueue is responsible for deciding when a message can be unloaded after delivery takes place. The QEL cannot decide this as there is no state for a message being marked as sent to a consumer. Only Aquired and Dequeued. The unloaded message is only deleted after the QueueEntry is deleted from the QEL. This negates the need to recreated the data on disk if the message needs to be unloaded again. All files/directories relating to FtD are created as deleteOnExit files so that under clean shutdown the VM will ensure that the files are deleted. On startup the flowToDiskLocation is also purged to ensure a clean starting point. SAMQQueueThreadPoolTest was augmented to take in to account the new inhaler executor reference. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748519 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1635,QPID-1636 : Moved additional properties from AMQMessage up to ↵Martin Ritchie2009-02-2719-416/+775
| | | | | | QueueEntry to allow processing whilst messasge has been flowed. Moved : _flags (for Immediate and delivered status), expiry, messageID. Created base class to maintain counts of data and objects in queue. Removed this responsibility from the AMQQueues and on to the QueueEntryLists. This will more easily allow the QEL structure to be flowed to disk at a later stage. Updated tests as a result of moves. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748516 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 : Tidied up old referenceCount variable that was still in use in ↵Martin Ritchie2009-02-271-4/+2
| | | | | | logging. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748514 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1629 : Forgot to delete AMQMessageHandle.javaMartin Ritchie2009-02-271-75/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@748513 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Remove doubling of new classes. Stoopid patch(1). PEBKAC.Aidan Skinner2009-02-253-1209/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747875 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Add LoggingManagement and associated MBean to enable dynamic ↵Aidan Skinner2009-02-255-17/+2460
| | | | | | | | reloading of log4j file. Update sample log4js so that they aren't arbitrarily rewritten. Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747870 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1568: make isInstanceOf and isRegistered read only methods. Fix code ↵Aidan Skinner2009-02-251-11/+18
| | | | | | | | style issue with field name. Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747869 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537: Version MBeans.Aidan Skinner2009-02-2514-17/+27
| | | | | | Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1668: check initial count, don't assume it's 0. It should be, but there ↵Aidan Skinner2009-02-251-4/+4
| | | | | | are bugs in ApplicationRegistry.close that prevent this from working. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747783 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1686 - Had to had another AR.getInstance() call as alternative is to ↵Martin Ritchie2009-02-251-2/+12
| | | | | | complete this JIRA. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747755 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1634 : Created QueueBackingStore interface and implementation ↵Martin Ritchie2009-02-2510-18/+775
| | | | | | FileQueueBackingStore. Tested by FileQueueBackingStoreTest. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1633 : Added new properties to SimpleAMQQueue with appropriate ↵Martin Ritchie2009-02-2510-8/+292
| | | | | | getters/setters from the ServerConfiguration and Management Console. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747753 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 : Removed commented codeMartin Ritchie2009-02-251-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747751 13f79535-47bb-0310-9956-ffa450edef68
* Fix build deps fileAidan Skinner2009-02-241-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747376 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: Allow split configuration files. Add tests for old-style and ↵Aidan Skinner2009-02-241-0/+4
| | | | | | | | new-style file parsing. This depends on an upgraded commons-configuration, which needs commons-digester and commons-beanutils. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747370 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add environment variables for some things, sanitise the ↵Aidan Skinner2009-02-241-10/+0
| | | | | | housekeeping timer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747369 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add test class for ServerConfigurationAidan Skinner2009-02-241-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747367 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1612'Aidan Skinner2009-02-242-15/+741
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747363 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1621,QPID-1632 : Added a setManagementEnabled option to allow the MC to ↵Martin Ritchie2009-02-207-29/+24
| | | | | | be disabled. Updates as a result of merging configuration changes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@746265 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 - Removal of reference counting and update to tests, TxAckTest was ↵Martin Ritchie2009-02-2030-464/+430
| | | | | | | | reduced in size as reference counting is now not modified until the transaction completes. Replaced MessageReferenceCoutingTest with PersistentMessageTest and further tests wil be created when DerbyDBMessageStore is also updated. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@746260 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1632 - Initial testing of reference counting and implemntation of ↵Martin Ritchie2009-02-2020-267/+168
| | | | | | TransactionLog based reference counting git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@746259 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1621: add ServerConfiguration, QueueConfiguration and ↵Aidan Skinner2009-02-1952-1150/+1164
| | | | | | | | SecurityConfiguration classes. Move almost all uses of o.a.commons.configuration.Configuration behind there. @Configured delenda est git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@745799 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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@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/qpid@742496 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status