fix for GRAILS-3929 "Configuration file not found in grails-app/conf when executing "grails run-app" (directory not added to classpath?)"

Author: graemerocher

grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy

@@ -15,6 +15,8 @@
  */
 package grails.util
 
+import org.codehaus.groovy.grails.io.support.IOUtils
+
 import static grails.build.logging.GrailsConsole.instance as CONSOLE
 import grails.build.logging.GrailsConsole
 import groovy.transform.CompileStatic
@@ -1612,4 +1614,35 @@ class BuildSettings extends AbstractBuildSettings {
     boolean isPluginProject() {
         getBasePluginDescriptor() != null
     }
+
+    @CompileStatic
+    void initializeResourcesDir() {
+        def targetPath = resourcesDir.path
+        def dir = new File(baseDir, "grails-app/conf")
+        resourcesDir.mkdirs()
+        if (dir.exists()) {
+            try {
+                copyDirectoryContentsToTarget(dir, targetPath)
+            } catch (e) {
+                GrailsConsole.getInstance().error("Error initializing resources from grails-app/conf: ${e.message}", e)
+            }
+        }
+
+    }
+    @CompileStatic
+    protected void copyDirectoryContentsToTarget(File dir, String targetPath) {
+        dir.eachFile { File f ->
+            final isFile = !f.isDirectory()
+            final isHidden = f.isHidden()
+            if (isFile && !isHidden && !f.name.endsWith('.groovy')) {
+                IOUtils.copy(f, new File(targetPath, f.name))
+            }
+            else if (!isFile && !isHidden) {
+                final fileName = f.name
+                if (fileName != 'hibernate' && fileName != 'spring') {
+                    copyDirectoryContentsToTarget(f, new File(targetPath, fileName).path)
+                }
+            }
+        }
+    }
 }

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/cli/GrailsScriptRunner.java

@@ -350,6 +350,7 @@ private int executeCommand(CommandLine commandLine, String scriptName, String en
 
             console.updateStatus("Loading Grails " + settings.getGrailsVersion());
             settings.loadConfig();
+            settings.initializeResourcesDir();
 
             System.setProperty("springloaded.directoriesContainingReloadableCode",
                    settings.getClassesDir().getAbsolutePath() + ',' +

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/io/support/FileSystemResource.java

@@ -195,4 +195,9 @@ protected void assertNotNull(Object object, String message) {
             throw new IllegalArgumentException(message);
         }
     }
+
+    @Override
+    public String toString() {
+        return file.toString();
+    }
 }

grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/io/support/UrlResource.java

@@ -190,4 +190,8 @@ public int hashCode() {
         return cleanedUrl.hashCode();
     }
 
+    @Override
+    public String toString() {
+        return getDescription();
+    }
 }

grails-core/src/main/groovy/org/codehaus/groovy/grails/project/packaging/GrailsProjectPackager.groovy

@@ -245,6 +245,11 @@ class GrailsProjectPackager extends BaseSettingsApi {
      */
     @CompileStatic
     ConfigObject packageApplication() {
+        try {
+            packageConfigFiles(basedir)
+        } catch (Throwable e) {
+            throw new PackagingException("Error occurred packaging configuration files: ${e.message}", e)
+        }
 
         if (doCompile) {
             projectCompiler.compilePlugins()
@@ -276,11 +281,7 @@ class GrailsProjectPackager extends BaseSettingsApi {
             throw new PackagingException("Error occurred processing message bundles: ${e.message}", e)
         }
 
-        try {
-            packageConfigFiles(basedir)
-        } catch (Throwable e) {
-            throw new PackagingException("Error occurred packaging configuration files: ${e.message}", e)
-        }
+
 
         packageMetadataFile()