Skip to content

Commit

Permalink
fix for GRAILS-6970 "Cannot use 'import' statement in Grails Config"
Browse files Browse the repository at this point in the history
  • Loading branch information
graemerocher committed Dec 14, 2010
1 parent f4dd3a2 commit 549164e
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions scripts/Upgrade.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,15 @@ move it to the new location of '${basedir}/test/integration'. Please move the di
// add reasonable defaults for them
def configFile = new File(baseFile, '/grails-app/conf/Config.groovy')
if (configFile.exists()) {
def configSlurper = new ConfigSlurper()
def configObject = configSlurper.parse(configFile.toURI().toURL())
def defaultCodec = configObject.grails.views.default.codec
def gspEncoding = configObject.grails.views.gsp.encoding

if (!defaultCodec || !gspEncoding) {
configFile.withWriterAppend {
it.writeLine '\n// The following properties have been added by the Upgrade process...'
if (!defaultCodec) it.writeLine 'grails.views.default.codec="none" // none, html, base64'
if (!gspEncoding) it.writeLine 'grails.views.gsp.encoding="UTF-8"'
}
}
def configText = configFile.text
configFile.withWriterAppend {
if(!configText.contains("grails.views.default.codec") ) {
it.writeLine 'grails.views.default.codec="none" // none, html, base64'
}
if(!configText.contains("grails.views.gsp.encoding") ) {
it.writeLine 'grails.views.gsp.encoding="UTF-8"'
}
}
}

if (new File("${basedir}/spring").exists()) {
Expand Down

0 comments on commit 549164e

Please sign in to comment.