From aa9f374f8726d04b3822c15d758e539f687904dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20L=C3=B6ffler?= Date: Wed, 24 Jun 2015 14:56:21 +0200 Subject: [PATCH 1/3] now using grails.util.Holders --- .../grails/ldap/server/TransientGrailsLdapServer.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy b/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy index f0e2851..74a44a9 100644 --- a/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy +++ b/src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy @@ -23,7 +23,9 @@ import org.springframework.web.context.ServletContextAware import grails.util.BuildSettingsHolder -import org.codehaus.groovy.grails.commons.ApplicationHolder +import grails.util.Holders + + import groovy.text.SimpleTemplateEngine @@ -61,7 +63,7 @@ class TransientGrailsLdapServer implements InitializingBean, DisposableBean, Bea log.info("${beanName} config: " + configOptions.collect { "$it = ${this.properties[it]}" }.join(', ')) - def baseConfigDirPath = (ApplicationHolder.application.warDeployed) ? ApplicationHolder.application.parentContext.getResource("WEB-INF/grails-app/ldap-servers").file.path : "grails-app/ldap-servers" + def baseConfigDirPath = (Holders.grailsApplication.warDeployed) ? Holders.grailsApplication.parentContext.getResource("WEB-INF/grails-app/ldap-servers").file.path : "grails-app/ldap-servers" def baseConfigDir = new File(baseConfigDirPath) configDir = new File(baseConfigDir, beanName - "LdapServer") dataDir = new File(configDir, "data") From 3e1be39e4771267ba74a565ce8becc80e6cf24ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20L=C3=B6ffler?= Date: Wed, 24 Jun 2015 14:56:59 +0200 Subject: [PATCH 2/3] now using grails 2.5 combatible plugins --- grails-app/conf/BuildConfig.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 1e7da54..423ccea 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -13,10 +13,11 @@ grails.project.dependency.resolution = { } plugins { - build (":release:1.0.1", ":svn:1.0.2") { - export = false + test(":tomcat:7.0.55.2") { + export = false } - test (":hibernate:$grailsVersion", ":tomcat:$grailsVersion") { + + build(":release:3.1.1") { export = false } } From 85d4dcb5fa72f77eae8234f197ff89f6f239e6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20L=C3=B6ffler?= Date: Wed, 24 Jun 2015 14:57:14 +0200 Subject: [PATCH 3/3] upgrade to grails 2.5.0 --- application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.properties b/application.properties index 844ca54..6e47c08 100644 --- a/application.properties +++ b/application.properties @@ -1,4 +1,4 @@ #Grails Metadata file #Tue Apr 03 12:40:26 BST 2012 -app.grails.version=2.0.4 +app.grails.version=2.5.0 app.name=ldap-server