Commit Graph

773 Commits

Author SHA1 Message Date
Juergen Hoeller 193c2c4fb7 fixed decorated BeanDefinition condition for early type checking in AbstractBeanFactory (SPR-7006)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3206 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-31 15:21:48 +00:00
Juergen Hoeller ab15578566 AbstractInterceptorDrivenBeanDefinitionDecorator exposes decorated BeanDefinition for early type checking in AbstractBeanFactory (SPR-7006)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3192 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-30 15:40:47 +00:00
Juergen Hoeller 8c437a8214 fixed DataBinder's conversion error handling for direct field access with ConversionService (SPR-6953)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3163 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-24 17:40:45 +00:00
Juergen Hoeller 639f4581e8 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3155 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-24 10:35:50 +00:00
Juergen Hoeller e62e56a1a4 BeanPostProcessors are allowed to return a null bean value in the middle of the chain (SPR-6926)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3154 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-24 10:34:21 +00:00
Mark Fisher 2afaf4870f updated commons-pool version in .classpath to match ivy config
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3148 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 21:44:52 +00:00
Mark Pollack 845001054a Change version of Hibernate Validator to 4.0.2 in pom.xml and eclipse .classpath to agree with version in ivy.xml
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3147 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 16:44:46 +00:00
Juergen Hoeller d609376c10 AopUtils.getTargetClass(...) never returns null (SPR-7011)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3136 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-22 18:31:13 +00:00
Juergen Hoeller 1d8ce7d5cf fixed double fixedField call for getFieldType (SPR-7019)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3134 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-22 15:08:57 +00:00
Sam Brannen 677a3d2615 FooConfig, Foo, Bar, and BarFactory are now public static classes in order to avoid a bug with JDT/Spring IDE where the classes cannot be found in the XML application context.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3117 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-19 12:39:34 +00:00
Juergen Hoeller 7b00d3d07d made CronSequenceGenerator public (SPR-6920)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3097 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 19:34:45 +00:00
David Syer 0c5a876ff2 RESOLVED - issue SPR-6955, SPR-6901 added DisposableBean to TaskExecutorFactoryBean
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3062 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-08 12:13:30 +00:00
Juergen Hoeller 50c8258e26 fixed TypeDescriptor toString for MethodParameter annotations (SPR-6924)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3051 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-04 13:50:43 +00:00
Juergen Hoeller 2dfb983d92 "conversionService" bean gets ignored if not of type ConversionService (SPR-6916)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3050 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-04 11:27:09 +00:00
Costin Leau 9a5e75861d + improve template for spring-context so that the import-package is updated automatically
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3037 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-25 15:46:54 +00:00
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