fix failing functional test

graemerocher · graemerocher · commit 53fc75922c33 · 2012-09-11T17:49:15.000+02:00
diff --git a/grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/publishing/PluginDescriptorGenerator.groovy b/grails-core/src/main/groovy/org/codehaus/groovy/grails/plugins/publishing/PluginDescriptorGenerator.groovy
@@ -136,7 +136,8 @@ class PluginDescriptorGenerator {
                     if (pluginProps[p]) "${p}"(pluginProps[p])
                 }
                 xml.resources {
-                    File commonResourceBase = filterPluginDir(pluginProps['pluginDir']?.file)
+                    final pluginDir = pluginProps['pluginDir'] instanceof String ? new File(pluginProps['pluginDir']) : pluginProps['pluginDir']?.file
+                    File commonResourceBase = filterPluginDir(pluginDir)
 
                     for (r in resourceList) {
                         def matcher = r.URL.toString() =~ ARTEFACT_PATTERN

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ class PluginDescriptorGenerator {`
`136`	`136`	`if (pluginProps[p]) "${p}"(pluginProps[p])`
`137`	`137`	`}`
`138`	`138`	`xml.resources {`
`139`		`- File commonResourceBase = filterPluginDir(pluginProps['pluginDir']?.file)`
	`139`	`+ final pluginDir = pluginProps['pluginDir'] instanceof String ? new File(pluginProps['pluginDir']) : pluginProps['pluginDir']?.file`
	`140`	`+ File commonResourceBase = filterPluginDir(pluginDir)`
`140`	`141`
`141`	`142`	`for (r in resourceList) {`
`142`	`143`	`def matcher = r.URL.toString() =~ ARTEFACT_PATTERN`