From db2daee6568f8292a23d4bfc82c8a40be9979ffd Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Tue, 19 Aug 2014 11:58:06 +0000 Subject: QPID-6018 : [Java Broker] Add an attribute to the ManagedObject annotation to signify that the given object should not be registered in the meta-data registry git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618846 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/model/ManagedObject.java | 1 + .../qpid/server/security/auth/manager/SimpleAuthenticationManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker-core') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java index 8cfb84135e..f18869bced 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ManagedObject.java @@ -35,4 +35,5 @@ public @interface ManagedObject boolean creatable() default true; String defaultType() default ""; // in this case the class/interface itself is to be used String type() default ""; + boolean register() default true; } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java index 5b62f7cffd..0e532cee89 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java @@ -46,7 +46,7 @@ import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.auth.sasl.plain.PlainPasswordCallback; import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer; -@ManagedObject( category = false, type = "Simple" ) +@ManagedObject( category = false, type = "Simple", register = false ) public class SimpleAuthenticationManager extends AbstractAuthenticationManager { private static final Logger _logger = Logger.getLogger(SimpleAuthenticationManager.class); -- cgit v1.2.1