Attempt to avoid initialization of AntBuilder inside Grails to avoid …

…permissions problems
joelwreed · Apr 16, 2009 · 4aa4eb3 · 4aa4eb3
1 parent 7e14ff2
commit 4aa4eb3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 92 deletions.
diff --git a/grails/src/commons/org/codehaus/groovy/grails/plugins/GrailsPluginUtils.groovy b/grails/src/commons/org/codehaus/groovy/grails/plugins/GrailsPluginUtils.groovy
@@ -36,9 +36,13 @@ public class GrailsPluginUtils {
     static final String WILDCARD = "*";
     public static final GRAILS_HOME
     static {
-        def ant = new AntBuilder()
-        ant.property(environment: "env")
-        GRAILS_HOME = ant.antProject.properties."env.GRAILS_HOME"
+        try {
+            GRAILS_HOME = System.getenv("GRAILS_HOME")
+        }
+        catch (Throwable t) {
+            // probably due to permissions error
+            GRAILS_HOME = "UNKNOWN"
+        }
     }
 
 

diff --git a/.../scaffolding/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy b/.../scaffolding/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy
@@ -41,7 +41,6 @@ class DefaultGrailsTemplateGenerator implements GrailsTemplateGenerator, Resourc
     String basedir = "."
     boolean overwrite = false
     def engine = new SimpleTemplateEngine()
-    def ant = new AntBuilder()
     ResourceLoader resourceLoader
     Template renderEditorTemplate
 
@@ -210,6 +209,7 @@ class DefaultGrailsTemplateGenerator implements GrailsTemplateGenerator, Resourc
     private canWrite(testFile) {
         if (!overwrite && testFile.exists()) {
             try {
+                def ant = new AntBuilder()
                 ant.input(message: "File ${testFile} already exists. Overwrite?", "y,n,a", addproperty: "overwrite.${testFile.name}")
                 overwrite = (ant.antProject.properties."overwrite.${testFile.name}" == "a") ? true : overwrite
                 return overwrite || ((ant.antProject.properties."overwrite.${testFile.name}" == "y") ? true : false)

diff --git a/grails/src/web/org/codehaus/groovy/grails/web/servlet/filter/GrailsResourceCopier.groovy b/grails/src/web/org/codehaus/groovy/grails/web/servlet/filter/GrailsResourceCopier.groovy