From 2b8498cf6a77b5d79bd5dd56fdaa12ef0dd8893d Mon Sep 17 00:00:00 2001 From: alexbeardsley Date: Wed, 2 Jul 2014 16:38:28 -0400 Subject: [PATCH] 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 --- .../reload/filters/ReloadedScopedBeanFiltersReloader.groovy | 6 +++--- .../request/RequestScopedBeanReloadSessionPurger.groovy | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/groovy/grails/plugin/scopedproxy/reload/filters/ReloadedScopedBeanFiltersReloader.groovy b/src/groovy/grails/plugin/scopedproxy/reload/filters/ReloadedScopedBeanFiltersReloader.groovy index fe876e3..bb2dca8 100644 --- 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/src/groovy/grails/plugin/scopedproxy/reload/request/RequestScopedBeanReloadSessionPurger.groovy b/src/groovy/grails/plugin/scopedproxy/reload/request/RequestScopedBeanReloadSessionPurger.groovy index 4a7db02..8631ea1 100644 --- a/src/groovy/grails/plugin/scopedproxy/reload/request/RequestScopedBeanReloadSessionPurger.groovy +++ b/src/groovy/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