summaryrefslogtreecommitdiff
path: root/qpid/java/broker/etc
Commit message (Collapse)AuthorAgeFilesLines
* 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
* QPID-1511 : Adds authentication and ssl encryption capabilities to the RMI ↵Aidan Skinner2009-02-133-3/+23
| | | | | | | | 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-1626: Add per-virtualhost authorization plugins.Aidan Skinner2009-02-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* removed incubating from various shell scripts, release artifacts, and READMEsRafael H. Schloming2008-12-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@724948 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1469: turn off jmx management by default as it's not authenticated.Aidan Skinner2008-12-023-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@722532 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1486 : Removed alert.log and ensured output goes to qpid.log by ↵Martin Ritchie2008-11-251-15/+1
| | | | | | default. Only broker startup info is shown on standard output. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@720477 13f79535-47bb-0310-9956-ffa450edef68
* Reverted log4j changeMartin Ritchie2008-11-181-34/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@718555 13f79535-47bb-0310-9956-ffa450edef68
* Update log4j to be more usefulMartin Ritchie2008-11-071-8/+34
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@712109 13f79535-47bb-0310-9956-ffa450edef68
* This is a fix for the problem identified in QPID-943.Rajith Muditha Attapattu2008-09-251-0/+3
| | | | | | | | | If msg-auth is configured as true in config.xml the user_id in message properties is verified against the id used at authentication. If not an exception with error code 403 is thrown. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@699044 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1182 : Added additional logging to identify the exception that caused ↵Martin Ritchie2008-07-171-1/+1
| | | | | | Authentication to fail. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@677633 13f79535-47bb-0310-9956-ffa450edef68
* This commit is for QPID-992 and QPID-993Rajith Muditha Attapattu2008-05-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build.xml ========== I added the broker-plugins as a module to the ant build system. This was nessacery to get the plugins jar generated for QPID-993. In general when we add extra exchanges as plugins we want release this as a separate jar common.xml ========== Added a property build.plugins. This is used to create the plugins dir that is used for PluginTest noted in QPID-993. module.xml ========== Creats the folder identified by build.plugins copys the plugins jar to the above folder before the tests are run Added the following system properties when running tests "example.plugin.target" to build.plugins - required for QPID-993 "QPID_EXAMPLE_HOME" and "QPID_HOME" is to project.root/broker to pick up the config files in etc - required for QPID-992. build.deps ========== added common libs and felix libs for the broker-plugins module. This is for QPID-993 acl.config.xml ============== Added TempQueue as a routing key allowed for publish to amq.direct for user "server" This was done for QPID-992 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@652409 13f79535-47bb-0310-9956-ffa450edef68
* QPID-832 copy the M2.x brokerAidan Skinner2008-04-2316-0/+1186
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@651112 13f79535-47bb-0310-9956-ffa450edef68
* Delete stuff that's just going to get synced from M2.xAidan Skinner2008-04-2315-1079/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@651111 13f79535-47bb-0310-9956-ffa450edef68
* Remerge of M2. All tests pass locallyMartin Ritchie2007-08-306-15/+238
| | | | | | | | | | | | | | | | Testing done in Intelij and mvn command line via windows/cygwin. Python tests removed from auto build pending Jython-siztion. Tested running broker in intelij and python run-tests from cygwin. All tests pass. (CombinedTest still exhibts a race condition. but that has always been so.) Additional Race condition identified (around MsgReject/AutoDeleteQueues) during testing patch to follow. systests are inconsistent Some use TestableMemoryMessageStore some use MemoryMessgaeStore. Lets not roll back this change if issues are discovered. Lets work together to go forward and address any issues. I have spent a lot of time ensuring the tests work for me so I hope that they work for you. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@571129 13f79535-47bb-0310-9956-ffa450edef68
* Rolled back revision 561365 and commented out some broken code in ↵Rafael H. Schloming2007-07-314-250/+7
| | | | | | ClientSession.java. The trunk should now build. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@561578 13f79535-47bb-0310-9956-ffa450edef68