Index: trunk/grails-app/conf/Config.groovy
===================================================================
--- trunk/grails-app/conf/Config.groovy	(revision 440)
+++ trunk/grails-app/conf/Config.groovy	(revision 449)
@@ -33,6 +33,20 @@
 grails.converters.encoding="UTF-8"
 
+// enable Sitemesh preprocessing of GSP pages
+grails.views.gsp.sitemesh.preprocess = true
+// scaffolding templates configuration
+grails.scaffolding.templates.domainSuffix = 'Instance'
+
+// Set to false to use the new Grails 1.2 JSONBuilder in the render method
+grails.json.legacy.builder=false
+
 // enabled native2ascii conversion of i18n properties files
 grails.enable.native2ascii = true
+
+// whether to install the java.util.logging bridge for sl4j. Disable fo AppEngine!
+grails.logging.jul.usebridge = true
+// packages to include in Spring bean scanning
+grails.spring.bean.packages = []
+
 
 /**
@@ -70,5 +84,5 @@
     }
 
-    // This is for the builtin stuff and from the default Grails-1.1.1 config.
+    // This is for the built-in stuff and from the default Grails-1.2.1 config.
     error 'org.codehaus.groovy.grails.web.servlet',  //  controllers
             'org.codehaus.groovy.grails.web.pages', //  GSP
@@ -80,5 +94,6 @@
             'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration
             'org.springframework',
-            'org.hibernate'
+            'org.hibernate',
+            'net.sf.ehcache.hibernate'
 
     warn   'org.mortbay.log' // Jetty
Index: trunk/grails-app/conf/DataSource.groovy
===================================================================
--- trunk/grails-app/conf/DataSource.groovy	(revision 440)
+++ trunk/grails-app/conf/DataSource.groovy	(revision 449)
@@ -6,5 +6,5 @@
     cache.use_second_level_cache=true
     cache.use_query_cache=true
-    cache.provider_class='com.opensymphony.oscache.hibernate.OSCacheProvider'
+    cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
 }