summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/main
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-05-21 21:09:52 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-05-21 21:09:52 +0000
commitfce28bba8259967c9dbb14b9ce45412bd6da4361 (patch)
tree07c937dd58ddee2334ac4fb8c58ea59b9e6d7282 /qpid/java/broker/src/main
parentd59603494b0bc8a50853241d8ad1e5c479f9eced (diff)
downloadqpid-python-fce28bba8259967c9dbb14b9ce45412bd6da4361.tar.gz
QPID-2581 : Update ConfigurationPlugin to provide a validateConfiguration() method simplifying the plugins
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@947177 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/QueueConfiguration.java6
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java6
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java6
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java4
4 files changed, 22 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
index ee68143a2d..adbb0059d8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
@@ -68,6 +68,12 @@ public class QueueConfiguration extends ConfigurationPlugin
};
}
+ @Override
+ public void validateConfiguration() throws ConfigurationException
+ {
+ //Currently doesn't do validation
+ }
+
public VirtualHostConfiguration getVirtualHostConfiguration()
{
return _vHostConfig;
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 fe399669fd..8f9bded82a 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
@@ -192,6 +192,12 @@ public class ServerConfiguration extends ConfigurationPlugin implements SignalHa
return new String[]{""};
}
+ @Override
+ public void validateConfiguration() throws ConfigurationException
+ {
+ //Currently doesn't do validation
+ }
+
/*
* Modified to enforce virtualhosts configuration in external file or main file, but not
* both, as a fix for QPID-2360 and QPID-2361.
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
index ca1f25952e..00b109f33b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
@@ -206,6 +206,12 @@ public class VirtualHostConfiguration extends ConfigurationPlugin
}
+ @Override
+ public void validateConfiguration() throws ConfigurationException
+ {
+ //Currently doesn't do validation
+ }
+
public int getHouseKeepingThreadCount()
{
return getIntValue("housekeeping.poolSize", Runtime.getRuntime().availableProcessors());
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
index e6306b70d5..cb21f07eaf 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
@@ -156,8 +156,12 @@ public abstract class ConfigurationPlugin
_pluginConfiguration.put(elementHandler.getClass(), elementHandler);
}
}
+
+ validateConfiguration();
}
+ abstract public void validateConfiguration() throws ConfigurationException;
+
protected boolean hasConfiguration()
{
return _configuration != null;