summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merged change to SlowMessageStore to ensure we don't infinitely configure ↵0.5-fixMartin Ritchie2009-04-147-13/+208
| | | | | | | | | | | the same class. QPID-1621: add ServerConfiguration, QueueConfiguration and SecurityConfiguration classes. Move almost all uses of o.a.commons.configuration.Configuration behind there. @Configured delenda est Merged changed from trunk r745799 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764816 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1778 : Add NoFailover FailoverMethod that blocks that still allows ↵Martin Ritchie2009-04-145-5/+146
| | | | | | | | | connection retry but only on the initial merged from trunk r759097 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764795 13f79535-47bb-0310-9956-ffa450edef68
* When committing merge of r753253,753220,753219 missed the svn-props on top ↵Martin Ritchie2009-04-140-0/+0
| | | | | | level qpid dir git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764730 13f79535-47bb-0310-9956-ffa450edef68
* 753253 ritchiem QPID-1730 : Logging update highlighted that we were printing ↵Martin Ritchie2009-04-134-80/+273
| | | | | | | | | | | | | the queue before we had fully initialised it. 753220 ritchiem QPID-1730 : Improve the logging so we can see what is going one during persistent recovery as we do not have a working persistent module. 753219 ritchiem QPID-1730 : Update the order in which we initialise. We now load the config file from disk then recover from the persistent strore. This approach applies the vhost configuration and then applies the persistent state from the store to those objects rather than recreating them. The new inner classes on VirtualHost are to be removed once we have fully extracted the RoutingTable from the legacy MessageStores as this is the root of the problem. The Store needs to be open to create new durable objects but the current stores must recover their state before new entries are added. So now the persistent state is being loaded on to a broker in a consistent state after it has configured a) its default exchanges and b) loaded the queue config from the config file. Eventually we will only have one location for queue config and all will be right in the world. merged the above three changes from trunk that allow the broker to create it's model before the MessageStore is initialised. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764539 13f79535-47bb-0310-9956-ffa450edef68
* Fix config problem with SlowMessageStoreAidan Skinner2009-04-132-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764506 13f79535-47bb-0310-9956-ffa450edef68
* Partially Merged from trunk to provide VirtualHost.getConfiguration() ↵Martin Ritchie2009-04-131-0/+8
| | | | | | | | | functionality Merged from trunk r747754 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764496 13f79535-47bb-0310-9956-ffa450edef68
* Fix misc compile errors.Aidan Skinner2009-04-138-94/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764493 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1801 Added method to show failure to PrincipalPermissionsTest.java and ↵Martin Ritchie2009-04-132-2/+11
| | | | | | | | | then adjusted the ternary operator in PrincipalPermissions.java to ensure we don't pass a null into the map (see JIRA descriptions). merged from trunk r763959 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764490 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1792: make JMXManagedObjectRegistry.close() method attempt to ↵Martin Ritchie2009-04-131-10/+15
| | | | | | | | | de-register only qpid related MBeans, preventing the RuntimeException that is a result of attempting to de-register the platform MBeanServerDelegate MBean, which is not allowed. Also remove unused imports. merged from trunk r762992 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764488 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1790: add new attribute to logging management mbean to indicate ↵Martin Ritchie2009-04-133-8/+45
| | | | | | | | | available output levels. Update jmx management console to understand String[] attribute value and display contents properly merged from trunk r762365 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764485 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1730: make it easy to configure queues, fix inheriting settings from ↵Martin Ritchie2009-04-137-18/+252
| | | | | | | | | | | | | | | | the virtualhost. AMQQueue.configure: new method AMQQueueFactory: use AMQQueue.configure, don't set things directly SimpleAMQQueue.configure, MockAMQQueue.configure: implement new method from the interface QueueConfiguration: use VirtualHostConfiguration for default values if they're unset VirtualHostConfiguration: if a queue doesn't exist, give it a default configuration. Add methods to get default settings for configuration items QueueConfigurationTest: test case, checks that inheritance and defaults work along with explicitly set values. merged from trunk r761721 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764484 13f79535-47bb-0310-9956-ffa450edef68
* Dial up default server threads to 32. Red ones go faster.Martin Ritchie2009-04-131-0/+2
| | | | | | | merged from trunk r760919 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764483 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1776: fix interpolation of variables.Martin Ritchie2009-04-132-4/+28
| | | | | | | merged from trunk r758730 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764482 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1511: add scripts to generate example ssl stores, and add refrence in ↵Martin Ritchie2009-04-133-1/+77
| | | | | | | | | | | the relevant exception message Merged from branches/0.5-release : r757268 merged from trunk r757270 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764478 13f79535-47bb-0310-9956-ffa450edef68
* Fix method call from merge gubbinsAidan Skinner2009-04-131-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764477 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1767: add units to message age attribute descriptionMartin Ritchie2009-04-131-3/+3
| | | | | | | | | Merged from branches/0.5-release : r757257 merged from trunk r757258 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764476 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1743: change maxMessageSize description to indicate it is in Bytes not ↵Martin Ritchie2009-04-131-3/+59
| | | | | | | | | KBytes, make size descriptions in other methods consistent merged from trunk r755256 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764475 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1626: handle legacy config file a bit more gracefully.Martin Ritchie2009-04-132-0/+73
| | | | | | | merged from trunk r754958 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764473 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1736: Timeout DNS lookups if they take more than 30 seconds.Martin Ritchie2009-04-131-3/+60
| | | | | | | merged from trunk r754934 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764472 13f79535-47bb-0310-9956-ffa450edef68
* QPID-430: Change configuration variable name in line with review remarks.Martin Ritchie2009-04-132-5/+7
| | | | | | | | | (Had to leave out the change to VirtualHostConfiguration as it depended on a change introduced by FtD) merged from trunk r749572 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764470 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: more fixups as other stuff hasnt followedAidan Skinner2009-04-135-16/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764468 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: close all app registries after use.Martin Ritchie2009-04-131-2/+7
| | | | | | | merged from trunk r749340 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764466 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: Add test for reloading external firewall rules, fix buglets this ↵Martin Ritchie2009-04-1310-80/+299
| | | | | | | | | test exposed. merged from trunk r749315 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764464 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: updated server configuration testMartin Ritchie2009-04-131-12/+0
| | | | | | | merged from trunk r749285 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764462 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: remove JMXMP ConnectorServer usage from the brokers JMX ↵Martin Ritchie2009-04-135-165/+123
| | | | | | | | | management capabilities merged from trunk r749282 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764461 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1492: make the broker return the current queue depth and maximum queue ↵Martin Ritchie2009-04-135-16/+53
| | | | | | | | | 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 merged from trunk r749149 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764460 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1655: use a File object to hold reference to access file instead of a ↵Martin Ritchie2009-04-132-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. merged from trunk r748686 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764458 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1536: modify the B64MD5 PD to take plain text input and perform the ↵Martin Ritchie2009-04-138-130/+301
| | | | | | | | | | | 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 merged from trunk r748680 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764457 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1502: Update the PlainPasswordFilePrincipalDatabase to be manipulatable ↵Martin Ritchie2009-04-134-44/+870
| | | | | | | | | by the management console and cached in memory like the B64MD5 PD. Add unit tests for the PlainPD merged from trunk r748641 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764455 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: fix mbean annotation, log failure to reload file. Address review ↵Martin Ritchie2009-04-132-6/+13
| | | | | | | | | comments from robbie. merged from trunk r748591 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764454 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612 add missing methodAidan Skinner2009-04-131-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764453 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: rm files, svn ftwAidan Skinner2009-04-135-389/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764448 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1699: reload the config file sections that we can when we receive ↵Martin Ritchie2009-04-135-8/+160
| | | | | | | | | SIGHUP. Add jmx method to do so. merged from trunk r748561 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764447 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Remove doubling of new classes. Stoopid patch(1). PEBKAC.Martin Ritchie2009-04-133-1209/+0
| | | | | | | merged from trunk r747875 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764445 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Add LoggingManagement and associated MBean to enable dynamic ↵Martin Ritchie2009-04-137-42/+2485
| | | | | | | | | | | reloading of log4j file. Update sample log4js so that they aren't arbitrarily rewritten. Patch from Robbie Gemmell <gemmellr@dcs.gla.ac.uk> merged from trunk r747870 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764443 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1568: make isInstanceOf and isRegistered read only methods. Fix code ↵Martin Ritchie2009-04-131-11/+18
| | | | | | | | | style issue with field name. merged from trunk r747869 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764441 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1537: Version MBeans.Martin Ritchie2009-04-1314-17/+27
| | | | | | | merged from trunk r747868 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764440 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1668: check initial count, don't assume it's 0. It should be, but there ↵Martin Ritchie2009-04-131-4/+4
| | | | | | | | | are bugs in ApplicationRegistry.close that prevent this from working. merged from trunk r747783 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764439 13f79535-47bb-0310-9956-ffa450edef68
* Fix build deps fileMartin Ritchie2009-04-132-7/+2
| | | | | | | merged from trunk r747376 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764438 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: Allow split configuration files. Add tests for old-style and ↵Martin Ritchie2009-04-131-0/+4
| | | | | | | | | new-style file parsing. merged from trunk r747370 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764437 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add environment variables for some things, sanitise the ↵Martin Ritchie2009-04-131-10/+0
| | | | | | | | | housekeeping timer. merged from trunk r747369 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764435 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1612: add test class for ServerConfigurationMartin Ritchie2009-04-131-0/+7
| | | | | | | merged from trunk r747367 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764434 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1612'Martin Ritchie2009-04-137-18/+747
| | | | | | | merged from trunk r747363 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1621: forgot to svn add. oops.Aidan Skinner2009-04-134-0/+610
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764430 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1621: add ServerConfiguration, QueueConfiguration and ↵Aidan Skinner2009-04-1342-817/+586
| | | | | | | | | | | | 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/branches/0.5-fix@764428 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1511 : Adds authentication and ssl encryption capabilities to the RMI ↵Martin Ritchie2009-04-1312-99/+846
| | | | | | | | | | | | | | 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> merged from trunk r744113 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764422 13f79535-47bb-0310-9956-ffa450edef68
* QPID-430: Fix message age alerting so that it works on queues which are ↵Martin Ritchie2009-04-137-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. merged from trunk r743357 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764421 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1583: Implement support for comma-seperated lists of networks and ↵Martin Ritchie2009-04-133-31/+100
| | | | | | | | | hostnames. merged from trunk r743311 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764420 13f79535-47bb-0310-9956-ffa450edef68
* TestIoSession: default address and port to avoid illegal arguments when ↵Martin Ritchie2009-04-131-2/+2
| | | | | | | | | creating an address. merged from trunk r743306 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764419 13f79535-47bb-0310-9956-ffa450edef68
* Merge branch 'QPID-1583'Martin Ritchie2009-04-135-2/+557
| | | | | | | merged from trunk r743304 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-fix@764418 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status