Commit Graph

4300 Commits

Author SHA1 Message Date
Juergen Hoeller 1c1bc9b3df DefaultListableBeanFactory etc 2011-06-22 20:57:21 +00:00
Juergen Hoeller c0dfbdeebc DefaultListableBeanFactory is only deserializable through a SerializedBeanFactoryReference 2011-06-22 20:56:23 +00:00
Juergen Hoeller 4664366aca getBean(name, type) attempts type conversion if necessary (SPR-8480) 2011-06-22 20:54:02 +00:00
Juergen Hoeller e0d558b084 getBean(name, type) attempts type conversion if necessary (SPR-8480) 2011-06-22 20:52:28 +00:00
Rossen Stoyanchev 2d29439130 SPR-7787 Allow qualifiers in regular expressions of URI template patterns. 2011-06-22 20:39:10 +00:00
Rossen Stoyanchev 54c82a53cd SPR-8452 Provide getter for statusCodes property of SimpleMappingExceptionResolver 2011-06-22 19:29:35 +00:00
Rossen Stoyanchev 5797fe7f62 SPR-7210 Add setModelKey and setModelKeys to MappingJacksonJsonView for consistency with MarshallingView. 2011-06-22 19:08:44 +00:00
Sam Brannen 6fa451733e [SPR-8386] polishing 2011-06-22 13:21:11 +00:00
Rossen Stoyanchev 564f0ec3c3 SPR-8444 Added MapAccessor and EnvironmentAccessor to EL context in the eval tag 2011-06-21 16:50:00 +00:00
Rossen Stoyanchev 5f76ad809f SPR-8429 Return 400 instead of 500 for required header/cookie/pathvar. This is also more in line with jax-rs. 2011-06-21 15:03:12 +00:00
Chris Beams 41e5d55d52 Fix bridge method detection for class hierarchies
Prior to this change, @Autowired injection against an instance of a
subclass having different visibility than its superclass would fail
if the @Autowired method is declared only in the superclass. This is due
to an apparent change in the rules around bridge method generation
between Java 5 and Java 6, and possibly even varying across compiler
vendors.

Now, BridgeMethodResolver is used consistently when detecting
@Autowired, @Inject and @Resource metadata to bypass these bridge
methods if they exist.

