Skip to content

Make the plugin compatible with grails 2.5 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klelifo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make the plugin compatible with grails 2.5 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa9f374
now using grails.util.Holders
klelifo Jun 24, 2015
3e1be39
now using grails 2.5 combatible plugins
klelifo Jun 24, 2015
85d4dcb
upgrade to grails 2.5.0
klelifo Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions grails-app/conf/BuildConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/groovy/grails/ldap/server/TransientGrailsLdapServer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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")
Expand Down