17 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Phillip Webb	a9290d80c4	Backport "Polish @Imports search code" ... Issue: SPR-9925 Backport-Commit: 4cdf46f83c Conflicts: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java	2013-01-22 15:19:52 +01:00
Phillip Webb	1f52f09089	Backport "Ensure @Imports are processed in correct order" ... Issue: SPR-9925 Backport-Commit: 3416e058a0 Conflicts: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java	2013-01-22 15:17:46 +01:00
Phillip Webb	e9616b7204	Backport "Prevent duplicate @Import processing" ... Refactor ConfigurationClassParser to recursively find values from all @Import annotations, combining them into a single unique set. This change prevents ImportBeanDefinitionRegistrars from being invoked twice. Issue: SPR-9925 Backport-Commit: 6d8b37d8bb Conflicts: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java	2013-01-22 15:15:25 +01:00
Phillip Webb	bbd5fc6f35	Backport "Polish Javadoc for @Import" ... Issue: SPR-9925 Backport-Commit: e6c4840356 Conflicts: spring-context/src/main/java/org/springframework/context/annotation/Import.java	2013-01-22 15:12:56 +01:00
Phillip Webb	42ab04a299	Remove accidentally committed interface @Override	2013-01-11 15:23:27 -08:00
Phillip Webb	5ae706ee10	Consider bridge methods in SpEL properties ... Revert ReflectivePropertyAccessor changes from 107fafb and instead consider all methods when resolving properties. Methods are now sorted such that non-bridge methods are considered before bridge methods. Issue: SPR-10162 Backport-Commit: fce7adc400	2013-01-11 15:17:51 -08:00
Phillip Webb	1cd7600d8a	Backport "Replace reference to aspectjrt with aspectjweaver" ... Replace reference to aspectjrt.jar with aspectjweaver.jar since aspectjrt is a subset of aspectjweaver and the full jar is required by Spring. Issue: SPR-8896 Backport-Commit: d70762baaf	2012-12-31 15:06:21 +01:00
Phillip Webb	7f081a5eb4	Update changelog	2012-10-28 11:59:42 -07:00
Phillip Webb	ea49c8b840	Polish whitespace	2012-10-28 11:13:46 -07:00
Phillip Webb	410b9f933e	Update changelog	2012-10-24 11:00:49 -07:00
Phillip Webb	a0745c0c0a	Support SQL exception translation for ORA-06550 ... Oracle error ORA-06550 will now raise a BadSqlGrammarException. Issue: SPR-9853 Backport-Commit: ba5a148d8d	2012-10-24 10:46:06 -07:00
Phillip Webb	cfdd50d8ab	Polish whitespace	2012-10-24 10:45:29 -07:00
Phillip Webb	e3136e65f4	Allow MapToMap conversion even w/out default ctor ... MapToMap conversion now works when the target map does not have a default constructor (as long as a new map copy is not required). Issue: SPR-9284 Backport-Commit: 38c4393592	2012-10-24 19:31:24 +02:00
Phillip Webb	ced6bb4569	Prevent memory leaks with @Configuration beans ... Refactor ConfigurationClassEnhancer to allow cglib caching of generated classes. Prior to this commit each enhanced @Configuration class would consume permgen space when created. The CallbackFilter and Callback Types are now defined as static final members so that they can be shared by all enhancers. Only the callbackInstances remain specific to a @Configuration class and these are not used by cglib as part of the cache key. Issue: SPR-9851 Backport-Commit: c8061393fb	2012-10-24 19:12:03 +02:00
Phillip Webb	4525527794	SpEL support for methods and properties on class … ... Update the ReflectiveMethodResolver and ReflectivePropertyAccessor to allow methods and properties of java.lang.Class to be resolved when the target object is a class. Issue: SPR-9017 Backport-Commit: d28592a6c6	2012-10-24 18:04:10 +02:00
Phillip Webb	98075c33c6	Chain exception cause on create failure ... Propogate root cause of exceptions thrown from createCollection and createMap. Issue: SPR-9285 Backport-Commit: 2e48656906	2012-10-24 15:47:11 +02:00
Phillip Webb	ca386c13fc	Close 'beans' tag in MVC namespace documentation ... Issue: SPR-9898 Backport Issue: SPR-9906	2012-10-22 10:07:51 -07:00