From c4831a9dae22a7468d9d645902827422c399cb38 Mon Sep 17 00:00:00 2001 From: Nigel Magnay Date: Sat, 28 May 2011 18:11:48 +0100 Subject: [PATCH 1/2] Stage 1 : Create hudson.model.Jenkins, make Hudson derive from Jenkins. Signed-off-by: Nigel Magnay Originally-Committed-As: 70c10658148c3eab3b4c4122705e1ed3a12e193d --- .../src/main/java/hudson/security/LDAPSecurityRealm.java | 9 ++++----- .../webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index 9b038eb..2eeb8fe 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -29,7 +29,7 @@ import static hudson.Util.fixNull; import static hudson.Util.fixEmptyAndTrim; import static hudson.Util.fixEmpty; import hudson.model.Descriptor; -import hudson.model.Hudson; +import hudson.model.Jenkins; import hudson.model.User; import hudson.tasks.MailAddressResolver; import hudson.util.FormValidation; @@ -73,7 +73,6 @@ import java.net.UnknownHostException; import java.util.Collections; import java.util.HashSet; import java.util.Hashtable; -import java.util.Iterator; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -350,7 +349,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm { binding.setVariable("instance", this); BeanBuilder builder = new BeanBuilder(); - builder.parse(Hudson.getInstance().servletContext.getResourceAsStream("/WEB-INF/security/LDAPBindSecurityRealm.groovy"),binding); + builder.parse(Jenkins.getInstance().servletContext.getResourceAsStream("/WEB-INF/security/LDAPBindSecurityRealm.groovy"),binding); WebApplicationContext appContext = builder.createApplicationContext(); ldapTemplate = new LdapTemplate(findBean(InitialDirContextFactory.class, appContext)); @@ -453,7 +452,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm { public static final class MailAdressResolverImpl extends MailAddressResolver { public String findMailAddressFor(User u) { // LDAP not active - SecurityRealm realm = Hudson.getInstance().getSecurityRealm(); + SecurityRealm realm = Jenkins.getInstance().getSecurityRealm(); if(!(realm instanceof LDAPSecurityRealm)) return null; try { @@ -547,7 +546,7 @@ public class LDAPSecurityRealm extends AbstractPasswordBasedSecurityRealm { @QueryParameter final String managerDN, @QueryParameter final String managerPassword) { - if(!Hudson.getInstance().hasPermission(Hudson.ADMINISTER)) + if(!Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER)) return FormValidation.ok(); try { diff --git a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy index 4f0995c..613b00c 100644 --- a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy +++ b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy @@ -28,7 +28,7 @@ import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator2 import org.acegisecurity.ldap.DefaultInitialDirContextFactory import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider -import hudson.model.Hudson +import hudson.model.Jenkins import hudson.security.LDAPSecurityRealm.AuthoritiesPopulatorImpl import hudson.Util import javax.naming.Context @@ -74,7 +74,7 @@ authenticationManager(ProviderManager) { // these providers apply everywhere bean(RememberMeAuthenticationProvider) { - key = Hudson.getInstance().getSecretKey(); + key = Jenkins.getInstance().getSecretKey(); }, // this doesn't mean we allow anonymous access. // we just authenticate anonymous users as such, From 57b0be36a8393976ee61c5aac184bd49c257b281 Mon Sep 17 00:00:00 2001 From: Nigel Magnay Date: Sun, 29 May 2011 10:53:24 +0100 Subject: [PATCH 2/2] Move hudson.model.Jenkins to be jenkins.model.Jenkins - part II Just import changes, from hudson.model.Jenkins -> jenkins.model.Jenkins, and Javadoc comments. Signed-off-by: Nigel Magnay Originally-Committed-As: 5679d019ec7c1be89d5ea2b2a964ac143695d474 --- core/src/main/java/hudson/security/LDAPSecurityRealm.java | 2 +- .../main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index 2eeb8fe..e76f43c 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -29,7 +29,7 @@ import static hudson.Util.fixNull; import static hudson.Util.fixEmptyAndTrim; import static hudson.Util.fixEmpty; import hudson.model.Descriptor; -import hudson.model.Jenkins; +import jenkins.model.Jenkins; import hudson.model.User; import hudson.tasks.MailAddressResolver; import hudson.util.FormValidation; diff --git a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy index 613b00c..db70277 100644 --- a/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy +++ b/war/src/main/webapp/WEB-INF/security/LDAPBindSecurityRealm.groovy @@ -28,7 +28,7 @@ import org.acegisecurity.providers.ldap.authenticator.BindAuthenticator2 import org.acegisecurity.ldap.DefaultInitialDirContextFactory import org.acegisecurity.ldap.search.FilterBasedLdapUserSearch import org.acegisecurity.providers.rememberme.RememberMeAuthenticationProvider -import hudson.model.Jenkins +import jenkins.model.Jenkins import hudson.security.LDAPSecurityRealm.AuthoritiesPopulatorImpl import hudson.Util import javax.naming.Context