Skip to content
Browse files

fixed failing functional tests

  • Loading branch information...
1 parent 3033cb2 commit 2f7920b93c72b84bec308674194da3278581bdad @graemerocher graemerocher committed
Showing with 2 additions and 9 deletions.
  1. +1 −7 scripts/_GrailsBootstrap.groovy
  2. +1 −1 scripts/_GrailsRun.groovy
  3. +0 −1 scripts/_PluginDependencies.groovy
View
8 scripts/_GrailsBootstrap.groovy
@@ -45,13 +45,7 @@ target(loadApp:"Loads the Grails application object") {
profile("Loading parent ApplicationContext") {
def builder = parentContext ? new WebBeanBuilder(parentContext) : new WebBeanBuilder()
beanDefinitions = builder.beans {
- resourceHolder(GrailsResourceHolder) {
- resources = pluginSettings.artefactResources
- }
- grailsResourceLoader(GrailsResourceLoaderFactoryBean) {
- grailsResourceHolder = resourceHolder
- }
- grailsApplication(DefaultGrailsApplication, ref("grailsResourceLoader"))
+ grailsApplication(DefaultGrailsApplication, pluginSettings.getArtefactResourcesForCurrentEnvironment())
}
}
View
2 scripts/_GrailsRun.groovy
@@ -143,5 +143,5 @@ target(keepServerAlive: "Idles the script, ensuring that the server stays runnin
}
target(stopServer: "Stops the Grails servlet container") {
- projectWatcher.stopServer()
+ projectWatcher?.stopServer()
}
View
1 scripts/_PluginDependencies.groovy
@@ -255,7 +255,6 @@ protected void resetClasspath() {
classpathSet = false
classpath()
PluginManagerHolder.pluginManager = null
- GrailsResourceLoaderHolder.resourceLoader = new GrailsResourceLoader(pluginSettings.getArtefactResourcesForCurrentEnvironment())
}
doInstallPluginFromURL = { URL url ->

0 comments on commit 2f7920b

Please sign in to comment.
Something went wrong with that request. Please try again.