Commit Graph

758 Commits

Author SHA1 Message Date
Chris Beams 4a410d0466 Removed hard-coded local path from .core/.classpath; removed duplicate asm entry in .context/.classpath
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3024 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-22 01:55:38 +00:00
David Syer 25ef81476d Update Central POMs to 3.0.2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3022 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-21 15:32:18 +00:00
Juergen Hoeller 7a0d88b799 upgraded to Hibernate Validator 4.0.2 and Jackson 1.4.2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3017 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-19 13:58:19 +00:00
Costin Leau 4be6044db9 + make use or property placeholders inside template.mf
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3014 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-19 09:43:22 +00:00
Juergen Hoeller f96ccfa39e BeanDefinitionReader and ClassPath/FileSystemXmlApplicationContext use varargs where possible (SPR-6849)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2988 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-16 11:59:29 +00:00
Juergen Hoeller 8bd58f9e19 context-specific "conversionService" bean may refer to annotation-configured converter beans (SPR-6800)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2975 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 00:42:39 +00:00
Juergen Hoeller 0aea1fe59a added PropertyPlaceholderConfigurer test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2974 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 00:22:06 +00:00
Juergen Hoeller ea753974d9 fixed rendering of select options for multi-list (SPR-6799)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2972 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 00:04:30 +00:00
Juergen Hoeller 6298f7bcdc relaxed test conditions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2961 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-12 00:02:32 +00:00
Juergen Hoeller 2f48d5f2ba relaxed test conditions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2959 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:15:15 +00:00
Juergen Hoeller 588e320284 canConvert checks Collection/Map element types as well (SPR-6564)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2954 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 12:23:57 +00:00
Juergen Hoeller 09d3d8b8fe made PersistenceAnnotationBeanPostProcessor's JNDI API references optional - for compatibility with Google App Engine (SPR-6679)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2953 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 11:36:33 +00:00
Juergen Hoeller 0760179df8 avoid double closing in case of shutdown hook (SPR-6793)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2941 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-10 13:49:51 +00:00
Juergen Hoeller 439b6f072c setAutoGrowNestedPaths throws an IllegalStateException if being called too late (SPR-6718)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2939 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 15:54:48 +00:00
Costin Leau b443d3ad7a SPR-5246
+ clarify order of annotation and XML injection

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2934 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-09 11:17:07 +00:00
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