move scripts out of root to 'grails-scripts' projects to avoid proble…

…ms with gradle IDE integration

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

@@ -395,8 +395,9 @@ class BuildSettings extends AbstractBuildSettings {
             Object doCall(String name) {
                 if(grailsHome != null) {
 
-                    def potentialScript = new File(grailsHome, "scripts/${name}.groovy")
-                    potentialScript = potentialScript.exists() ? potentialScript : new File(grailsHome, "scripts/${name}_.groovy")
+                    def potentialScript = new File(grailsHome, "grails-scripts/src/main/scripts/${name}.groovy")
+                    potentialScript = potentialScript.exists() ? potentialScript : new File(grailsHome, "grails-scripts/src/main/scripts/${name}_.groovy")
+
                     if (potentialScript.exists()) {
                         return potentialScript
                     }

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

@@ -367,6 +367,7 @@ class PluginBuildSettings {
             def basedir = buildSettings.baseDir.absolutePath
             if (grailsHome != null) {
                 resourceResolver("file:${grailsHome}/scripts/**.groovy").each { if (!it.file.name.startsWith('_')) scripts << it }
+                resourceResolver("file:${grailsHome}/grails-scripts/src/main/scripts/**.groovy").each { if (!it.file.name.startsWith('_')) scripts << it }
             }
             resourceResolver("file:${basedir}/scripts/*.groovy").each { if (!it.file.name.startsWith('_')) scripts << it }
             pluginScripts.each { if (!it.file.name.startsWith('_')) scripts << it }

grails-scripts/build.gradle

@@ -46,7 +46,7 @@ dependencies {
 sourceSets {
     main {
         compileClasspath += files(configurations.scripts)
-        groovy.srcDirs = ['../scripts']
+        groovy.srcDirs = ['src/main/scripts']
     }
 }
 

scripts/BugReport.groovy → grails-scripts/src/main/scripts/BugReport.groovy

@@ -1,49 +1,49 @@
-/*
- * Copyright 2004-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Gant script that creates a ZIP file creating just the artifacts from a project, for attaching to a JIRA issue
- *
- * @author Marc Palmer
- * @since 0.4
- */
-
-import java.text.SimpleDateFormat
-
-includeTargets << grailsScript("_GrailsInit")
-
-target(bugReport: "Creates a ZIP containing source artifacts for reporting bugs") {
-    depends(checkVersion)
-
-    String fileName = new File(basedir).name
-    String date = new SimpleDateFormat("ddMMyyyy").format(new Date())
-    String zipName = "$basedir/${fileName}-bug-report-${date}.zip"
-
-    ant.zip(destfile: zipName, filesonly: true) {
-        fileset(dir: basedir) {
-            include name: 'grails-app/**'
-            include name: 'src/**'
-            include name: 'test/**'
-            include name: 'scripts/**'
-            include name: '*GrailsPlugin.groovy'
-        }
-        fileset file: "$basedir/application.properties"
-    }
-
-    event("StatusFinal", ["Created bug-report ZIP at $zipName"])
-}
-
-setDefaultTarget 'bugReport'
+/*
+ * Copyright 2004-2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Gant script that creates a ZIP file creating just the artifacts from a project, for attaching to a JIRA issue
+ *
+ * @author Marc Palmer
+ * @since 0.4
+ */
+
+import java.text.SimpleDateFormat
+
+includeTargets << grailsScript("_GrailsInit")
+
+target(bugReport: "Creates a ZIP containing source artifacts for reporting bugs") {
+    depends(checkVersion)
+
+    String fileName = new File(basedir).name
+    String date = new SimpleDateFormat("ddMMyyyy").format(new Date())
+    String zipName = "$basedir/${fileName}-bug-report-${date}.zip"
+
+    ant.zip(destfile: zipName, filesonly: true) {
+        fileset(dir: basedir) {
+            include name: 'grails-app/**'
+            include name: 'src/**'
+            include name: 'test/**'
+            include name: 'scripts/**'
+            include name: '*GrailsPlugin.groovy'
+        }
+        fileset file: "$basedir/application.properties"
+    }
+
+    event("StatusFinal", ["Created bug-report ZIP at $zipName"])
+}
+
+setDefaultTarget 'bugReport'