From 4ae829da56a41cacccf6f48c37906a3dd1ae4c9b Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 1 Feb 2010 16:51:46 +0000 Subject: [PATCH] component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683) git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2895 50f2f4bb-b051-0410-bef5-90022cba6387 --- ...ssPathBeanDefinitionScannerScopeIntegrationTests.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index 0ddec41ffad..bd03001ec63 100644 --- a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,17 +26,15 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.context.annotation.ClassPathBeanDefinitionScanner; import org.springframework.context.annotation.Scope; -import org.springframework.core.type.filter.AnnotationTypeFilter; +import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpSession; -import org.springframework.util.ClassUtils; +import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.support.GenericWebApplicationContext; -import org.springframework.stereotype.Component; /** * @author Mark Fisher @@ -320,7 +318,6 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { @Component - @Scope("singleton") public static class SingletonScopedTestBean extends ScopedTestBean { }