they are no longer proxies.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14205 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/security/LegacySecurityRealm.java

@@ -54,9 +54,7 @@ public final class LegacySecurityRealm extends SecurityRealm implements Authenti
     public Filter createFilter(FilterConfig filterConfig) {
         Binding binding = new Binding();
         SecurityComponents sc = this.createSecurityComponents();
-        binding.setVariable("authenticationManagerProxy", sc.manager);
-        binding.setVariable("userDetailsServiceProxy", sc.userDetails);
-        binding.setVariable("rememberMeServicesProxy", sc.rememberMe);
+        binding.setVariable("securityComponents", sc);
         BeanBuilder builder = new BeanBuilder();
         builder.parse(filterConfig.getServletContext().getResourceAsStream("/WEB-INF/security/SecurityFilters.groovy"),binding);
         

core/src/main/java/hudson/security/SecurityRealm.java

@@ -240,10 +240,8 @@ public abstract class SecurityRealm implements Describable<SecurityRealm>, Exten
      */
     public Filter createFilter(FilterConfig filterConfig) {
         Binding binding = new Binding();
-        SecurityComponents sc = this.getSecurityComponents();
-        binding.setVariable("authenticationManagerProxy", sc.manager);
-        binding.setVariable("userDetailsServiceProxy", sc.userDetails);
-        binding.setVariable("rememberMeServicesProxy", sc.rememberMe);
+        SecurityComponents sc = this.createSecurityComponents();
+        binding.setVariable("securityComponents", sc);
         BeanBuilder builder = new BeanBuilder();
         builder.parse(filterConfig.getServletContext().getResourceAsStream("/WEB-INF/security/SecurityFilters.groovy"),binding);
         WebApplicationContext context = builder.createApplicationContext();

war/resources/WEB-INF/security/SecurityFilters.groovy

@@ -40,7 +40,7 @@ filter(ChainedServletFilter) {
         },
         // allow clients to submit basic authentication credential
         bean(BasicProcessingFilter) {
-            authenticationManager = authenticationManagerProxy
+            authenticationManager = securityComponents.manager
             // if basic authentication fails (which only happens incorrect basic auth credential is sent),
             // respond with 401 with basic auth request, instead of redirecting the user to the login page,
             // since users of basic auth tends to be a program and won't see the redirection to the form
@@ -50,15 +50,15 @@ filter(ChainedServletFilter) {
             }
         },
         bean(AuthenticationProcessingFilter2) {
-            authenticationManager = authenticationManagerProxy
-            rememberMeServices = rememberMeServicesProxy;
+            authenticationManager = securityComponents.manager
+            rememberMeServices = securityComponents.rememberMe
             authenticationFailureUrl = "/loginError"
             defaultTargetUrl = "/"
             filterProcessesUrl = "/j_acegi_security_check"
         },
         bean(RememberMeProcessingFilter) {
-            rememberMeServices = rememberMeServicesProxy;
-            authenticationManager = authenticationManagerProxy;
+            rememberMeServices = securityComponents.rememberMe
+            authenticationManager = securityComponents.manager
         },
     ] + commonProviders("/login?from={0}")
 }