diff --git a/sandbox/spring-security-config/src/main/java/org/acegisecurity/config/RememberMeServicesBeanDefinitionParser.java b/sandbox/spring-security-config/src/main/java/org/acegisecurity/config/RememberMeServicesBeanDefinitionParser.java index 61fee2d62d..d49be42067 100644 --- a/sandbox/spring-security-config/src/main/java/org/acegisecurity/config/RememberMeServicesBeanDefinitionParser.java +++ b/sandbox/spring-security-config/src/main/java/org/acegisecurity/config/RememberMeServicesBeanDefinitionParser.java @@ -15,6 +15,7 @@ import org.springframework.util.StringUtils; import org.w3c.dom.Element; /** + * Parses * @author vpuri * */ @@ -30,9 +31,6 @@ public class RememberMeServicesBeanDefinitionParser extends AbstractBeanDefiniti */ private static final String KEY = "key"; - /** - * - */ protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { Assert.notNull(parserContext, "ParserContext must not be null"); @@ -51,11 +49,6 @@ public class RememberMeServicesBeanDefinitionParser extends AbstractBeanDefiniti rememberMeServicesBeanDef.getPropertyValues().addPropertyValue(USER_DETAILS_SERVICE_PROPERTY, new RuntimeBeanReference(rememberMeServicesRef)); } - else { - // register a bean definition parse - RootBeanDefinition configurer = new RootBeanDefinition(RemeberMeServicesDependenciesConfigurer.class); - parserContext.getReaderContext().registerWithGeneratedName(configurer); - } return rememberMeServicesBeanDef; } diff --git a/sandbox/spring-security-config/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java b/sandbox/spring-security-config/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java index a8a2e9e7db..81c08e3ba9 100644 --- a/sandbox/spring-security-config/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java +++ b/sandbox/spring-security-config/src/test/java/org/acegisecurity/config/RememberMeBeanDefinitionParserTest.java @@ -7,6 +7,7 @@ import org.acegisecurity.providers.dao.DaoAuthenticationProvider; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +//TODO: fix test name public class RememberMeBeanDefinitionParserTest extends TestCase { public void testParserDefaults() { diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml new file mode 100644 index 0000000000..5cba7707ef --- /dev/null +++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-autodetect.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.hsqldb.jdbcDriver + + + jdbc:hsqldb:mem:test + + + + sa + + + + + + \ No newline at end of file diff --git a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml index fc11aa49fa..018bfe362f 100644 --- a/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml +++ b/sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/remember-me-defaults.xml @@ -14,7 +14,7 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc - + @@ -28,29 +28,16 @@ http://www.springframework.org/schema/security http://www.springframework.org/sc If ProviderManager.setProvider(List) is never called, auto-detect all AuthenticationProviders from app ctx, using Ordered to resolve their order Every authentication mechanism OR provider must start with security:authentication-something Use appropriate attrs and elements depending on provider or mechanism - --> + --> - - + + - - - - - -