summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-08-03 13:18:25 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-08-03 13:18:25 +0000
commitf3949615036dd5804e7fc778dab8bb2983c3625b (patch)
tree25ef0ef8d7d9c9dd7227917a7b33004fe17a1a20 /qpid/java/broker/src/main
parenta41860cbb3e859bc90bb8d1259a7a6be39e1557b (diff)
downloadqpid-python-f3949615036dd5804e7fc778dab8bb2983c3625b.tar.gz
QPID-2011 : Updated AlertingTest to use new LogMonitoring class and corrected failures in test.
Failures corrected by: - Ensuring message count is as expected after first publication - Validating that the max count alert level is correctly changed (when InVM) - Validate that the log file does not contain alerts after restart - Validate that alerting occurs after extra messages have been published - Modified QPID_WORK (using QTC.setSystemProperty so it is only set for that test run) to ensure each test has a clean store. Additions to QpidTestCase: - Ability to enable persistence on a given virtualhost. Currently it tries to set the JBoss BerkelyDB store failing back to Qpid's DerbyDB store. - Ability to set properties in the configuration file, this involves re-writting the config files so that both inVM and external java brokers will correctly function with the desired configuration. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@800356 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
index e56f1cda12..90b4590d4c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
@@ -256,7 +256,7 @@ public class ServerConfiguration implements SignalHandler
// Our configuration class needs to make the interpolate method
// public so it can be called below from the config method.
- private static class MyConfiguration extends CompositeConfiguration
+ public static class MyConfiguration extends CompositeConfiguration
{
public String interpolate(String obj)
{
@@ -264,7 +264,7 @@ public class ServerConfiguration implements SignalHandler
}
}
- private final static Configuration flatConfig(File file) throws ConfigurationException
+ public final static Configuration flatConfig(File file) throws ConfigurationException
{
// We have to override the interpolate methods so that
// interpolation takes place accross the entirety of the