fix for GRAILS-2657

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

Author: graeme

scripts/War.groovy

@@ -90,8 +90,11 @@ DEFAULT_J5_DEPS = [
     "ejb3-persistence.jar",
 ]
 
+target (configureRunningScript:"Sets the currently running script, in case called directly") {
+    System.setProperty('current.gant.script',"war")
+}
 target (war: "The implementation target") {
-	depends( clean,  packageApp)
+	depends( configureRunningScript, clean,  packageApp)
 
 	try {
         stagingDir = "${basedir}/staging"		

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

@@ -143,7 +143,7 @@ Grails home is set to: ${grailsHome}
     private static setDefaultEnvironment(args) {
         if(!System.properties."${GrailsApplication.ENVIRONMENT}") {
             def environment = DEFAULT_ENVS[args.toLowerCase()]
-            environment = environment ? ENV_ARGS[environment] : ENV_ARGS['dev']
+            environment = environment ?: GrailsApplication.ENV_DEVELOPMENT
             System.setProperty(GrailsApplication.ENVIRONMENT, environment )
             System.setProperty(GrailsApplication.ENVIRONMENT_DEFAULT, "true")
         }

src/commons/org/codehaus/groovy/grails/commons/GrailsApplication.java

@@ -73,6 +73,12 @@ public interface GrailsApplication extends ApplicationContextAware {
      * Constant used to resolve the environment via System.getProperty(ENVIRONMENT)
      */
     String ENVIRONMENT = "grails.env";
+
+    /**
+     * Constants that indicates whether this GrailsApplication is running in the default environment
+     */
+    String ENVIRONMENT_DEFAULT = "grails.env.default";
+
     /**
      * Constant for the development environment
      */