Commit Graph

743 Commits

Author SHA1 Message Date
Chris Beams f86e3bcfd2 Updated Eclipse .classpath to aspectj 1.6.8
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2920 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 13:45:14 +00:00
Juergen Hoeller 488060fbd1 ignore IllegalStateException when removing shutdown hook (SPR-6793)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2919 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 12:30:39 +00:00
Costin Leau 5e677feda0 + upgrade to AspectJ 1.6.8
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2918 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:46:21 +00:00
Costin Leau ece44a3ff7 SPR-6794
+ fix test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2917 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:33:58 +00:00
Costin Leau 48df1fd669 SPR-6794
+ added setter for encoding (in case the default UTF-8 is not enough)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2915 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:13:04 +00:00
Costin Leau 0ade90451c + add explicit dependency on commons-pool to prevent version 1.3 from being used (since it contains a memory leak)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2914 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:05:54 +00:00
Costin Leau 14d2235034 SPR-6794
+ used UTF-8 as the implicit encoding for reading scripts

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2913 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 10:04:48 +00:00
Juergen Hoeller 7473330885 ApplicationListeners will reliably get invoked through their proxy (if any)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2911 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 23:52:56 +00:00
Juergen Hoeller 0ce0de3eab refined addApplicationListener to work any time during the refresh phase
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2910 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 23:09:42 +00:00
Juergen Hoeller 6325a81b7d ApplicationListeners will get detected lazily as well (e.g. on @Bean's concrete result); inner bean ApplicationListeners will be invoked through their proxy (if any)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2909 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-03 22:54:59 +00:00
Juergen Hoeller a983d181aa fixed MBeanExporter regression: do not try to expose abstract beans (SPR-6784)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2896 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 17:56:03 +00:00
Juergen Hoeller 153ff751ab 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@2894 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 16:30:21 +00:00
Juergen Hoeller d4ef342ff6 call processConfigBeanDefinitions lazily if postProcessBeanDefinitionRegistry hasn't been called
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2886 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 16:10:11 +00:00
Juergen Hoeller 044a329629 refined DefaultLifecycleProcessor's start/stop logging and stop exception handling (SPR-6769, SPR-6770)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2883 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 15:52:13 +00:00
Juergen Hoeller 907cee1539 JndiObjectFactoryBean explicitly only chooses public interfaces as default proxy interfaces (SPR-5869)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2882 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 14:59:27 +00:00
Juergen Hoeller 439ab024e2 fixed cron example (SPR-6772)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2881 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 14:17:44 +00:00
Juergen Hoeller 6a41d6b2a0 BeanNameAutoProxyCreator detects alias matches for specified bean names as well (SPR-6774)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2880 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 14:12:48 +00:00
Juergen Hoeller a7b4dd195f introduced BeanDefinitionRegistryPostProcessor extension to BeanFactoryPostProcessor; @Configuration classes support definition of BeanFactoryPostProcessor beans as well (SPR-6455, SPR-6611)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2879 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 14:05:28 +00:00
Chris Beams 04bed0c1d7 RESOLVED - issue SPR-6779: imported @Configuration classes do not get enhanced and fail to satisfy scoping requirements
refactoring, polishing.


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2877 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-29 23:31:53 +00:00
Chris Beams 7c0a31fb36 IN PROGRESS - issue SPR-6779: imported @Configuration classes do not get enhanced and fail to satisfy scoping requirements
All tests in ImportedConfigurationClassEnhancementTests now pass.  The fix was simple - imported @Configuration class bean definitions were not getting marked with the attribute that indicates that they are indeed @Configuration class bean definitions.  To make this happen, ConfigurationClassPostProcessor's protected checkConfigurationClassCandidate(beanDef) method is being called from within ConfigurationClassBeanDefinitionReader when imported @Configuration classes are being processed.  This is quick and dirty, and the subsequent check-in will refactor the solution appropriately.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2876 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-29 20:55:03 +00:00
Chris Beams b157c5dbad Unit test cornering bug SPR-6779, 'imported @Configuration classes do not get enhanced and fail to satisfy scoping requirements'
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2875 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-29 19:48:25 +00:00
Juergen Hoeller b33728c991 added test for expression re-evaluation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2851 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-22 16:03:17 +00:00
Juergen Hoeller 61c1b4fc9e accept Set<?> instead of Set<Object> (SPR-6742)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2850 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-22 10:03:13 +00:00
Juergen Hoeller bdca327c35 fixed getPropertyTypeDescriptor to work for nested indexed property as well (SPR-6710)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2842 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-20 15:10:22 +00:00
Juergen Hoeller b35b9fdc5c fixed BeanPostProcessor invocation for null bean (SPR-6700)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2832 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-18 18:51:28 +00:00
Chris Beams 58e1f08112 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2828 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-18 15:45:10 +00:00
Chris Beams 8be158bd0a Resolved SPR-6602, relating to FactoryBean behavior in @Configuration classes. See issue and code comments for full details.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2824 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-18 08:54:45 +00:00
David Syer e6d2f9428c SPR-6678: fix poms for 3.0.1
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2809 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-13 11:07:08 +00:00
Juergen Hoeller 951c70682b MBeanClientInterceptor understands CompositeData/TabularData arrays (SPR-6548)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2805 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-12 15:10:07 +00:00
Juergen Hoeller 5dcec02f6d mark spring-aop as required for spring-context (SPR-6578)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2802 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-12 12:49:16 +00:00
Mark Fisher 2429a08243 SPR-6670 @Scheduled now supports property placeholders for cron expressions.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2799 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-11 20:20:33 +00:00
Mark Fisher 50c9dfe649 SPR-6669 @Scheduled may now be used as a meta-annotation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2798 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-11 18:36:48 +00:00
David Syer efb1a30329 RESOLVED - issue SPR-6666: CronTrigger/CronSequenceGenerator fails to handle daylight saving timezone changes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2797 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-11 16:05:12 +00:00
Juergen Hoeller ff228e3977 fixed @Scheduled processing to kick in once only even in an ApplicationContext hierarchy (SPR-6656)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2794 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-08 16:00:07 +00:00
Juergen Hoeller 8225c29b39 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2792 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-07 23:29:13 +00:00
Juergen Hoeller 750529de99 replaced references to "spring-agent.jar" with "org.springframework.instrument.jar" (SPR-6597)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2790 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-07 13:32:42 +00:00
Juergen Hoeller d6829ab28d ApplicationListeners will only be executed once per event (even for scripted objects; SPR-6589)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2788 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-07 12:58:18 +00:00
Juergen Hoeller 97928d1186 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2780 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-06 22:24:30 +00:00
Juergen Hoeller a5c05d7f9f allow for overriding specific DefaultLifecycleProcessor hooks (SPR-6617)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2777 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-06 19:48:48 +00:00
Mark Fisher 17c01fae30 SPR-6644 The 'id' value from an 'executor' element in the task namespace is now used as the thread name prefix for the resulting ThreadPoolTaskExecutor instance.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2772 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-05 22:27:47 +00:00
Juergen Hoeller 195667d8eb fixed retriever cache putting
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2759 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-05 14:46:15 +00:00
Juergen Hoeller eadbf7a057 reset retriever cache when adding/removing listeners (SPR-6624)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2751 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-05 13:09:03 +00:00
Chris Beams 2887b74448 Resolved SPR-6618. Restrictions were too tight on overloaded bean methods and were preventing it altogether. Overloading is now allowed, as long as there is no ambiguity at runtime which bean method should be invoked.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2745 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-30 19:42:12 +00:00
Juergen Hoeller 5edc17473d generic ApplicationListener event type gets detected through proxy as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2723 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-28 18:57:15 +00:00
Juergen Hoeller a9a3fe28d0 fixed getBeansWithAnnotation to ignore beans with non-determinable type (SPR-6579)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2718 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-23 19:11:19 +00:00
Juergen Hoeller 53a71fe962 removed hard ScopedProxyUtils dependency in ConfigurationClassEnhancer
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2686 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 20:45:45 +00:00
Keith Donald b34a2ab777 TypeDescriptor.valueOf usage in favor of constants; TypedValue usage simplification
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2681 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 19:41:52 +00:00
Juergen Hoeller b1dba5f5aa BeanValidationPostProcessor runs in before-initialization phase by default (SPR-6565)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2678 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 18:04:44 +00:00
Juergen Hoeller 5add86419d catch ConversionException and ConvertedNotFoundException in BeanWrapper's convertIfNecessary as well, in order to support constructor resolution (SPR-6563)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2672 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 12:53:36 +00:00
Juergen Hoeller 246bb34e08 introspect element type in case of incoming Collection/Map in order to not accidentally say canConvert=true (SPR-6564)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2671 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 12:36:22 +00:00