spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-20 12:19:16 +00:00
Code Issues Projects Releases Wiki Activity
4,293 Commits 18 Branches 368 Tags
7e4033f2a5acc3028fa456c4f34cd90e2bb1b024
Commit Graph
4293 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Brannen 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Chris Beams 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
Rossen Stoyanchev 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
Sam Brannen 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
Rossen Stoyanchev 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
Sam Brannen 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
Rossen Stoyanchev 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Rossen Stoyanchev 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
Chris Beams 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
Chris Beams 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
Sam Brannen 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
Rossen Stoyanchev 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Sam Brannen 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Sam Brannen 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
Sam Brannen 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
David Syer 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
Rossen Stoyanchev 82339ea9bf SPR-7278 extension hook to extend the @ExceptionHandler methods for a controller 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4571 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 13:14:34 +00:00
David Syer c287a3c71b SPR-6268: Add proxy-target-class to <lang:groovy/> 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4570 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 12:14:01 +00:00
Chris Beams 089dd342e6 Fix non-compilable example in mvc ref doc 
Issue: SPR-7750

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4569 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 10:14:36 +00:00
Chris Beams b68f4d984a 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

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4568 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 09:47:19 +00:00
Chris Beams 4e2f464388 Consolidate tests related to @Config inheritance 
Issue: SPR-8183

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4567 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 09:46:19 +00:00
Rossen Stoyanchev 6f537ca74b SPR-7812 RequestCondition refactoring with the possibility for custom request conditions in mind. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4566 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 09:39:49 +00:00
Arjen Poutsma 12faecff7b SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4565 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 09:07:12 +00:00
Arjen Poutsma 8836abe57d SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4564 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 09:06:02 +00:00
Chris Beams 02312e578a Prefer / or /app/* over /main in servlet examples 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4562 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-16 22:42:50 +00:00
Chris Beams efb738cd04 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

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4561 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-16 07:53:42 +00:00
Chris Beams 5a26457fca 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

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4560 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-16 06:34:23 +00:00
Chris Beams 6a7cb58fe3 Preserve shadowed fields in DirectFieldAccessor 
Prior to this change, DirectFieldAccessor would ignore fields shadowed
in subclasses, favoring the last field processed, which happens to be
the most super declaration based on the way ReflectionUtils.doWithFields
works.

Because the locally shadowed field may be of a different type that the
superclass declaration, it is most correct to preserve and work with
the shadowed field.

Issue: SPR-8398

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4559 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-16 06:33:44 +00:00
Chris Beams 391c4cd67a Update pom and .classpath to reflect Castor upgrade 
Issue: SPR-8341 SPR-8453

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4558 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-16 04:36:53 +00:00
Rossen Stoyanchev b8ada5e596 SPR-8448 Remove URI template vars from the model before appending to query string in RedirectView 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4557 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 21:07:37 +00:00
Juergen Hoeller 8c0cfc859b restored support for String-to-ContextResource conversion (SPR-8383) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4555 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 15:40:12 +00:00
Chris Beams ca3d9a55d9 Clarify TransactionCallback Javadoc 
Issue: SPR-8390

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4554 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 13:04:07 +00:00
Arjen Poutsma d9f6dcf6b4 Ignoring test failing on build server, though it works locally. No idea why. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4553 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 12:26:43 +00:00
Arjen Poutsma f09ac3ce82 SPR-8453 - SpringOXM CastorMarshaller tests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4552 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 11:45:23 +00:00