Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix for GRAILS-6970 "Cannot use 'import' statement in Grails Config"

  • Loading branch information...
commit 549164e08251e4b73d7a2664d82a89dd4acc8736 1 parent f4dd3a2
graemerocher authored December 14, 2010

Showing 1 changed file with 9 additions and 12 deletions. Show diff stats Hide diff stats

  1. 21  scripts/Upgrade.groovy
21  scripts/Upgrade.groovy
@@ -149,18 +149,15 @@ move it to the new location of '${basedir}/test/integration'. Please move the di
149 149
         // add reasonable defaults for them
150 150
         def configFile = new File(baseFile, '/grails-app/conf/Config.groovy')
151 151
         if (configFile.exists()) {
152  
-            def configSlurper = new ConfigSlurper()
153  
-            def configObject = configSlurper.parse(configFile.toURI().toURL())
154  
-            def defaultCodec = configObject.grails.views.default.codec
155  
-            def gspEncoding = configObject.grails.views.gsp.encoding
156  
-
157  
-            if (!defaultCodec || !gspEncoding) {
158  
-                configFile.withWriterAppend {
159  
-                    it.writeLine '\n// The following properties have been added by the Upgrade process...'
160  
-                    if (!defaultCodec) it.writeLine 'grails.views.default.codec="none" // none, html, base64'
161  
-                    if (!gspEncoding) it.writeLine 'grails.views.gsp.encoding="UTF-8"'
162  
-                }
163  
-            }
  152
+			def configText = configFile.text			
  153
+			configFile.withWriterAppend {
  154
+				if(!configText.contains("grails.views.default.codec") ) {				               
  155
+                    it.writeLine 'grails.views.default.codec="none" // none, html, base64'
  156
+	            }
  157
+				if(!configText.contains("grails.views.gsp.encoding") ) {
  158
+                    it.writeLine 'grails.views.gsp.encoding="UTF-8"'				
  159
+				}
  160
+			}
164 161
         }
165 162
 
166 163
         if (new File("${basedir}/spring").exists()) {

0 notes on commit 549164e

Please sign in to comment.
Something went wrong with that request. Please try again.