Commit Graph
120 Commits
Author SHA1 Message Date
Juergen Hoeller b4b61316a7 revised support for annotated factory methods (merged @FactoryMethod functionality into JavaConfig facility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1033 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 23:45:31 +00:00
Juergen Hoeller 7a4bcafcc6 @Resource names may use ${...} placeholders (SPR-5656)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@955 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-09 09:14:06 +00:00
Chris Beams b818dd91a3 Renamed ConfigurationPostProcessorTests -> ConfigurationClassPostProcessorTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@936 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-06 21:29:30 +00:00
Chris Beams 610a8b70ea Fixed SPR-5655 - dm Server issues with ConfigurationClassPostProcessor attempting to read .class files with ASM with incorrect class loader
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@935 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-06 21:23:37 +00:00
Juergen Hoeller c25fe064ce @Value values may use ${...} placeholders (driven by PropertyPlaceholderConfigurer); @Autowired uses field/parameter name as fallback qualifier value (SPR-5152)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@899 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-31 20:27:42 +00:00
Chris Beams 532426a10d Added test using custom properties file with util:properties and dereferenced with @Value("#{...}")
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@874 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-30 17:17:44 +00:00
Chris Beams 463f1e07de polishing @Configuration tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@872 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-30 16:02:04 +00:00
Chris Beams 8d0d8a4de8 RESOLVED - issue SPR-5600: Make naming of @Configuration class processing-related artifacts consistent
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@871 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-30 15:26:21 +00:00
Chris Beams d3e7583a50 Updated BeanMethodTests to reflect change from IllegalArgumentException -> IllegalStateException
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@867 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-28 22:29:28 +00:00
Chris Beams eac93ebd59 resolved:
+ Provide @Primary annotation (SPR-5590)
+ Provide @Lazy annotation (SPR-5591)
+ Test @Bean initMethod/destroyMethod functionality (SPR-5592)
+ Test @Bean dependsOn functionality (SPR-5593)


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@866 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-28 22:21:50 +00:00
Chris Beams 3e7fe100e2 RESOLVED - issue SPR-5596: Test @Autowired @Configuration class constructors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@843 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-27 05:36:29 +00:00
Chris Beams d96ebc4385 consolidated context.annotation.support -> context.annotation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@842 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-27 04:57:13 +00:00
Chris Beams f1a5d20a6c IN PROGRESS - issue SPR-5599: Hook @Configuration class processing into <context:component-scan/> and <context:annotation-config/> through AnnotationConfigUtils#registerAnnotationConfigProcessors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@832 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-26 19:52:50 +00:00
Juergen Hoeller 40f9643c51 fixed broken "setManagedInterfaces" interface assertion (SPR-5615)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@827 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-26 13:49:21 +00:00
Chris Beams 41a4353644 Re-adding ConfigurationPostProcessorTests after its brief removal in r814. @Ignore-ing the testCglibClassesAreLoadedJustInTimeForEnhancement() method as it turns out this was one of the culprits in the recent build breakage. The classloader hacking causes subtle downstream effects, breaking unrelated tests. The test method is still useful, but should only be run on a manual basis to ensure CGLIB is not prematurely classloaded, and should not be run as part of the automated build.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@815 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-25 06:01:17 +00:00
Chris Beams 4776108767 fixed two build-breaking issues:
+ reverted ClassMetadataReadingVisitor to revision 794
+ eliminated ConfigurationPostProcessorTests until further investigation determines why it causes downstream tests to fail (such as the seemingly unrelated ClassPathXmlApplicationContextTests)


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@814 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-25 03:14:35 +00:00
Juergen Hoeller cc21b308e2 qualifier annotations and @Value can be used at method level as well (applying to all parameters);
fixed EL evaluation of prepared constructor arguments for repeated prototype creation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@799 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-23 14:13:41 +00:00
Chris Beams 7e8c6e57cc Tweaks to package-info.java files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@791 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-23 07:36:44 +00:00
Chris Beams 5f9c23f04f Consolidated Util and MutableAnnotationUtils classes into existing AsmUtils
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@790 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-23 07:01:01 +00:00
Chris Beams 868ca2bb4a + Moving .config.java module -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@786 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-23 04:48:04 +00:00
Mark Pollack 1748a09613 Add support for @ScopedProxy for factory beans using the @FactoryBean annotation within a @Component
Add missing unit tests

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@771 50f2f4bb-b051-0410-bef5-90022cba6387
2009-03-13 18:14:40 +00:00
Juergen Hoeller f6c70c07c5 generified FactoryBeans and further Java 5 code style updates
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@686 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-25 00:34:22 +00:00
Juergen Hoeller 1d82467565 SimpleAliasRegistry's "getAliases" method returns transitive aliases now; @Qualifier value matching takes chained aliases of target beans into account as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@648 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-17 18:18:33 +00:00
Juergen Hoeller 6ad7cabd2c SmartApplicationListener interface supports source type checking; SimpleApplicationEventMulticaster caches information about event/source matches
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@646 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-17 17:46:14 +00:00
Juergen Hoeller 793bf07941 revised expression parser API design
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@619 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-12 23:03:58 +00:00
Juergen Hoeller 3e9e9e2267 added @Async annotation, AsyncExecutionInterceptor, AsyncAnnotationAdvisor
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@613 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-10 11:24:05 +00:00
Juergen Hoeller 699b370990 registered plain singletons will be fully matched according to their qualifiers; "systemProperties" bean is not considered a default match for type Properties anymore (SPR-5355)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@611 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-09 22:06:07 +00:00
Juergen Hoeller 47f3b9881b ApplicationListener beans get obtained on demand, supporting non-singletons as well; ApplicationListeners will be called in the order according to the Ordered contract; generified ApplicationListener interface
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@607 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-09 18:26:30 +00:00
Juergen Hoeller a3a4171c41 added "Future submit(Runnable)" and "Future submit(Callable)" to AsyncTaskExecutor; SchedulingTaskExecutor interface extends AsyncTaskExecutor; added ExecutorServiceAdapter class as a standard wrapper for a Spring TaskExecutor; added ThreadPoolExecutorFactoryBean; reduced backport-concurrent support to TaskExecutor adapters
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@599 50f2f4bb-b051-0410-bef5-90022cba6387
2009-02-05 22:45:35 +00:00
Arjen Poutsma b62e6238d1 Fixed usage of wrong TestBean package.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@577 50f2f4bb-b051-0410-bef5-90022cba6387
2009-01-23 11:57:58 +00:00
Arjen Poutsma a768f11634 SPR-2581: Provide out of the box implementation of the thread scope
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@574 50f2f4bb-b051-0410-bef5-90022cba6387
2009-01-22 15:41:29 +00:00
Arjen Poutsma df70cd2c62 javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@573 50f2f4bb-b051-0410-bef5-90022cba6387
2009-01-22 12:02:30 +00:00
Arjen Poutsma f7f9621083 SPR-3360: util:property-path like functionality for the p-namespace
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@572 50f2f4bb-b051-0410-bef5-90022cba6387
2009-01-22 12:01:25 +00:00
Chris Beams ba7ed6af44 moved XmlBeanFactoryTests and attendant XML from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@488 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-20 08:19:32 +00:00
Chris Beams 3d884b2342 refactored .context module's .beans.factory and .context.access tests in preparation for moving .beans.factory.xml tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@487 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-20 07:22:07 +00:00
Chris Beams f29d1d5048 moved ApplicationContext-dependent .beans.factory.xml.* tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@485 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-19 22:33:26 +00:00
Chris Beams 694d409eb4 moved ApplicationContext-dependent .aop.* unit tests from .testsuite -> .context
in the process, identified and refactored two genuine integration tests (AopNamespaceHandlerScopeIntegrationTests, AdvisorAutoProxyCreatorIntegrationTests), which will remain in .testsuite due to broad-ranging dependencies


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@484 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-19 21:58:42 +00:00
Chris Beams 059906452e + refactoring .testsuite .aop.aspectj tests in preparation for migration to .context
+ updated all ivy.xml files to depend on AspectJ 1.6.2



git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@480 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-19 14:56:09 +00:00
Chris Beams 7616a00e41 moving .aop.aspectj.* unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@479 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-19 03:45:30 +00:00
Chris Beams e1965dea0f eliminated svn:externals in favor of localized copies of shared artifacts
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@472 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-18 21:27:18 +00:00
Chris Beams 2796c55974 Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@464 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-18 14:50:25 +00:00
Chris Beams 2455ed7977 moving unit tests from .testsuite -> .core, .beans, .web, .web.portlet, .web.servlet
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@453 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-17 18:45:41 +00:00
Chris Beams dc2a4d0cd8 moving .scripting.* unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@448 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-17 06:48:52 +00:00
Chris Beams 4595713e00 moving remoting.*, scheduling.* unit tests from .testsuite -> .context, .web
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@447 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-17 06:13:28 +00:00
Chris Beams f01b92fb17 moving .jndi, .mail and .mock.web unit tests from .testsuite to .context, .context.support, and .test bundles respectively
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@444 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-17 02:20:01 +00:00
Chris Beams 81ad606570 moving jmx.* unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@442 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-17 00:39:28 +00:00
Chris Beams a3e4d66bb1 moving instrument.classloading.* unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@435 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-16 20:07:32 +00:00
Chris Beams 3fcf5fe7f0 finished moving .ejb.* unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@433 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-16 19:19:41 +00:00
Chris Beams bdd36aa36a moving .ejb.access unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@432 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-16 18:28:19 +00:00
Chris Beams 73c1bbfeb8 moving unit tests from .testsuite -> .context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@430 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-16 05:35:23 +00:00