Commit Graph

304 Commits

Author SHA1 Message Date
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
Chris Beams 9cc8d7ef91 SPR-7009, SPR-6972: backed out unintentionally committed tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3145 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 15:29:35 +00:00
Chris Beams 20719a4b27 SPR-6972: removed import
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3143 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 12:06:24 +00:00
Chris Beams 667eed1794 SPR-6972: failed attempt to reproduce issue
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3142 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 12:06:16 +00:00
Juergen Hoeller 0cf5372475 do not insist on BeanDefinition presence for @Value resolution (for use in unit tests; SPR-6918)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3111 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-16 23:47:40 +00:00
Juergen Hoeller 47871d47e2 autowire="byType" ignores parameter name when choosing a primary bean, as defined (SPR-6917)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3075 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-10 13:46:31 +00:00
Juergen Hoeller f6a13bac72 changed doGetBean signature back to protected (SPR-6957)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3074 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-10 13:38:46 +00:00
Juergen Hoeller 8c7221ce32 do not call isCurrentlyInCreation with null argument (in order to meet newly enforced assertions within the BeanFactory)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3059 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-05 10:49:24 +00:00
Juergen Hoeller 4a733513c1 added bean name assertions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3058 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-04 22:36:35 +00:00
Juergen Hoeller cbb2ee2048 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3053 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-04 13:58:02 +00:00
Juergen Hoeller b31b943209 widened AbstractFactoryBean's "getObjectType" signature to return any Class as well (SPR-6872)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3030 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-23 13:00:12 +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
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 8e30cd98fd do not ever consider Object as a candidate type for autowiring by type (SPR-6600)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3001 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-18 00:04:08 +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 e63911b373 improved "no matching factory method found" exception message (SPR-6837)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2978 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 13:01:46 +00:00
Juergen Hoeller bbdbb86f08 generified PagedListHolded (SPR-6825)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2960 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-11 23:24:45 +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
Juergen Hoeller f9f4b33552 do not try to convert read-only Collections/Maps (SPR-6808)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2932 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-08 12:29:21 +00:00
Sam Brannen eefe27fd95 Removed unused import.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2931 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-07 15:57:57 +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
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 ac1d678554 throw NotSerializableException if no serialization id is available
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2892 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:52:43 +00:00
Juergen Hoeller 6ad560d205 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2891 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 14:51:54 +00:00
Juergen Hoeller 7553d32b24 widened FactoryBean's "getObjectType" signature to return any Class<?> (SPR-6692)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2885 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 16:01:14 +00:00
Juergen Hoeller 735a7d5d75 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@2884 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-31 15:58:27 +00:00
Costin Leau 18afcd07c3 SPR-3709
+ improved example to work with multi-nested declarations
+ used JDK 5 syntax
+ added documentation code into trunk (including unit test) for easier future reference

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2867 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-27 12:25:04 +00:00
Juergen Hoeller 57211e124f changed exception wording from "recursive" to "cyclic" (SPR-6755)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2852 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-22 19:10:19 +00:00
Juergen Hoeller 0749baa867 fixed getPropertyTypeDescriptor to work for nested indexed property as well as for array property (SPR-6710)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2843 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-20 15:31:20 +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 3606d9c9e4 added default PropertyEditor for java.util.UUID (SPR-6696)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2840 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-20 09:32:03 +00:00
Juergen Hoeller 4aa17d8f22 collect exceptions across all constructors that have been tried (SPR-6720)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2839 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-20 09:29:50 +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
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 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 55557b778f use TypeDescriptor.forObject instead of constructor; enforce use of TypeDescriptor.valueOf through making the constructor private
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2683 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-15 20:18:31 +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
Juergen Hoeller a7bd975e4c removed getBeansWithAnnotation(Class,boolean,boolean) method from ListableBeanFactory; reimplemented getBeansWithAnnotation(Class) to avoid use of getBeanNamesForType(Object.class)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2641 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-13 23:23:34 +00:00
Juergen Hoeller 082111871b fixed accidental breakage in bean class resolution with tempClassLoader
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2640 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-13 16:07:03 +00:00
Juergen Hoeller eb07dd4636 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2638 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-13 15:30:52 +00:00
Juergen Hoeller e1e257ea1a bean properties of type enum array/collection can be populated with comma-separated String (SPR-6547)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2635 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-13 13:21:30 +00:00
Juergen Hoeller 0dae3cf6ea PropertyPlaceholderConfigurer is compatible with Spring 2.5 extensions such as GigaSpaces again (SPR-6514)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2609 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-09 16:09:12 +00:00
Juergen Hoeller f20044126d relaxed warning about ambiguous setters to only be logged in case of actual write access (SPR-6399)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2595 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-07 18:57:32 +00:00
Juergen Hoeller 8adc48b0cd import works with relative resources in other classpath roots again (SPR-6493)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2593 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-07 15:16:36 +00:00
Juergen Hoeller f811379713 made parse and decorate non-final (SPR-6526)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2586 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-07 09:16:00 +00:00
David Syer 2bad74c238 SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2579 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-04 18:25:31 +00:00
Juergen Hoeller 54f6989469 full support for formatters on array/collection elements (SPR-6504)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2569 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-04 00:34:40 +00:00
Juergen Hoeller 9970eda08a lenient property name casing, beyond standard JavaBeans conventions (SPR-6491)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2568 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-03 23:34:37 +00:00
Juergen Hoeller 65df1c6f4c constructor arguments can be overridden by name in child bean definitions (SPR-6463)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2546 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-30 12:17:28 +00:00