Changeset 1363

Timestamp:

Jan 11, 2011, 4:08:33 PM (12 years ago)

Author:

work@…

Message:

• and another one for issue #219

Location:

trunk/grails-app/conf

Files:

• Config.groovy (modified) (1 diff)
• config-ci.properties (moved) (moved from trunk/grails-app/conf/ci-config.properties)
• config-dbnpdemo.properties (moved) (moved from trunk/grails-app/conf/dbnpdemo-config.properties)
• config-dbnptest.properties (moved) (moved from trunk/grails-app/conf/dbnptest-config.properties)
• config-development.properties (moved) (moved from trunk/grails-app/conf/development-config.properties)
• config-production.properties (moved) (moved from trunk/grails-app/conf/production-config.properties)
• config-test.properties (moved) (moved from trunk/grails-app/conf/test-config.properties)
• config-www.properties (moved) (moved from trunk/grails-app/conf/www-config.properties)

trunk/grails-app/conf/Config.groovy

@@ -17 +17 @@
 // config files can either be Java properties files or ConfigSlurper scripts
 grails.config.locations = [
-        // the WAR and run-app default location
-        "classpath:${grails.util.GrailsUtil.environment}-config.properties",
-
-        // the external configuration
-        "file:${userHome}/.grails-config/${appName}-${grails.util.GrailsUtil.environment}-config.properties"
+        // the default per-environment configuration
+        // (e.g. grails-app/conf/config-development.properties)
+        "classpath:config-${grails.util.GrailsUtil.environment}.properties",
+
+        // the external configuration to override the default
+        // configuration (e.g. ~/.grails-config/ci-gscf.properties)
+        "file:${userHome}/.grails-config/${grails.util.GrailsUtil.environment}-${appName}.properties"
 ]