spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity
4,333 Commits 18 Branches 369 Tags
3be44b3f97c1a0cc57ed0068eb6eb2ffbb148226
Commit Graph
4333 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Beams 3be44b3f97 Move JNDI_PROPERTY_SOURCE_ENABLED_FLAG constant 
Move JNDI_PROPERTY_SOURCE_ENABLED_FLAG from JndiPropertySource to
StandardServletEnvironment, as this is the only context in which the
constant makes sense.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4647 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-07-02 21:26:38 +00:00
Chris Beams 6427a1bd9e Return null from JndiPropertySource on lookup failure 
Issue: SPR-8490

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4646 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-07-02 21:26:30 +00:00
Sam Brannen a912a86667 fixed typo and formatting in Javadoc 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4645 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-07-01 17:33:13 +00:00
Chris Beams 11ce13a5b4 Fix unnecessary casts in Servlet*PropertySource 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4644 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-30 22:34:08 +00:00
Chris Beams 843106388e Introduce CommandLinePropertySource and impls 
Users may now work with command line arguments as a source of
properties for use with the PropertySource and Environment APIs.
An implementation based on the jopt library and a "simple"
implementation requiring no external libraries are are provided
out-of-the box.

See Javadoc for CommandLinePropertySource, JOptCommandLinePropertySource
and SimpleCommandLinePropertySource for details.

Issue: SPR-8482

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4643 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-30 22:33:56 +00:00
Rossen Stoyanchev 326503eac2 8483 Add support for MultipartFile arg type in RequestPartMethodArgumentResolver 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4642 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-30 21:04:23 +00:00
Costin Leau 08fc4f9015 SPR-8477 
+ add no-op cache implementations suitable for cache declarations w/o a backing store

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4641 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-30 18:17:39 +00:00
Rossen Stoyanchev 783d4077a6 SPR-8431 Extract RedirectView URL creation into separate method available for subclasses to use 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4640 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-30 09:13:51 +00:00
Chris Beams 39d8015752 Prevent NPE in SpringServletContainerInitializer 
Issue: SPR-8496

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4639 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-29 17:33:07 +00:00
Rossen Stoyanchev 09197872e9 SPR-8447 Provide sufficient contextwherever possible when exceptions are raised in new @MVC classes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4638 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-29 15:36:18 +00:00
Rossen Stoyanchev 538364c966 SPR-8483 Add support for @RequestPart annotated method parameters 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4637 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-28 19:22:33 +00:00
Juergen Hoeller b0383f9080 fixed getHeaderNames signature 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4636 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-28 14:08:47 +00:00
Juergen Hoeller 30f9c3c937 added headers support to MultipartFile abstraction 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4635 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 23:02:13 +00:00
Rossen Stoyanchev 75d036f82e SPR-8487 Ensure setters for argument resolvers and return value handlers replace the defaults completely. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4634 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 22:23:10 +00:00
Keith Donald 0997b2ef16 javadoc update 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4633 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 21:37:34 +00:00
Keith Donald f606eb3012 SPR-8465 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4632 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 21:36:48 +00:00
Rossen Stoyanchev 7f0f60575d SPR-7608 Add several sections to the reference docs on working with the @ModelAttribute annotation. Specifically the goal was to cover the abitlity for an @ModelAttribute argument to be instantiated from a URI template variable with the help of a Converter or a PropertyEditor. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4631 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 21:12:58 +00:00
Sam Brannen e31c95bfa6 [SPR-8387] polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4630 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 17:13:09 +00:00
Sam Brannen 91ab10775a [SPR-8387] skeleton for DelegatingSmartContextLoaderTests. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4629 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 17:01:32 +00:00
Sam Brannen 3b8cf1a454 [SPR-8387] Introduced supports(MergedContextConfiguration) method in the SmartContextLoader SPI; updated existing loaders accordingly; and fleshed out implementation of and tests for the new DelegatingSmartContextLoader. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4628 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 16:46:18 +00:00
Sam Brannen 3c32b612c7 [SPR-8387] refined logging. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4627 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 15:47:30 +00:00
Sam Brannen 41461db8a9 [SPR-8387] Initial draft of the new DelegatingSmartContextLoader. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4626 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 15:39:58 +00:00
Sam Brannen 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
Sam Brannen 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
Chris Beams 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
David Syer 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Juergen Hoeller 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
Juergen Hoeller 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
Juergen Hoeller 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
Juergen Hoeller 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
Rossen Stoyanchev 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
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