Changeset 449 for trunk/grails-app

Timestamp:

Mar 24, 2010, 3:28:33 PM (15 years ago)

Author:

gav

Message:

Upgrade to Grails-1.2.1, all plugins upgraded to latest versions and configs adjusted to suite.

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/conf/Config.groovy (modified) (3 diffs)
• grails-app/conf/DataSource.groovy (modified) (1 diff)
• grails-app/views/layouts/main.gsp (modified) (1 diff)

trunk

@@ -1 +1 @@
 *.log
 *.war
+target

@@ -1 +1 @@
 *.log
 *.war
+target

trunk/grails-app/conf/Config.groovy

@@ -33 +33 @@
 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 +84 @@
     }
 
-    // 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 +94 @@
             'org.codehaus.groovy.grails.orm.hibernate', // hibernate integration
             'org.springframework',
-            'org.hibernate'
+            'org.hibernate',
+            'net.sf.ehcache.hibernate'
 
     warn   'org.mortbay.log' // Jetty

trunk/grails-app/conf/DataSource.groovy

@@ -6 +6 @@
     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'
 }
 

trunk/grails-app/views/layouts/main.gsp

@@ -6 +6 @@
         <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
         <g:layoutHead />
-        <g:helpBalloons/>
+        <g:helpBalloons icon="${resource(plugin:'help-balloons', dir:'images', file:'balloon-icon.gif')}"
+                                        button="${resource(plugin:'help-balloons', dir:'images', file:'balloon-button.png')}"
+                                        balloonPrefix="${resource(plugin:'help-balloons', dir:'images')}/balloon-"/>
         <nav:resources override="true"/>
         <g:javascript library="application" />

@@ -1 +1 @@
 *.log
 *.war
+target