Use correct grailsApplication object for plugin binding

Author: graemerocher

grails-core/src/main/groovy/org/grails/plugins/DefaultGrailsPlugin.java

@@ -544,8 +544,8 @@ private void invokePluginHook(String methodName, Object[] args, ApplicationConte
 
     public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig) {
         Binding b = new Binding();
-        b.setVariable("application", application);
-        b.setVariable(GrailsApplication.APPLICATION_ID, application);
+        b.setVariable("application", grailsApplication);
+        b.setVariable(GrailsApplication.APPLICATION_ID, grailsApplication);
         b.setVariable("manager", getManager());
         b.setVariable("plugin", this);
         b.setVariable("parentCtx", getParentCtx());
@@ -554,7 +554,7 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
         if(plugin instanceof Plugin) {
             Closure c = ((Plugin) plugin).doWithSpring();
             if(c != null) {
-                BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, application.getClassLoader());
+                BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
                 bb.setBinding(b);
                 bb.invokeMethod("beans", new Object[]{c});
             }
@@ -570,7 +570,7 @@ public void doWithRuntimeConfiguration(RuntimeSpringConfiguration springConfig)
             }
 
             Closure c = (Closure)plugin.getProperty(DO_WITH_SPRING);
-            BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, application.getClassLoader());
+            BeanBuilder bb = new BeanBuilder(getParentCtx(),springConfig, grailsApplication.getClassLoader());
             bb.setBinding(b);
             c.setDelegate(bb);
             bb.invokeMethod("beans", new Object[]{c});