diff options
Diffstat (limited to 'java/broker/src')
6 files changed, 15 insertions, 28 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java b/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java index 252bd711e8..27bb050db4 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java @@ -19,14 +19,11 @@ package org.apache.qpid.server.plugins; import org.apache.commons.configuration.ConfigurationException; +import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin; public interface Plugin { - /** - * The name of this plugin. - */ - String getPluginName(); - + /** * Is this plugin configured?. */ @@ -35,5 +32,5 @@ public interface Plugin /** * Configure this plugin */ - void configure() throws ConfigurationException; + public void configure(ConfigurationPlugin config) throws ConfigurationException; } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java index 8c9c2050e8..e0813b1fa7 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java @@ -35,11 +35,6 @@ public abstract class AbstractPlugin implements SecurityPlugin public ConfigurationPlugin _config; - public String getPluginName() - { - return getClass().getSimpleName(); - } - public Result getDefault() { return Result.ABSTAIN; diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java index 82963bbadc..7525362bfc 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java @@ -57,8 +57,8 @@ public class AllowAll extends BasicPlugin { public AllowAll newInstance(ConfigurationPlugin config) throws ConfigurationException { - AllowAll plugin = new AllowAll(config); - plugin.configure(); + AllowAll plugin = new AllowAll(); + plugin.configure(config); return plugin; } @@ -79,8 +79,8 @@ public class AllowAll extends BasicPlugin return Result.ALLOWED; } - public AllowAll(ConfigurationPlugin config) + public void configure(ConfigurationPlugin config) throws ConfigurationException { _config = config.getConfiguration(AllowAllConfiguration.class); - } + } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java index 5fc1ef7795..f3161551dc 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java @@ -31,7 +31,7 @@ import org.apache.qpid.server.security.access.Operation; /** * This {@link SecurityPlugin} simply abstains from all authorisation requests and ignores configuration. */ -public class BasicPlugin extends AbstractPlugin +public abstract class BasicPlugin extends AbstractPlugin { public Result access(ObjectType objectType, Object instance) { @@ -42,10 +42,4 @@ public class BasicPlugin extends AbstractPlugin { return getDefault(); } - - @Override - public void configure() throws ConfigurationException - { - // Not used - } } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java index 24af215a0c..7647072abc 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java @@ -57,8 +57,8 @@ public class DenyAll extends BasicPlugin { public DenyAll newInstance(ConfigurationPlugin config) throws ConfigurationException { - DenyAll plugin = new DenyAll(config); - plugin.configure(); + DenyAll plugin = new DenyAll(); + plugin.configure(config); return plugin; } @@ -79,8 +79,9 @@ public class DenyAll extends BasicPlugin return Result.DENIED; } - public DenyAll(ConfigurationPlugin config) throws ConfigurationException + public void configure(ConfigurationPlugin config) throws ConfigurationException { _config = config.getConfiguration(DenyAllConfiguration.class); } + } diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java index 2c0994b52a..d2b72503a4 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java @@ -58,8 +58,8 @@ public class LegacyAccess extends BasicPlugin { public LegacyAccess newInstance(ConfigurationPlugin config) throws ConfigurationException { - LegacyAccess plugin = new LegacyAccess(config); - plugin.configure(); + LegacyAccess plugin = new LegacyAccess(); + plugin.configure(config); return plugin; } @@ -74,7 +74,7 @@ public class LegacyAccess extends BasicPlugin } }; - public LegacyAccess(ConfigurationPlugin config) throws ConfigurationException + public void configure(ConfigurationPlugin config) throws ConfigurationException { _config = config.getConfiguration(LegacyAccessConfiguration.class); } |