diff --git a/AlaWebThemeGrailsPlugin.groovy b/AlaWebThemeGrailsPlugin.groovy index 53368d3..05eb29b 100644 --- a/AlaWebThemeGrailsPlugin.groovy +++ b/AlaWebThemeGrailsPlugin.groovy @@ -3,7 +3,7 @@ import grails.util.Holders class AlaWebThemeGrailsPlugin { // the plugin version - def version = "0.2.0" + def version = "0.2.2" // the version or versions of Grails the plugin is designed for def grailsVersion = "2.1 > *" // the other plugins this plugin depends on @@ -48,34 +48,10 @@ made to `ala.less` and then CSS files generated with provided script (see README def mappingElement = xml.'context-param' def lastMapping = mappingElement[mappingElement.size()-1] lastMapping + { - 'context-param' { - 'param-name' ('serverName') - 'param-value' (Holders.config.security.cas.appServerName) - } - 'context-param' { - 'param-name' ('casServerName') - 'param-value' (Holders.config.security.cas.casServerName) - } - 'context-param' { - 'param-name' ('uriFilterPattern') - 'param-value' (Holders.config.security.cas.uriFilterPattern) - } - 'context-param' { - 'param-name' ('uriExclusionFilterPattern') - 'param-value' (Holders.config.security.cas.uriExclusionFilterPattern) - } - 'context-param' { - 'param-name' ('authenticateOnlyIfLoggedInFilterPattern') - 'param-value' (Holders.config.security.cas.authenticateOnlyIfLoggedInPattern) - } - } - - if (Holders.config.security.cas.contextPath) { - lastMapping + { - 'context-param' { - 'param-name' ('contextPath') - 'param-value' (Holders.config.security.cas.contextPath) - } + 'env-entry' { + 'env-entry-name' ('configPropFile') + 'env-entry-value' (Holders.config.default_config) + 'env-entry-type' ('java.lang.String') } } diff --git a/application.properties b/application.properties index a11d647..218584d 100644 --- a/application.properties +++ b/application.properties @@ -1,4 +1,4 @@ #Grails Metadata file -#Tue Sep 03 12:11:08 EST 2013 -app.grails.version=2.2.4 -app.name=ala-web-theme +#Mon Dec 09 20:00:04 EST 2013 +app.grails.version=2.2.2 +app.name=ala-web-theme \ No newline at end of file diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 1e6842b..01c6c07 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -31,7 +31,7 @@ grails.project.dependency.resolution = { // runtime 'mysql:mysql-connector-java:5.1.18' compile group:'au.org.ala', name:'ala-cas-client', - version:'1.0-SNAPSHOT', + version:'2.0-SNAPSHOT', transitive:false compile 'org.jasig.cas.client:cas-client-core:3.1.12' } diff --git a/plugin.xml b/plugin.xml index 366b800..4e5524a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,4 +1,4 @@ - + Nick dos Remedios nick.dosremedios@csiro.au Ala Web Theme Plugin @@ -21,20 +21,21 @@ made to `ala.less` and then CSS files generated with provided script (see README + - + - + - +