From af5f193ec13a4bcb87b155e0bd1f20b1b37d2aa7 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 18 Jun 2008 10:35:30 +0000
Subject: [PATCH] SEC-890: Corrected use of dataSource property name in
 RememberMeBDP.

---
 .../config/RememberMeBeanDefinitionParser.java    |  2 +-
 .../HttpSecurityBeanDefinitionParserTests.java    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java b/core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
index 80768d9213..10372d989d 100644
--- a/core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
+++ b/core/src/main/java/org/springframework/security/config/RememberMeBeanDefinitionParser.java
@@ -84,7 +84,7 @@ public class RememberMeBeanDefinitionParser implements BeanDefinitionParser {
                 tokenRepo = new RuntimeBeanReference(tokenRepository);
             } else {
                 tokenRepo = new RootBeanDefinition(JdbcTokenRepositoryImpl.class);
-                ((BeanDefinition)tokenRepo).getPropertyValues().addPropertyValue(ATT_DATA_SOURCE,
+                ((BeanDefinition)tokenRepo).getPropertyValues().addPropertyValue("dataSource",
                         new RuntimeBeanReference(dataSource));
             }
             services.getPropertyValues().addPropertyValue("tokenRepository", tokenRepo);
diff --git a/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java b/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
index 9b6e1c76e7..1d5a4f9db0 100644
--- a/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
+++ b/core/src/test/java/org/springframework/security/config/HttpSecurityBeanDefinitionParserTests.java
@@ -349,6 +349,21 @@ public class HttpSecurityBeanDefinitionParserTests {
         assertTrue(rememberMeServices instanceof PersistentTokenBasedRememberMeServices);
     }
 
+    @Test
+    public void rememberMeServiceWorksWithDataSourceRef() {
+        setContext(
+                "<http auto-config='true'>" +
+                "    <remember-me data-source-ref='ds'/>" +
+                "</http>" +
+                "<b:bean id='ds' class='org.springframework.security.TestDataSource'> " +
+                "    <b:constructor-arg value='tokendb'/>" +
+                "</b:bean>" + AUTH_PROVIDER_XML);
+        Object rememberMeServices = appContext.getBean(BeanIds.REMEMBER_ME_SERVICES);
+        
+        assertTrue(rememberMeServices instanceof PersistentTokenBasedRememberMeServices);
+    }    
+    
+    
     @Test
     public void rememberMeServiceWorksWithExternalServicesImpl() throws Exception {
         setContext(