fix for GPMONGODB-184 "No transactionManger bean with NoSQL plugin bu…

…t no Hibernate"
spring-attic · Apr 10, 2012 · 23bc12c · 23bc12c
1 parent 547b54a
commit 23bc12c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurer.groovy b/...-support/src/main/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurer.groovy
@@ -65,6 +65,12 @@ abstract class SpringConfigurer {
                 datastore = ref("${typeLower}Datastore")
             }
 
+            def currentSpringConfig = getSpringConfig()
+
+            if(!currentSpringConfig.containsBean("transactionManager") && !manager?.hasGrailsPlugin('hibernate')) {
+                currentSpringConfig.addAlias('transactionManager', "${typeLower}TransactionManager")
+            }
+
             "${typeLower}PersistenceInterceptor"(DatastorePersistenceContextInterceptor, ref("${typeLower}Datastore"))
 
             "${typeLower}PersistenceContextInterceptorAggregator"(PersistenceContextInterceptorAggregator)
@@ -74,10 +80,10 @@ abstract class SpringConfigurer {
                 "${interceptorName}"(OpenSessionInViewInterceptor) {
                     datastore = ref("${typeLower}Datastore")
                 }
-                if (getSpringConfig().containsBean("controllerHandlerMappings")) {
+                if (currentSpringConfig.containsBean("controllerHandlerMappings")) {
                     controllerHandlerMappings.interceptors << ref(interceptorName)
                 }
-                if (getSpringConfig().containsBean("annotationHandlerMapping")) {
+                if (currentSpringConfig.containsBean("annotationHandlerMapping")) {
                     if (annotationHandlerMapping.interceptors) {
                         annotationHandlerMapping.interceptors << ref(interceptorName)
                     }

diff --git a/...port/src/test/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurerSpec.groovy b/...port/src/test/groovy/org/grails/datastore/gorm/plugin/support/SpringConfigurerSpec.groovy
@@ -18,6 +18,7 @@ class SpringConfigurerSpec extends Specification{
         then:"The context contains the necessary beans"
             ctx.containsBean("simpleDatastore")
             ctx.containsBean("simpleTransactionManager")
+            ctx.containsBean("transactionManager")
             ctx.containsBean("simplePersistenceInterceptor")
             ctx.containsBean("simplePersistenceContextInterceptorAggregator")
             ctx.containsBean("simpleOpenSessionInViewInterceptor")
@@ -32,7 +33,7 @@ class SpringConfigurerSpec extends Specification{
     }
 }
 class SimpleSpringConfigurer extends SpringConfigurer {
-    Map manager = [hasGrailsPlugin:{ true }]
+    Map manager = [hasGrailsPlugin:{ String name -> name != 'hibernate' ? true : false }]
     Map application = [:]
     @Override
     String getDatastoreType() {