From 53fc75922c3305f20eb21e97ba13c5440e00a251 Mon Sep 17 00:00:00 2001
From: Graeme Rocher <graeme.rocher@gmail.com>
Date: Tue, 11 Sep 2012 17:49:15 +0200
Subject: [PATCH] fix failing functional test

---
 .../grails/plugins/publishing/PluginDescriptorGenerator.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index c8373e21462..99b6716756c 100644
--- 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