From 77adf5325bc90812ac7b5857d76b6fd5a8c0d117 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Tue, 24 Feb 2009 00:05:47 +0000 Subject: [PATCH] Existing SecurityRealm implementations are converted for auto-discovery. I also used the active directory plugin to make sure that the binary compatibility with old plugins are working git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15607 71c3de6d-444a-0410-be80-ed276b4c234a Originally-Committed-As: 6852bba554a9948e95d8147c34261067f8f3690c --- .../main/java/hudson/security/LDAPSecurityRealm.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index 8e41524..1ebdd42 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -26,6 +26,7 @@ package hudson.security; import com.sun.jndi.ldap.LdapCtxFactory; import groovy.lang.Binding; import hudson.Util; +import hudson.Extension; import hudson.tasks.MailAddressResolver; import hudson.model.Descriptor; import hudson.model.Hudson; @@ -406,12 +407,7 @@ public class LDAPSecurityRealm extends SecurityRealm { } } - public DescriptorImpl getDescriptor() { - return DESCRIPTOR; - } - - public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - + @Extension public static final class DescriptorImpl extends Descriptor { public String getDisplayName() { return Messages.LDAPSecurityRealm_DisplayName(); @@ -478,10 +474,6 @@ public class LDAPSecurityRealm extends SecurityRealm { else return "ldap://"+server; } - static { - LIST.add(DESCRIPTOR); - } - private static final Logger LOGGER = Logger.getLogger(LDAPSecurityRealm.class.getName()); /**