Rename bean that conflicts with different bean

graemerocher · graemerocher · commit 4a6bfcc8e12b · 2016-12-20T12:49:51.000+01:00
diff --git a/grails-core/src/main/groovy/org/grails/plugins/CoreGrailsPlugin.groovy b/grails-core/src/main/groovy/org/grails/plugins/CoreGrailsPlugin.groovy
@@ -110,7 +110,7 @@ class CoreGrailsPlugin extends Plugin {
             grailsContext.'component-scan'('base-package':packagesToScan.join(','))
         }
 
-        grailsApplicationPostProcessor(GrailsApplicationAwareBeanPostProcessor, ref("grailsApplication"))
+        grailsApplicationAwarePostProcessor(GrailsApplicationAwareBeanPostProcessor, ref("grailsApplication"))
         pluginManagerPostProcessor(PluginManagerAwareBeanPostProcessor)
 
         classLoader(MethodInvokingFactoryBean) {

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class CoreGrailsPlugin extends Plugin {`
`110`	`110`	`grailsContext.'component-scan'('base-package':packagesToScan.join(','))`
`111`	`111`	`}`
`112`	`112`
`113`		`- grailsApplicationPostProcessor(GrailsApplicationAwareBeanPostProcessor, ref("grailsApplication"))`
	`113`	`+ grailsApplicationAwarePostProcessor(GrailsApplicationAwareBeanPostProcessor, ref("grailsApplication"))`
`114`	`114`	`pluginManagerPostProcessor(PluginManagerAwareBeanPostProcessor)`
`115`	`115`
`116`	`116`	`classLoader(MethodInvokingFactoryBean) {`