fix for GRAILS-2434 and GRAILS-2507

git-svn-id: https://svn.codehaus.org/grails/trunk@6806 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

scripts/Console.groovy

@@ -29,7 +29,6 @@ import org.codehaus.groovy.grails.support.*
 Ant.property(environment:"env")                             
 grailsHome = Ant.antProject.properties."env.GRAILS_HOME"    
 
-includeTargets << new File ( "${grailsHome}/scripts/Package.groovy" )
 includeTargets << new File ( "${grailsHome}/scripts/Bootstrap.groovy" )
 
 target ('default': "Load the Grails interactive Swing console") {

scripts/CreateApp.groovy

@@ -29,7 +29,6 @@ grailsAppName = ""
 Ant.property(environment:"env")   
 grailsHome = Ant.antProject.properties."env.GRAILS_HOME"    
 
-includeTargets << new File ( "${grailsHome}/scripts/Clean.groovy" )
 includeTargets << new File ( "${grailsHome}/scripts/Package.groovy" )
 
 

scripts/Init.groovy

@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2004-2005 the original author or authors.
  * 
@@ -326,6 +327,29 @@ target(checkVersion: "Stops build if app expects different Grails version") {
     }
 }
 
+
+target(setupEnvironment: "Sets up the Grails environment for this script") {
+
+    if(!System.getProperty("grails.env.set")) {
+
+        def defaultEnv = System.getProperty(GrailsApplication.ENVIRONMENT_DEFAULT) ? true : false
+        if(defaultEnv) {
+            def customEnv
+            try {
+                customEnv = getProperty("scriptEnv")
+            } catch (MissingPropertyException mpe) {
+                //ignore, ok
+            }
+            if(customEnv) {
+                System.setProperty(GrailsApplication.ENVIRONMENT, customEnv)
+                System.setProperty(GrailsApplication.ENVIRONMENT_DEFAULT, "")
+            }
+        }
+        println "Environment set to ${System.getProperty(GrailsApplication.ENVIRONMENT)}"
+        System.setProperty("grails.env.set", "true")
+    }
+}
+
 target(updateAppProperties: "Updates default application.properties") {
     Ant.propertyfile(file: "${basedir}/application.properties",
             comment: "Do not edit app.grails.* properties, they may change automatically. " +
@@ -602,3 +626,6 @@ target(configureProxy: "The implementation target") {
         }
     }
 }
+
+
+setupEnvironment()

scripts/Shell.groovy

@@ -30,7 +30,6 @@ import org.codehaus.groovy.tools.shell.*
 Ant.property(environment:"env")                             
 grailsHome = Ant.antProject.properties."env.GRAILS_HOME"    
 
-includeTargets << new File ( "${grailsHome}/scripts/Package.groovy" )
 includeTargets << new File ( "${grailsHome}/scripts/Bootstrap.groovy" )
 
 target ('default': "Load the Grails interactive shell") {

scripts/TestApp.groovy

@@ -53,7 +53,6 @@ appCtx = null
 result = new TestResult()
 compilationFailures = []
 
-includeTargets << new File("${grailsHome}/scripts/Package.groovy")
 includeTargets << new File("${grailsHome}/scripts/Bootstrap.groovy")
 
 generateLog4jFile = true

scripts/_PackagePlugins.groovy

@@ -28,7 +28,6 @@ GCL = new GroovyClassLoader()
 Ant.property(environment:"env")   
 grailsHome = Ant.antProject.properties."env.GRAILS_HOME"    
 
-includeTargets << new File ( "${grailsHome}/scripts/Init.groovy" ) 
 pluginResources = []
 
 

src/commons/org/codehaus/groovy/grails/cli/GrailsScriptRunner.groovy

@@ -22,6 +22,7 @@ import gant.Gant
 import grails.util.GrailsUtil
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver
 import org.codehaus.groovy.grails.commons.GrailsClassUtils
+import org.codehaus.groovy.grails.commons.GrailsApplication
 
 /**
  * Class that handles Grails command line interface for running scripts
@@ -114,10 +115,8 @@ Grails home is set to: ${grailsHome}
             	println "Run 'grails help' for a complete list of available scripts."
             	println 'Exiting.'
             	System.exit(-1)
-            }
-            
-			println "Environment set to ${System.getProperty('grails.env')}"
-                                        
+            }          
+
 			System.setProperty("base.dir", baseDir.absolutePath)
 
 			try {      
@@ -135,25 +134,26 @@ Grails home is set to: ${grailsHome}
 		}
 	}  
 
-	static ENV_ARGS = [dev:"development",prod:"production",test:"test"]
+	static ENV_ARGS = [dev:GrailsApplication.ENV_DEVELOPMENT,prod:GrailsApplication.ENV_PRODUCTION,test:GrailsApplication.ENV_TEST]
     // this map contains default environments for several scripts in form 'script-name':'env-code'
-    static DEFAULT_ENVS = ['war': 'prod','test-app':'test','run-webtest':'test']
+    static DEFAULT_ENVS = ['war': GrailsApplication.ENV_PRODUCTION,'test-app':GrailsApplication.ENV_TEST,'run-webtest':GrailsApplication.ENV_TEST]
     private static isEnvironmentArgs(env) {
 		ENV_ARGS.keySet().contains(env)
 	}
     private static setDefaultEnvironment(args) {
-        if(!System.properties."grails.env") {
+        if(!System.properties."${GrailsApplication.ENVIRONMENT}") {
             def environment = DEFAULT_ENVS[args.toLowerCase()]
-            System.setProperty("grails.env", environment ? ENV_ARGS[environment] : ENV_ARGS['dev'] )
+            environment = environment ? ENV_ARGS[environment] : ENV_ARGS['dev']
+            System.setProperty(GrailsApplication.ENVIRONMENT, environment )
+            System.setProperty(GrailsApplication.ENVIRONMENT_DEFAULT, "true")
         }
     }
     private static calculateEnvironment(env) {
         def environment = ENV_ARGS[env]
         if( environment ) {
-            System.setProperty("grails.env", environment)
+            System.setProperty(GrailsApplication.ENVIRONMENT, environment)
         } else {
-            System.setProperty("grails.env.default", "true")
-            System.setProperty("grails.env", ENV_ARGS['prod'] )
+            setDefaultEnvironment("prod")
         }
     }