a19a8f5c6d
[SPR-8387] refined logging for failed generation of defaults; polishing JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4625 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-26 15:36:07 +00:00
01a490225f
fixed typo
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4624 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-25 15:53:43 +00:00
147e11341e
Polish WebApplicationInitializer Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4623 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-25 03:49:54 +00:00
653c3b5280
SPR-5749: Add defensive matching using target class loader
...
* Changes to ASpectJExpressionPointcut plus some tests in Spring AOP
* plus some tests in groovy support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4622 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-24 17:23:43 +00:00
d6cb75f2de
SPR-7608 Add fallback mechanism for instantiating a model attribute from a path variable
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4621 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-24 17:18:53 +00:00
166ad38200
SPR-6909 Improve extension hooks in DefaultDataBinderFactory and subclasses.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4620 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-24 12:04:16 +00:00
78796d4ea9
SPR-8484 Add path variables to the model via AbstractView.render(..) rather than HandlerMethodArgumentResolver
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4619 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-24 10:09:28 +00:00
591f19c4cf
SPR-7746 Add examples of using regex in URI template vars and working with 'Last-Modified' HTTP requests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4618 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-23 15:28:57 +00:00
f5d5007bd3
SPR-8476 Translate JsonMappingExceptions to HttpMessageNotReadableException (and thus response status code 400) consistent with JsonParseExceptions
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4617 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-23 13:17:18 +00:00
b521a6ac7c
SPR-8429 Add test cases for missing header, cookie, and pathvar values
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4616 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-23 12:47:54 +00:00
f265f8797a
Add boolean flag in RequestMappingHandlerMapping to indicate if type- or method-level @RequestMapping annotation is being introspected
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4615 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 22:29:26 +00:00
458c87c16b
DefaultListableBeanFactory etc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4612 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:57:21 +00:00
2a7d7ad9c3
DefaultListableBeanFactory is only deserializable through a SerializedBeanFactoryReference
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4611 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:56:23 +00:00
e12c5923f6
getBean(name, type) attempts type conversion if necessary (SPR-8480)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4609 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:54:02 +00:00
6335538e35
getBean(name, type) attempts type conversion if necessary (SPR-8480)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4607 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:52:28 +00:00
0f36ee7f26
SPR-7787 Allow qualifiers in regular expressions of URI template patterns.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4606 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:39:10 +00:00
71e32d3261
SPR-8452 Provide getter for statusCodes property of SimpleMappingExceptionResolver
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4605 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 19:29:35 +00:00
bb5ea0a8aa
SPR-7210 Add setModelKey and setModelKeys to MappingJacksonJsonView for consistency with MarshallingView.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4604 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 19:08:44 +00:00
7e4033f2a5
[SPR-8386] polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4603 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 13:21:11 +00:00
d8b8f91046
SPR-8444 Added MapAccessor and EnvironmentAccessor to EL context in the eval tag
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4602 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-21 16:50:00 +00:00
a9c7d0b32b
SPR-8429 Return 400 instead of 500 for required header/cookie/pathvar. This is also more in line with jax-rs.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4601 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-21 15:03:12 +00:00
d058ba4579
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
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4600 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-21 14:59:37 +00:00
58727ac9c6
SPR-6164 Add option to disable '.*' pattern matching in RequestMappingHandlerMapping and PatternsRequestCondition
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4599 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-21 11:29:44 +00:00
18b560b769
[SPR-8386] ContextLoader resolution once again ignores the inheritLocations flag on @ContextConfiguration.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4598 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 21:49:44 +00:00
1f81b4e277
SPR-8464 Fix problem in test with date formatting
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4597 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 20:51:26 +00:00
ef56e8a327
[SPR-8386] Completed JavaDoc for ContextLoaderUtils regarding the SmartContextLoader SPI.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4596 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 19:44:30 +00:00
ee6900c19b
SPR-8464 Fix bug with detecting annotations on handler method arguments and consolidate anotation detection tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4595 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 19:32:27 +00:00
64ef05c047
[SPR-8386] Completed JavaDoc for AnnotationConfigContextLoader regarding the SmartContextLoader SPI.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4594 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 17:30:52 +00:00
ba046ad658
[SPR-8386] AbstractContextLoader now adheres to the SmartContextLoader contract by verifying the existence of generated default resource locations.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4593 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 16:20:14 +00:00
44d8f9ecbf
[SPR-8386] polishing JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4592 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 14:33:08 +00:00
0f435b495a
[SPR-7960] Documented inheritProfiles attribute of @ActiveProfiles.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4591 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 14:32:39 +00:00
aa00728440
SPR-8462
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4590 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 11:46:43 +00:00
d0e55b0564
Compensate for Windows paths in XmlBeanFactoryTests
...
Issue: SPR-8439
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4589 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 08:44:24 +00:00
1a4173d763
Clarify BeanPostProcessor ordering rules in ref doc
...
Issue: SPR-7550
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4588 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 06:48:36 +00:00
c4dcb63ab2
[SPR-8386] refining JavaDoc for MergedContextConfiguration and related classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4587 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-20 01:17:25 +00:00
e6bd842bd5
SPR-7812 Add CustomRequestCondition, PatternsRequestCondition, and other condition related tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4586 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 22:52:52 +00:00
8f7edda0da
[SPR-8386] fleshing out JavaDoc for SmartContextLoader and related classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4585 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 22:41:18 +00:00
cc386c5ac9
[SPR-8395] AnnotationConfigContextLoader now supports default configuration classes with arbitrary names
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4584 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 20:40:15 +00:00
f7ebe823ff
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4583 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 17:40:08 +00:00
6bf3acc605
[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.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4582 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 17:36:25 +00:00
1bae3f8c99
polishing Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4581 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 14:07:59 +00:00
2eac13ba10
ignoring patch files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4580 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-19 13:44:35 +00:00
664291a681
[SPR-8386] AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration when generating default configuration classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4579 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-18 19:58:53 +00:00
4b38c18b61
[SPR-8386] Polishing SmartContextLoader SPI; AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration as configuration classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4578 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-18 19:45:39 +00:00
422799d99a
SPR-7812 Remove remaining (empty) condition packages after moving classes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4577 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 23:29:07 +00:00
e1ca59e9a3
SPR-7812 Move condition package under mvc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4576 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 23:26:21 +00:00
29c2207c2e
SPR-7812 Add CustomRequestCondition
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4575 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 23:19:14 +00:00
69b3be67c4
polishing developer documentation
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4574 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 21:51:01 +00:00
b617210d50
[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
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4573 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 21:49:06 +00:00
7613a1fc50
SPR-6268: check AnnotationUtils works with Groovy concrete classes (plus remove compiler warnings)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4572 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 13:35:57 +00:00
Sam Brannen
Chris Beams
David Syer
Rossen Stoyanchev
Juergen Hoeller