Index: trunk/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/grails-app/conf/BootStrap.groovy	(revision 503)
+++ trunk/grails-app/conf/BootStrap.groovy	(revision 504)
@@ -1,4 +1,2 @@
-import grails.util.GrailsUtil
-
 class BootStrap
 {
@@ -7,25 +5,30 @@
     def init = { servletContext ->
 
-        log.info "Application starting."
-        log.debug "GrailsUtil.environment = ${GrailsUtil.environment}"
-
-        switch (GrailsUtil.environment)
-        {
-            case "development":
-                        createDataService.ensureSystemAndAdminAccess()
-                        createDataService.createBaseData()
-                        createDataService.createDemoData()
-                        break
-            case "test":
-                        createDataService.ensureSystemAndAdminAccess()
-                        break
-            case "production":
-                        createDataService.ensureSystemAndAdminAccess()
-                        break 
+        /** Environment specific settings.
+        * Note that (circa grails-1.2.2) if running "test test-app integration:" from "grails interactive"
+        * the correct environment is applied for DataSource and Config,
+        * but for BootStrap (and others) the development environment is applied.
+        */
+        environments {
+            development {
+                log.info "Starting DEVELOPMENT bootstrap."
+                createDataService.ensureSystemAndAdminAccess()
+                createDataService.createBaseData()
+                createDataService.createDemoData()
+            }
+            test {
+                log.info "Starting TEST bootstrap."
+                createDataService.ensureSystemAndAdminAccess()
+            }
+            production {
+                log.info "Starting PRODUCTION bootstrap."
+                createDataService.ensureSystemAndAdminAccess()
+            }
         }
 
-    }
+    } // init
 
     def destroy = {
     }
-}
+
+} // end class
Index: trunk/grails-app/conf/DataSource.groovy
===================================================================
--- trunk/grails-app/conf/DataSource.groovy	(revision 503)
+++ trunk/grails-app/conf/DataSource.groovy	(revision 504)
@@ -24,5 +24,5 @@
             password = ""
             dbCreate = "create-drop"
-            url = "jdbc:hsqldb:mem:devDB"
+            url = "jdbc:hsqldb:mem:devDb"
             /** MySQL */
 //             driverClassName = "com.mysql.jdbc.Driver"
@@ -57,5 +57,5 @@
 //             password = ""
 //             dbCreate = "create-drop"
-//             url = "jdbc:hsqldb:mem:devDB"
+//             url = "jdbc:hsqldb:mem:devDb"
             /** HSQLDB - In file */
 //             driverClassName = "org.hsqldb.jdbcDriver"