summaryrefslogtreecommitdiff
path: root/java/broker-plugins/simple-xml
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-06-03 21:27:48 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-06-03 21:27:48 +0000
commitf3ec30568c2b2e03059da573d6c31d4d602b06fd (patch)
tree3daa612782d88ac6df9b36ffae4654dbea1e6d7d /java/broker-plugins/simple-xml
parent388d42d6be196afb5f9803278a45f46199dc9e30 (diff)
downloadqpid-python-f3ec30568c2b2e03059da573d6c31d4d602b06fd.tar.gz
QPID-2581 : Update Plugins that use configuration to only throw ConfigurationExceptions during the configuration phase of loading configuration.
Creating a plugin and providing it with configuration should not throw a configuration exception. Added configuration validation to newer plugins SimpleXML still needs validation. todo Docuement Configuration mechanism. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@951159 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/simple-xml')
-rw-r--r--java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java2
-rw-r--r--java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
index 8c38c6e76c..1bf8761978 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
+++ b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
@@ -76,7 +76,7 @@ public class SimpleXML extends AbstractPlugin
}
};
- public void configure(ConfigurationPlugin config) throws ConfigurationException
+ public void configure(ConfigurationPlugin config)
{
super.configure(config);
diff --git a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
index b73ab97080..e95c21b590 100644
--- a/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
+++ b/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXMLConfiguration.java
@@ -41,17 +41,17 @@ public class SimpleXMLConfiguration extends ConfigurationPlugin
public List<String> getParentPaths()
{
- return Arrays.asList("security", "virtualhosts.virtualhost.security");
+ return Arrays.asList("security.access_control_list", "virtualhosts.virtualhost.security.access_control_list");
}
};
public String[] getElementsProcessed()
{
- return new String[] { "access_control_list" };
+ return new String[] { "" };
}
public Configuration getConfiguration()
{
- return _configuration.subset("access_control_list");
+ return _configuration;
}
}