Remove Custom Spring Scope

.gitignore

@@ -14,7 +14,8 @@ stacktrace.log
 .classpath
 .project
 .settings
-.idea
+/.idea
 *.iml
 *.ipr
 .grails
+/out

MultiTenantSingleDbGrailsPlugin.groovy

@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory
 class MultiTenantSingleDbGrailsPlugin {
     private Logger log = LoggerFactory.getLogger('grails.plugin.multiTenant.MultiTenantSingleDbPlugin')
 
-    def version = "0.8.3"
+    def version = "0.9.0-SNAPSHOT"
     def grailsVersion = "1.3.5 > *"
 
     def loadAfter = [
@@ -28,7 +28,7 @@ class MultiTenantSingleDbGrailsPlugin {
 
     def license = "APACHE"
     def developers = [
-        [ name: "Steve Ronderos", email: "steve.ronderos@gmail.com" ]
+        [ name: "Steve Ronderos", email: "steve@ronderos.com" ]
     ]
     def issueManagement = [ system: "github", url: "https://github.com/multi-tenant/grails-multi-tenant-single-db/issues" ]
     def scm = [ url: "https://github.com/multi-tenant/grails-multi-tenant-single-db" ]

grails-app/conf/Config.groovy

@@ -9,7 +9,6 @@ log4j = {
 }
 
 multiTenant {
-    perTenantBeans = [ "demoService" ]
     tenantClass = demo.DemoTenant
 }
 

grails-app/conf/spring/resources.groovy

@@ -0,0 +1,5 @@
+import demo.DemoStore
+
+beans = {
+    demoStore(DemoStore)
+}

src/docs/guide/6. Changelog.gdoc

@@ -1,3 +1,7 @@
+h3. v0.9.0
+
+* Removed Tenant Scope
+
 h3. v0.8.3 April 18th 2013
 
 * Configurable Filter Position

src/groovy/demo/DemoStore.groovy

@@ -0,0 +1,17 @@
+package demo
+
+import grails.plugin.multitenant.core.CurrentTenant
+import grails.plugin.multitenant.core.CurrentTenantAware
+
+/**
+ * @author Steve Ronderos
+ */
+class DemoStore implements CurrentTenantAware {
+
+    CurrentTenant currentTenant
+
+    @Override
+    void setCurrentTenant(CurrentTenant currentTenant) {
+        this.currentTenant = currentTenant
+    }
+}

src/groovy/grails/plugin/multitenant/singledb/MtSingleDbPluginSupport.groovy

@@ -6,9 +6,7 @@ import grails.plugin.multitenant.core.Tenant
 import grails.plugin.multitenant.core.exception.TenantException
 import grails.plugin.multitenant.core.impl.CurrentTenantThreadLocal
 import grails.plugin.multitenant.core.servlet.CurrentTenantServletFilter
-import grails.plugin.multitenant.core.spring.ConfiguredTenantScopedBeanProcessor
 import grails.plugin.multitenant.core.spring.CurrentTenantAwarePostProcessor
-import grails.plugin.multitenant.core.spring.TenantScope
 import grails.plugin.multitenant.singledb.hibernate.TenantHibernateEventListener
 import grails.plugin.multitenant.singledb.hibernate.TenantHibernateEventProxy
 import grails.plugin.multitenant.singledb.hibernate.TenantHibernateFilterConfigurator
@@ -17,7 +15,6 @@ import grails.plugin.multitenant.singledb.hibernate.TenantHibernateFilterEnabler
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.config.CustomScopeConfigurer
 import org.springframework.context.ApplicationContext
 import org.springframework.orm.hibernate3.FilterDefinitionFactoryBean
 
@@ -49,21 +46,6 @@ class MtSingleDbPluginSupport {
             currentTenant = ref("currentTenant")
         }
 
-        // A custom Spring scope for beans.
-        tenantScope(TenantScope) {
-            currentTenant = ref("currentTenant")
-        }
-
-        // Set per-tenant beans up in the custom tenant scope
-        configuredTenantBeanProcessor(ConfiguredTenantScopedBeanProcessor) {
-            perTenantBeans = multiTenantConfig?.perTenantBeans ?: []
-        }
-
-        // Responsible for registering the custom 'tenant' scope with Spring.
-        tenantScopeConfigurer(CustomScopeConfigurer) {
-            scopes = [ tenant: ref("tenantScope") ]
-        }
-
         // Definition of the Hibernate filter making sure that
         // each tenant only sees and touches its own data.
         multiTenantHibernateFilter(FilterDefinitionFactoryBean) {

test/integration/demo/CurrentTenantAwareSpec.groovy

@@ -0,0 +1,17 @@
+package demo
+
+import grails.plugin.spock.IntegrationSpec
+
+/**
+ * @author Steve Ronderos
+ */
+class CurrentTenantAwareSpec extends IntegrationSpec {
+
+    def demoStore
+
+    def "current tenant is injected into the service"() {
+        expect:
+        demoStore != null
+        demoStore.currentTenant != null
+    }
+}