Issue: SPR-7900
2011-06-21 14:59:37 +00:00
Rossen Stoyanchev 8292491a53 SPR-6164 Add option to disable '.*' pattern matching in RequestMappingHandlerMapping and PatternsRequestCondition 2011-06-21 11:29:44 +00:00
Sam Brannen 2b5d2e5a0a [SPR-8386] ContextLoader resolution once again ignores the inheritLocations flag on @ContextConfiguration. 2011-06-20 21:49:44 +00:00
Rossen Stoyanchev a7ff8a2efa SPR-8464 Fix problem in test with date formatting 2011-06-20 20:51:26 +00:00
Sam Brannen 102674be20 [SPR-8386] Completed JavaDoc for ContextLoaderUtils regarding the SmartContextLoader SPI. 2011-06-20 19:44:30 +00:00
Rossen Stoyanchev 40fb1b21e1 SPR-8464 Fix bug with detecting annotations on handler method arguments and consolidate anotation detection tests. 2011-06-20 19:32:27 +00:00
Sam Brannen 82d09d432e [SPR-8386] Completed JavaDoc for AnnotationConfigContextLoader regarding the SmartContextLoader SPI. 2011-06-20 17:30:52 +00:00
Sam Brannen f7a849f9f4 [SPR-8386] AbstractContextLoader now adheres to the SmartContextLoader contract by verifying the existence of generated default resource locations. 2011-06-20 16:20:14 +00:00
Sam Brannen b00a6ccea5 [SPR-8386] polishing JavaDoc. 2011-06-20 14:33:08 +00:00
Sam Brannen 4b026756ae [SPR-7960] Documented inheritProfiles attribute of @ActiveProfiles. 2011-06-20 14:32:39 +00:00
Rossen Stoyanchev c41caa3c2f SPR-8462 2011-06-20 11:46:43 +00:00
Chris Beams 4fb811572e Compensate for Windows paths in XmlBeanFactoryTests
Issue: SPR-8439
2011-06-20 08:44:24 +00:00
Chris Beams 2d9ced04b1 Clarify BeanPostProcessor ordering rules in ref doc
Issue: SPR-7550
2011-06-20 06:48:36 +00:00
Sam Brannen 95ae6344c5 [SPR-8386] refining JavaDoc for MergedContextConfiguration and related classes. 2011-06-20 01:17:25 +00:00
Rossen Stoyanchev 6007801537 SPR-7812 Add CustomRequestCondition, PatternsRequestCondition, and other condition related tests 2011-06-19 22:52:52 +00:00
Sam Brannen 4d27cde6b7 [SPR-8386] fleshing out JavaDoc for SmartContextLoader and related classes. 2011-06-19 22:41:18 +00:00
Sam Brannen 81d8ce5597 [SPR-8395] AnnotationConfigContextLoader now supports default configuration classes with arbitrary names 2011-06-19 20:40:15 +00:00
Sam Brannen 427f31cb9c polishing 2011-06-19 17:40:08 +00:00
Sam Brannen a77cf0f652 [SPR-8395][SPR-8386] AnnotationConfigContextLoader now generates a list of default configuration classes by finding all non-private, non-final, static, inner classes of the test class that are annotated with @Configuration; updated JavaDoc in AbstractGenericContextLoader and AnnotationConfigContextLoader to reflect changes resulting from the SmartContextLoader integration. 2011-06-19 17:36:25 +00:00
Sam Brannen c070a4b0a4 polishing Javadoc 2011-06-19 14:07:59 +00:00
Sam Brannen 568d451d60 ignoring patch files 2011-06-19 13:44:35 +00:00
Sam Brannen d904bcbf03 [SPR-8386] AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration when generating default configuration classes. 2011-06-18 19:58:53 +00:00
Sam Brannen 46639c5a1d [SPR-8386] Polishing SmartContextLoader SPI; AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration as configuration classes. 2011-06-18 19:45:39 +00:00
Rossen Stoyanchev bede025eb9 SPR-7812 Remove remaining (empty) condition packages after moving classes 2011-06-17 23:29:07 +00:00
Rossen Stoyanchev aacdd36e04 SPR-7812 Move condition package under mvc 2011-06-17 23:26:21 +00:00
Rossen Stoyanchev 4826cae064 SPR-7812 Add CustomRequestCondition 2011-06-17 23:19:14 +00:00
Sam Brannen 7dd6932910 polishing developer documentation 2011-06-17 21:51:01 +00:00
Sam Brannen 9a56deb283 [SPR-8386] SmartContextLoader enhancements:
- introduced processContextConfigurationAttributes() method in SmartContextLoader SPI
- refactored AnnotationConfigContextLoader, AbstractContextLoader, AbstractGenericContextLoader, ContextLoaderUtils, and TestContext implementations to take advantage of the SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes
- deleted ResourceTypeAwareContextLoader
- deleted ContextLoaderUtils.LocationsResolver and implementations
- moved context key generation from TestContext to MergedContextConfiguration
2011-06-17 21:49:06 +00:00
David Syer 8e35734856 SPR-6268: check AnnotationUtils works with Groovy concrete classes (plus remove compiler warnings) 2011-06-17 13:35:57 +00:00
Rossen Stoyanchev e5eceafa3f SPR-7278 extension hook to extend the @ExceptionHandler methods for a controller 2011-06-17 13:14:34 +00:00
David Syer 64fd0b081d SPR-6268: Add proxy-target-class to <lang:groovy/> 2011-06-17 12:14:01 +00:00
Chris Beams 5bfeb34b89 Fix non-compilable example in mvc ref doc
Issue: SPR-7750
2011-06-17 10:14:36 +00:00
Chris Beams 4fc386a4f5 Provide default ParameterNameDiscoverer for AACBF
Prior to this change, AbstractAutowireCapableBeanFactory did not support
a default ParameterNameDiscoverer.  This meant that attempting to use
<constructor-arg name=".."> syntax would fail (with a fairly obscure
exception) as that feature depends on a ParameterNameDiscoverer to
introspect the constructor arguments.

This lack of a default was originally intended to avoid a dependency on
ASM, but now that (a) .asm is a built-in module and (b) .beans has a
non-optional compile-time dependency on .asm, there is no reason not to
provide this default.

The net effect is that in a number of locations throughout the
framework, namely in GenericApplicationContext and
AbstractRefreshableApplicationContext, it is no longer necessary to
explicitly call AACBF#setParameterNameDiscoverer. This also means that
using a naked BeanFactory (likely for testing scenarios) is that much
easier.

Issue: SPR-8184
2011-06-17 09:47:19 +00:00
Chris Beams 8cb5c36512 Consolidate tests related to @Config inheritance
Issue: SPR-8183
2011-06-17 09:46:19 +00:00
Rossen Stoyanchev 96b0752ddb SPR-7812 RequestCondition refactoring with the possibility for custom request conditions in mind. 2011-06-17 09:39:49 +00:00
Arjen Poutsma 3a332e556c SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events 2011-06-17 09:07:12 +00:00
Arjen Poutsma 7c504853cd SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events 2011-06-17 09:06:02 +00:00
Chris Beams e79e08d7f7 Prefer / or /app/* over /main in servlet examples 2011-06-16 22:42:50 +00:00
Chris Beams 5dc2d56600 Fix regression with covariant property return types
Prior to this change, the Property class introduced in 3.1 M2 validated
read/write property method pairs based on whether their parameter/return
types were equal to one another.  This precluded the valid possibility
of read method that returns a subtype of the write method's parameter
type, and represented a regression against 3.1 M1 and earlier versions.

The implementation now uses isAssignableFrom rather than a straight
equals check against the types.

Issue: SPR-8432
2011-06-16 07:53:42 +00:00
Chris Beams cc814519c8 Revert "Re-enable ignored JMX tests"
As of SPR-8093, jmxremote_optional.jar is present on the build
server in jre/lib/ext, but it is not by default present on local
developer / user machines, meaning that the build ends up broken
by default.

Issue: SPR-8089, SPR-8093, SPR-8458
2011-06-16 06:34:23 +00:00