apply patch for GRAILS-6830 "_GrailsCreateArtifacts script should loo…

…k for artifact templates also in plugin directories configured using grails.plugin.location entries in build config"
grails · Nov 19, 2012 · e5d0ca1 · e5d0ca1 · Yuri-Loop · Jan 11, 2013
1 parent 51c4921
commit e5d0ca1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/scripts/_GrailsCreateArtifacts.groovy b/scripts/_GrailsCreateArtifacts.groovy
@@ -80,11 +80,11 @@ createArtifact = { Map args = [:] ->
     templateFile = new FileSystemResource("${basedir}/src/${templatePath}/${type ?: lastType}.groovy")
     if (!templateFile.exists()) {
         // now check for template provided by plugins
-        def pluginTemplateFiles = resolveResources("file:${pluginsHome}/*/src/${templatePath}/${type ?: lastType}.groovy")
+        def possibleResources = pluginSettings.pluginDirectories.collect { dir ->
-        if (pluginTemplateFiles) {
+            new FileSystemResource("${dir.path}/src/templates/artifacts/${type ?: lastType}.groovy")
-            templateFile = pluginTemplateFiles[0]
+        }   
-        }
+        templateFile = possibleResources.find { it.exists() }
-        else {
+        if (!templateFile) {
             // template not found in application, use default template
             templateFile = grailsResource("src/grails/${templatePath}/${type ?: lastType}.groovy")
         }