summaryrefslogtreecommitdiff
path: root/qpid/java/broker/etc
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3844: allow queryMBeans to succeed without ACL checking, tools like ↵Robert Gemmell2012-02-161-4/+21
| | | | | | | | JConsole / Qpid MC need this to function at all Applied patch from Oleksandr Rudyy <orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1244946 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-281-3/+0
| | | | | | | | | | retired impls) from the Java Broker's config.xml * Remove remaining references to MINA transport configuration keys: enableDirectBuffers/enablePooledAllocator/filterchain from code and example config files. * Remove references to compressBufferOnQueue from config XMLs. The implementation that used it was removed back in 2007 by QPID-275. * Remove references to broker-side configuration key enableJMSXUserID. This broker feature was removed by QPID-943 (which replaced the functionality with an equivilent client-side option). The old Broker side key plays no part in the client-side function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237088 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3684: Remove the Message Store Tool and its associated script and ↵Keith Wall2011-12-151-54/+0
| | | | | | | | configuration Applied patch from Andrew MacBean <andymacbean@gmail.com> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1214670 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove unused 'qpid.passwd' file, update 'md5passwd' file to align ↵Robert Gemmell2011-11-305-211/+2
| | | | | | users with the 'passwd' file. Remove unused out of date debug log4j config file. Remove old unused conf files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1208478 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3641: rename configuration element aclv2 => acl.Keith Wall2011-11-281-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1207407 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3641: ACLV2 Simplifications and Improvements for Java BrokerKeith Wall2011-11-242-1/+69
| | | | | | | | | | | | | Improvements and simplifications to ACL V2 for the Java Broker: 1) Removed 'EXECUTE' operation (we now just have ACCESS and UPDATE like C++ broker) 2) Enable users with management rights for a procedure to complete that procedure without matching AMQP rights (configurable) 3) Fix up system tests (make clearer, remove need for lots of support files) 4) Fix disparity in DENY_LOG and DENY-LOG values between brokers. 5) Get rid of transitive/expand permission rules Work from Robbie Gemmell and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1205782 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add example configuration for using a persistence storeRobert Gemmell2011-10-301-6/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1195211 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3517: Inconsistent SSL configuration keys in Java Broker in config.xmlKeith Wall2011-10-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1184882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3486: Make connector server port used for JMX configurable.Keith Wall2011-09-141-2/+8
| | | | | | Commited work from Andrew MacBean <andymacbean@gmail.com> any myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1170612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3266: Tidy up housekeeping configuration option for scheduling frequencyKeith Wall2011-08-261-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1162121 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3429: ensure that SSL is enabled correctly in MinaNetworkHandler. ↵Robert Gemmell2011-08-181-1/+1
| | | | | | | | Refactor SSLContextFactory to be a factory, and present a useful interface for both client and server side use. Added keystore for the Java broker, renamed existing client trust/key stores for clarity. Fix SSL port configuration. Added new SSL tests, and ensure these are *always* run in the Java 0-10 profiles. Committing work by myself and Keith Wall. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1159250 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3283: make Authentication Manager pluggable.Robert Gemmell2011-07-153-42/+2
| | | | | | | | Refactors AuthenticationManager and collaborators to allow of AuthenticationManager to be plugged in from the configuration XML. Change PrincipalDatabaseAuthenticationManager to become a pluggable implementation. This change removes support for the <principal-databases> element within the config.xml. Existing use-cases are supported by the new element <pd-auth-manager/> which enables use of the PDAM implementation. Also resolves QPID-1347. Applied patch by Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1147036 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2498: upgrade Mina to 1.1.7.Robert Gemmell2011-07-141-2/+1
| | | | | | Applied patch by Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1146677 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3341: remove unused/dead transport code and accompanying implementation ↵Robert Gemmell2011-07-071-9/+2
| | | | | | | | classes Applied patch by Keith Wall and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1143865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3296: update RMIPasswordAuthenticator to authenticate users via ↵Robert Gemmell2011-06-091-4/+0
| | | | | | | | AuthenticationManager instead of a PrincipalDatabase Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1133781 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2759: Remove defunct jmxremote.access file user management rights ↵Robert Gemmell2011-05-102-24/+0
| | | | | | | | | | | | | | manipulation abilities. 1) Removed remaining jmx access functionality. 2) Removed references to security/jmx/access from all existing configuration files. 3) Made ServerConfiguration#validateConfiguration reject config files that still contain the security/jmx/access element in order to promote good end-user understanding of configuration. For JMX: 1) setRights now throws UnsupportedOperationException with message. 2) createUser(string,string,bool,bool,bool) throws UnsupportedOperationException iff any of the bool args are true i.e. the user attempts to give a user access JMX rights 3) Deprecated createUser(string,string,bool,bool,bool) in favour of new two arg form createUser(string,string) 4) viewUsers changes to always return admin, read, and write items as false. Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1101483 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3010: ensure the SimpleByteBufferAllocator is always used and ↵Robert Gemmell2011-01-211-2/+0
| | | | | | non-direct ByteBuffers are the default, remove the old and now unused configuration methods from ServerConfiguration and update the example config.xml accordingly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1061865 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2942: disable management SSL by default, update config.xml to use ↵Robert Gemmell2010-11-141-3/+4
| | | | | | keystore path from example keystore creation script and move systest keystore config to the systest config override file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1035026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2911: Remove the class printing from the log4j layoutAndrew Donald Kennedy2010-10-241-3/+3
| | | | | | Patch from Sorin S <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1026919 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2843: Remove old logging and use the operational logging framework to ↵Robert Gemmell2010-09-021-7/+0
| | | | | | provide startup information, directed to both stdout and the log file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@992003 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2802: Add support for a status-logging hierarchy, such that the ↵Robert Gemmell2010-08-261-3/+9
| | | | | | Log4jMessageLogger may use this to allow individual on/off toggling of each status message. Combine the RootLogger and RawLogger interfaces. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@989734 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2606: Access Control ModificationsRobert Gemmell2010-05-311-3/+2
| | | | | | | Applied patch from Andrew Kennedy <andrew.international@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@949781 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2584 : Update VirtualHostImp and VHPlugin to ensure that a ↵Martin Ritchie2010-05-181-0/+1
| | | | | | RuntimeException occuring in a plugin will not cause the Plugin to stop running. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@945676 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2585 : Upgrade to Felix 2.0.5Martin Ritchie2010-05-071-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@942114 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2472: correction to count direction commentRobert Gemmell2010-04-011-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@930016 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2472: Correct log4j XML configuration commentsRobert Gemmell2010-04-011-26/+37
| | | | | | | Applied patch from Andrew Kennedy <andrew.international@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@930015 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2630, QPID-2631: Restore the virtualhosts.xml file. When a ↵Robert Gemmell2010-03-304-378/+164
| | | | | | | | | virtualhosts.xml file is specified load it as its own Configuration object to ensure the property heirarchy is not lost. Enforce that virtualhost config can only be specified in either the main config.xml file or the virtualhosts.xml file, but not both. Allow the virtualhosts.xml file to be a combined configuration and use to provide override abilities for testing. Applied patch from Andrew Kennedy <andrew.international@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@929136 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2155: remove stray character causing parser warnings during broker startupRobert Gemmell2009-12-221-1/+1
| | | | | | | merge from r892761 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@893301 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2155 : Updated log4j file with more sensible default values for the ↵Martin Ritchie2009-12-161-16/+29
| | | | | | | | QpidRollingFileAppender appender. Also added more local documentation explaining the more obscure params git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@891332 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2085 : Revert the addition of APPEND. We should use a rolling file ↵Martin Ritchie2009-10-191-1/+1
| | | | | | appender instead. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@826640 13f79535-47bb-0310-9956-ffa450edef68
* Updated broker log4j.xml to remove the DEBUG logging from o.a.commonsMartin Ritchie2009-10-051-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@821815 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2092 Move test configuration to systest package and update to provide ↵Martin Ritchie2009-09-107-843/+0
| | | | | | | | | | | | | | | an more reliable way of adjusting the configuration form the test. In doing this it made sense to udpate the configurations such that they all inherit from the cannonical config.xml from the broker package. Each test now gets its own configuration file that is used to override the defaut values in config.xml. So the config is now a hierarchy of: - Test Specific - Systest adjustments - stock broker config.xml I have disabled the DerbyMessageStoreLoggingTest as after making this change it is more reliably throwing a Derby exception on broker startup. The other changes to the tests were to ensure they correctly save the Test Specific config file before loading. As for some reason, Commons Configuration is not abiding by the optional flag. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813461 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2091 : Updated ServerConfiguration and added test to ↵Martin Ritchie2009-09-102-135/+120
| | | | | | ServerConfigurationTest. Merged virtualhost.xml with config.xml git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813459 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2085 : Set append to true by default. Added QPID_LOG_APPEND variable to ↵Martin Ritchie2009-09-071-1/+1
| | | | | | control setting from the environment git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@812103 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2002: MessageStore Logging , DerbyMS Does not have Queue Recovery ↵Martin Ritchie2009-08-061-0/+3
| | | | | | logging just yet as its approach to recovery does not provide the requried details. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@801572 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2001 : Provide a locale configuration option to allow the localisation ↵Martin Ritchie2009-07-221-0/+1
| | | | | | of logging as part of providing fixed log messages git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796799 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1992 : Corrected duplication in ServerConfiguration for StatusUpdates ↵Martin Ritchie2009-07-221-0/+2
| | | | | | | | and so renamed method getStatusUpdatesEnabled Ensured tested in ServerConfiguration[File]Test and removed standalone test that replicated functionality. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796798 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1980 : Update to ServerConfiguration provided by Keith Chow, Updated ↵Martin Ritchie2009-07-221-0/+2
| | | | | | | | ServerconfigurationTest Added ServerConfigurationFileTest that verifies the string value is loadable from the systest config file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@796796 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1937: add an admin user to the example password fileRobert Gemmell2009-07-131-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@793506 13f79535-47bb-0310-9956-ffa450edef68
* updated config paths to match yesterdays moving of test_resourcesRafael H. Schloming2009-07-093-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@792649 13f79535-47bb-0310-9956-ffa450edef68
* Put the default test profile back to using MemoryMessageStore for now, add ↵Aidan Skinner2009-06-262-3/+141
| | | | | | java-derby and config-systests-derby.xml for testing purpouses. Allow the config file to be specified in the test profile, default to config-systests.xml. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@788680 13f79535-47bb-0310-9956-ffa450edef68
* Use DerbyMessageStore for config-systests.xml, ensure it's cleaned upAidan Skinner2009-06-221-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@787248 13f79535-47bb-0310-9956-ffa450edef68
* Don't delete derby.log. Use virtualhost-systests.xml for testing purpouses. ↵Aidan Skinner2009-05-262-1/+125
| | | | | | Minor code cleanup in AlertingTest. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@778723 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1826: brown paper bag commitAidan Skinner2009-04-231-15/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@767989 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1826: Ensure that server-wide configuration variables in ↵Aidan Skinner2009-04-233-0/+209
| | | | | | virtualhosts.xml are honored. Add sample-flattened parse tree from M4 and test to ensure that values are parsed appropriately. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@767951 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1817 : Update to QpidTestCase to use setUp to start the broker this ↵Martin Ritchie2009-04-161-0/+138
| | | | | | | | allows tests to update the _configFile that is being used before the broker is started. By default the etc/config-systests.xml is used. This differs from the stock config.xml only in that it disables the Managment JMX interface by default. If a test requires this functionality it can provided an edited configuration. An example of how that might be done can be seen in SyncWaitDelayTest and will additionally be provided for QPID-1813. A couple of tests were modified to remove their setUp/tearDown where the code did no additional work. This made the tests cleaner. Additionally FrameworkBaseCase never actually called super.setUp() so that was fixed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@765602 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Add 0.5-fix broker and update SlowMessageStore to use ↵Martin Ritchie2009-04-1416-0/+1197
| | | | | | MessageStores rather than TransactionLogs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764850 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1807 : Remove old broker and FlowToDisk related testsMartin Ritchie2009-04-1416-1197/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@764838 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1704: remove JMXMP ConnectorServer usage from the brokers JMX ↵Robert Gemmell2009-03-023-3/+0
| | | | | | management capabilities git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@749282 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1648: Add LoggingManagement and associated MBean to enable dynamic ↵Aidan Skinner2009-02-252-25/+25
| | | | | | | | 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@747870 13f79535-47bb-0310-9956-ffa450edef68