Juergen Hoeller
8c8eead667
Removed AbstractAsyncConfiguration's abstract "asyncAdvisor" method for Java 8 compatibility (to avoid method overloading problem for configuration classes)
2014-01-05 02:28:27 +01:00
Juergen Hoeller
b35050caf2
Fixed Jackson2ObjectMapperFactoryBean class name in javadoc examples
2014-01-05 02:24:13 +01:00
Juergen Hoeller
72a5737ab9
Polishing
2014-01-05 00:02:54 +01:00
Juergen Hoeller
be2d915cc2
Consistent equals/hashCode/toString implementations in AnnotationMatchingPointcut/ClassFilter/MethodMatcher
...
Issue: SPR-11275
Issue: SPR-11276
(cherry picked from commit 0de307b
2014-01-05 00:02:47 +01:00
Juergen Hoeller
6045914057
Polishing
2014-01-03 23:02:51 +01:00
Juergen Hoeller
78646f1f32
Activated through rename to *Tests, and added method call interaction tests
...
Issue: SPR-7831
(cherry picked from commit 3bed6cf
2014-01-03 23:02:18 +01:00
Juergen Hoeller
f88cbda6ef
Introduced "spring.beaninfo.ignore" system property for optimized Introspector usage
...
Issue: SPR-9014
2014-01-03 14:14:10 +01:00
Juergen Hoeller
c48da0d9a4
Avoid hard reference to LocalValidatorFactoryBean in <mvc:annotation-driven> parser
...
Issue: SPR-11272
2014-01-03 12:18:49 +01:00
Juergen Hoeller
e3344898cd
Support varargs for DomUtils.getChildElementsByTagName
...
Issue: SPR-11272
2014-01-03 12:18:19 +01:00
Juergen Hoeller
2e123b01e5
Polishing
...
Issue: SPR-11259
(cherry picked from commit f0d2151
2014-01-01 19:24:37 +01:00
Juergen Hoeller
57eedf33d6
Refined logging to include target class for each transactional method name
...
Also simplified cache key 'hashCode' implementation, relying on 'equals' to differentiate between same method on different target classes.
Issue: SPR-11267
(cherry picked from commit 82ea9ec
2014-01-01 19:18:39 +01:00
Juergen Hoeller
f477a024ad
EhCacheFactoryBean does not call set(Sampled)StatisticsEnabled on EhCache 2.7/2.8
...
Issue: SPR-11265
(cherry picked from commit 73d8f06
2014-01-01 19:18:12 +01:00
Juergen Hoeller
5dddb492b8
Polishing around @Enable processing and @EnableTransactionManagement
...
Issue: SPR-11251
2013-12-23 23:09:00 +01:00
Juergen Hoeller
ecee20f1fe
@Enable registrars called with correct metadata when placed on superclass
...
Issue: SPR-11251
2013-12-23 23:07:59 +01:00
Juergen Hoeller
e08f743301
ResourceDatabasePopulator's setScripts takes varargs
...
(cherry picked from commit e3017c3
2013-12-23 23:05:34 +01:00
Juergen Hoeller
a05c957d0e
Polishing
...
Issue: SPR-11254
(cherry picked from commit 9a39f39
2013-12-23 23:05:10 +01:00
Juergen Hoeller
a2de329db9
Revised XMLEventStreamWriter to allow for empty elements with attributes
...
Issue: SPR-11254
(cherry picked from commit ee5b7fd
2013-12-23 23:04:58 +01:00
Juergen Hoeller
551364f668
Polishing
2013-12-20 00:40:14 +01:00
Juergen Hoeller
08aa22ff1f
InjectionMetadata caching per bean name needs to refresh when bean class changes
...
Issue: SPR-11246
2013-12-20 00:15:09 +01:00
Juergen Hoeller
a115a7dad5
Revised BeanInfoFactory javadoc
...
Issue: SPR-9014
2013-12-20 00:09:49 +01:00
Juergen Hoeller
f457319965
Consistent non-declaration of serialVersionUID
2013-12-20 00:06:40 +01:00
Juergen Hoeller
7ad6df8c75
Moved AnnotationBeanNameGenerator's String value check right before cast
...
Issue: SPR-11221
2013-12-20 00:02:27 +01:00
Juergen Hoeller
f5d5882f46
Fixed @Bean meta-annotation detection when using ASM
...
This turned out to be a bug in the ASM-based AnnotationMetadata implementation where has/getAnnotatedMethods didn't consider meta-annotations., in contrast to its StandardAnnotationMetadata sibling.
Issue: SPR-10488
(cherry picked from commit 105e176
2013-12-16 23:09:07 +01:00
Juergen Hoeller
0a4d28d5d5
Fixed primitive type assignability in BeanUtils.copyProperties
...
Issue: SPR-11231
(cherry picked from commit 8a3b4c6
2013-12-16 22:57:50 +01:00
Spring Buildmaster
9002742873
Next development version
2013-12-12 01:07:15 -08:00
Phillip Webb
c2d98de6a6
Update changelog
2013-12-12 00:28:01 -08:00
Juergen Hoeller
bf31f7178d
Polishing
...
(cherry picked from commit a3a4344
2013-12-11 23:58:16 +01:00
Juergen Hoeller
249d8379ae
Polishing
...
(cherry picked from commit aa6e6c1
2013-12-11 23:12:34 +01:00
Juergen Hoeller
bfcfbe41a1
Made BeanUtils.copyProperties defensive about property type mismatches
...
Issue: SPR-11209
(cherry picked from commit bc5affa
2013-12-11 23:12:33 +01:00
Phillip Webb
f17ae5a7a8
Replace references to VMware with Pivotal
...
Replace references to VMware in license, notices and maven generation
with Pivotal, Inc.
Issue: SPR-11073
(cherry picked from commit b085ec9
2013-12-11 14:10:28 -08:00
Juergen Hoeller
779d5716e5
Moved RequiredAnnotationBeanPostProcessorTests to correct package beans.factory.annotation
2013-12-11 18:45:23 +01:00
Juergen Hoeller
2a6c642408
Added tests for custom qualifier annotations on scoped @Bean methods
...
Issue: SPR-11116
(cherry picked from commit c5d7977
2013-12-11 18:44:13 +01:00
Juergen Hoeller
126116e759
DispatcherPortlet never uses a resource forward on Liferay
...
Issue: SPR-10791
(cherry picked from commit 9c157ea
2013-12-11 18:43:58 +01:00
Juergen Hoeller
1ea218cee2
MBean registration happens in a fully synchronized fashion for consistent results
...
Issue: SPR-11002
(cherry picked from commit 8d6d6be
2013-12-11 18:43:33 +01:00
Juergen Hoeller
ec78165072
Component scanning ignores attributes and meta-annotations on non-public annotations
...
Issue: SPR-11091
(cherry picked from commit 161819f
2013-12-11 18:42:48 +01:00
Juergen Hoeller
e4fb72f6e3
Fixed CGLIB class validation to not raising warning for static final methods
...
Issue: SPR-11107
(cherry picked from commit 9fbb57c
2013-12-11 17:46:23 +01:00
Juergen Hoeller
6fb10981b0
Fixed extractOutputParameters to properly extract ResultSet in all cases
...
Issue: SPR-11076
(cherry picked from commit 3ff3805
2013-12-11 17:45:51 +01:00
Juergen Hoeller
d48b9b1ef7
Actually accept String expressions for "prefetch" and "receive-timeout" in jms namespace
...
Issue: SPR-10986
(cherry picked from commit ccafccb
2013-12-11 17:45:15 +01:00
Juergen Hoeller
c3907cdae5
Added 546 to Sybase data integrity violation codes
...
Issue: SPR-11097
(cherry picked from commit 2d2226b
2013-12-11 17:44:47 +01:00
Juergen Hoeller
7f895222e1
Revised exclusion of java.lang.Class properties
...
Issue: SPR-11098
(cherry picked from commit 62ea627
2013-12-11 17:44:16 +01:00
Phillip Webb
22ece06b39
Add a 'bill of materials' project for Maven users
...
Add 'spring-framework-bom' meta-project that contains the other projects
in a dependencyManagement section.
Issue: SPR-11138
2013-12-11 10:01:23 -06:00
Sam Brannen
b20b7415d8
Make methods of TestContext non-final
...
This commit makes several methods of TestContext non-final in order to
allow TestContext to be mocked — for example with Mockito.
Note, however, that TestContext has been converted to an interface in
Spring Framework 4.0.
Issue: SPR-11144
2013-12-11 01:23:03 +01:00
Sam Brannen
38ad39f467
Do not repopulate RequestContextHolder in ServTEL
...
This commit fixes a bug introduced in the last commit.
ServletTestExecutionListener (STEL) now tracks whether it has already
populated the RequestContextHolder.
Issue: SPR-11144
Backport-Commit: 800018a817
2013-12-11 01:02:05 +01:00
Sam Brannen
6ded287144
Honor presence of @WebAppConfiguration in ServTEL
...
The previous commit for issue SPR-11144 revealed a bug in
ServletTestExecutionListener (STEL). Specifically, STEL acted on the
fact that the ApplicationContext for a given TestContext was an
instance of WebApplicationContext. This behavior could potentially
break test code from previous releases of the Spring Framework that
relied on a custom setup of the RequestAttributes in the
RequestContextHolder with a custom WebApplicationContext ContextLoader.
This commit addresses this issue by ensuring that STEL only comes into
play if the test class is annotated with @WebAppConfiguration (for
prepareTestInstance() and beforeTestMethod()) or if the TestContext
attribute named RESET_REQUEST_CONTEXT_HOLDER_ATTRIBUTE is set to
Boolean.TRUE (for afterTestMethod()).
Issue: SPR-11144
Backport-Commit: 099b10d23b
2013-12-10 23:54:05 +01:00
Juergen Hoeller
6e275b7663
Polishing
2013-12-10 22:48:42 +01:00
Juergen Hoeller
882726377f
Fixed ExtendedBeanInfo and its tests to accept JDK 8 b117+ introspection results
...
Specifically, read and write methods are allowed to express property types with superclass/subclass relationships in both directions now.
Issue: SPR-11139
(cherry picked from commit cb624e2
2013-12-10 22:48:35 +01:00
Juergen Hoeller
2e15f94cf2
Optimized use of JDBC 3.0 ParameterMetaData.getParameterType, caching information about drivers which do not support that feature
...
Issue: SPR-11100
(cherry picked from commit 4c8a789
2013-12-10 13:14:13 +01:00
Juergen Hoeller
d0fc38ec76
Fixed inner bean name determination for multi-level nesting scenario, calculating a unique bean name as early as possible now (and for any kind of bean scope)
...
Our per-bean caching in AutowiredAnnotationBeanPostProcessor and co relies on unique bean names, so this change fixes potential cache mismatch problems occuring there.
Issue: SPR-11131
(cherry picked from commit 242ecdc
2013-12-10 13:12:41 +01:00
Juergen Hoeller
8e52e650f4
Fixed type resolution for uninitialized factory-method declaration
...
Issue: SPR-11112
(cherry picked from commit 5dcd287
2013-12-10 13:12:32 +01:00
Juergen Hoeller
71650c0a44
Fixed evaluation of "!" operator in case of multiple profile expressions
...
Issue: SPR-11093
(cherry picked from commit 6078c27
2013-12-10 12:16:22 +01:00
