Replacing reference to deprecated PluginManagerHolder

org.codehaus.groovy.grails.plugins.PluginManagerHolder was deprecated in 2.2 and has been completely removed in 2.4, causing the compilation to fail with 2.4.x
ldaley · Jul 2, 2014 · 2b8498c · 2b8498c
1 parent 45649d4
commit 2b8498c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/groovy/grails/plugin/scopedproxy/reload/filters/ReloadedScopedBeanFiltersReloader.groovy b/src/groovy/grails/plugin/scopedproxy/reload/filters/ReloadedScopedBeanFiltersReloader.groovy
@@ -18,7 +18,7 @@ package grails.plugin.scopedproxy.reload.filters
 import grails.plugin.scopedproxy.reload.ScopedBeanReloadListener
 import org.slf4j.LoggerFactory
 import org.codehaus.groovy.grails.plugins.web.filters.FiltersConfigArtefactHandler
-import org.codehaus.groovy.grails.plugins.PluginManagerHolder
+import grails.util.Holders
 import org.codehaus.groovy.grails.plugins.web.filters.FilterConfig
 
 class ReloadedScopedBeanFiltersReloader implements ScopedBeanReloadListener {
@@ -79,13 +79,13 @@ class ReloadedScopedBeanFiltersReloader implements ScopedBeanReloadListener {
 	}
 
 	protected getFiltersPlugin() {
-		PluginManagerHolder.pluginManager.getGrailsPlugin('filters')
+		Holders.pluginManager.getGrailsPlugin('filters')
 	}
 
 	protected triggerFiltersReload(Class triggeringFiltersClass) {
 		GroovySystem.metaClassRegistry.removeMetaClass(FilterConfig)
 		filtersPlugin.doWithDynamicMethods(grailsApplication.mainContext)
-		PluginManagerHolder.pluginManager.informOfClassChange(triggeringFiltersClass)
+		Holders.pluginManager.informOfClassChange(triggeringFiltersClass)
 	}
 
 	private static final log = LoggerFactory.getLogger(ReloadedScopedBeanFiltersReloader)

diff --git a/...oovy/grails/plugin/scopedproxy/reload/request/RequestScopedBeanReloadSessionPurger.groovy b/...oovy/grails/plugin/scopedproxy/reload/request/RequestScopedBeanReloadSessionPurger.groovy
@@ -18,7 +18,6 @@ package grails.plugin.scopedproxy.reload.request
 import grails.plugin.scopedproxy.reload.ScopedBeanReloadListener
 import org.slf4j.LoggerFactory
 import org.codehaus.groovy.grails.plugins.web.filters.FiltersConfigArtefactHandler
-import org.codehaus.groovy.grails.plugins.PluginManagerHolder
 import org.codehaus.groovy.grails.plugins.web.filters.FilterConfig
 import grails.plugin.scopedproxy.ScopedProxyUtils as SPU