Skip to content

Drop the ehcache dependency. Caching is a separate concern. #10

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Drop the ehcache dependency. Caching is a separate concern. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion grails-app/conf/BuildConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ grails.project.dependency.resolution = {
runtime "org.hibernate:hibernate-ehcache:$hibernateVersion", {
exclude group: 'net.sf.ehcache', name: 'ehcache-core'
}
runtime "net.sf.ehcache:ehcache-core:2.4.8"
}

plugins {
Expand Down
10 changes: 0 additions & 10 deletions test/unit/org/codehaus/groovy/grails/orm/hibernate/AbstractGrailsHibernateTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,6 @@ dataSource {
}
}
hibernate {
cache.use_second_level_cache=true
cache.use_query_cache=true
cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
}
''', "DataSource")
}
Expand Down Expand Up @@ -195,13 +192,6 @@ hibernate {
catch(e) {
// means it is not active, ignore
}
try {
getClass().classLoader.loadClass("net.sf.ehcache.CacheManager")
.getInstance()?.shutdown()
}
catch(e) {
// means there is no cache, ignore
}
gcl = null
ga = null
mockManager = null
Expand Down
12 changes: 1 addition & 11 deletions test/unit/org/codehaus/groovy/grails/orm/hibernate/GormSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,6 @@ abstract class GormSpec extends Specification {
catch(e) {
// means it is not active, ignore
}
try {
getClass().classLoader.loadClass("net.sf.ehcache.CacheManager")
.getInstance()?.shutdown()
}
catch(e) {
// means there is no cache, ignore
}
gcl = null
grailsApplication = null
mockManager = null
Expand Down Expand Up @@ -190,12 +183,9 @@ dataSource {
url = "jdbc:h2:mem:grailsIntTestDB"
}
hibernate {
cache.use_second_level_cache=true
cache.use_query_cache=true
cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
}
''', "DataSource")
}

abstract List getDomainClasses()
}
}
3 changes: 0 additions & 3 deletions test/unit/org/codehaus/groovy/grails/orm/hibernate/MultipleDataSourceTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,6 @@ dataSource_ds4 {
}

hibernate {
cache.use_second_level_cache = true
cache.use_query_cache = true
cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
}
''', 'DataSource')
}
Expand Down
3 changes: 0 additions & 3 deletions ...ehaus/groovy/grails/orm/hibernate/validation/HibernateMappingUniqueConstraintTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ dataSource {
}
}
hibernate {
cache.use_second_level_cache=true
cache.use_query_cache=true
cache.provider_class='net.sf.ehcache.hibernate.EhCacheProvider'
config.location = ['classpath:/org/codehaus/groovy/grails/orm/hibernate/validation/hibernate.cfg.xml']
}
''', "DataSource")
Expand Down