root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
4,302 Commits 17 Branches 354 Tags 372 MiB
Commit Graph

626 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Rossen Stoyanchev c4605e91b6 SPR-8454 Introduce Registration style objects, rename several Spring MVC *Configurer helpers to *Registry, add more tests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4545 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-15 08:06:42 +00:00
Juergen Hoeller bfa4db9fcb consistent dependency on Hibernate Validator 4.1.0.GA 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4542 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-14 21:39:17 +00:00
Rossen Stoyanchev 9f57017842 Extract base class from RequestMappingHandlerMapping, one that allows for discovering request mappings from something other than annotations 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4533 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-14 09:20:07 +00:00
Juergen Hoeller bbeed23f94 added further conversion tests (triggered by 3.0.6 backports) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4526 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-13 23:43:46 +00:00
Rossen Stoyanchev 6ecdc6ea2d SPR-8430 Rename WebMvcConfiguration to DelegatingWebMvcConfiguration, make it public and make delegation methods final 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4519 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-13 12:20:25 +00:00
Chris Beams 61fc33ca61 Add missing isDebugEnabled guard in FrameworkServlet 
Issue: SPR-8085

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4517 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-13 08:31:15 +00:00
Chris Beams b3e77d9ef2 Add syntax highlighting to Javadoc where necessary 
Issue: SPR-8426

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4514 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-12 06:56:17 +00:00
Rossen Stoyanchev 17a83ffec6 SPR-8430 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4509 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-09 15:12:02 +00:00
Rossen Stoyanchev 83a5f0bb4a Introduce base class for WebMvcConfiguration 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4503 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-09 11:17:45 +00:00
Juergen Hoeller 03adc3b632 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-09 09:58:15 +00:00
David Syer 0905eb333d SPR-5937: add param map to freemarker url macro 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4467 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-05 21:02:02 +00:00
David Syer 24b857ac2c Add ignorable log file to .gitignore 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4466 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-05 21:01:37 +00:00
Rossen Stoyanchev b585202eb8 SPR-6709 Update changelog and add one test 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4433 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 09:38:22 +00:00
Rossen Stoyanchev 5d69429178 SPR-6709 Handle RequestBodyNotValidException and update reference docs 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4423 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 18:27:50 +00:00
Rossen Stoyanchev da6976b562 SPR-6709 Support @Valid with @RequestBody method arguments 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4418 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 17:21:44 +00:00
Chris Beams 292916c66c Mention code alternatives in context and mvc XSDs 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4415 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 14:45:00 +00:00
Rossen Stoyanchev ac9a3d0541 SPR-8059 fix issue with != param condition 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4408 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 12:29:26 +00:00
Chris Beams c7a7618400 Improve ApplicationContextInitializer sorting 
ContextLoader and FrameworkServlet now use
AnnotationAwareOrderComparator to support @Order usage; previously
supported only implementation of the Ordered interface.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4381 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-30 12:55:33 +00:00
Chris Beams bd541aca94 Introduce Framework/DispatcherServlet constructors 
Constructors have been added to both FrameworkServlet and
DispatcherServlet to support instance-based programmatic registration
of Servlets within ServletContainerInitializer implementations in
Servlet 3.0+ environments, and more particularly when using Spring 3.1's
WebApplicationInitializer SPI.

This change also renames the method added to FrameworkServlet in
SPR-8185 from #initializeWebApplicationContext to #applyInitializers.
The reason being that a method named #initWebApplicationContext was
already present and the names overlapped confusingly.

Issue: SPR-7672, SPR-8185

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4380 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-30 12:54:48 +00:00
Chris Beams c7754d6d9b Fix DispatcherServlet warnings 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4379 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-30 12:54:24 +00:00
Arjen Poutsma 2e8c494824 Added tests for @RequestMaping produces and consumes 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4362 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-25 09:21:44 +00:00
Rossen Stoyanchev af8f63fa65 SPR-7353 Use canWrite to narrow down list of producible types 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4357 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-24 17:22:22 +00:00
Chris Beams c0b7d175e9 Delegate parent environment to child app contexts 
Calls to AbstractApplicationContext#setParent delegate the parent
context environment to the child.

This ensures that any property sources added to the parent are available
to the child as well as ensuring that any profiles activated are
activated everywhere.

Child contexts may still choose to replace their environment (through an
ApplicationContextInitializer, for example).  In any case, however, in
the root/child web application context relationship established by
ContextLoader + DispatcherServlet, the child is guaranteed to have
already been given the parent environment by the time it is delegated
to any ACIs.

See AbstractApplicationContext#setParent for implementation

See FrameworkServlet#createWebApplicationContext for order in which
setParent then initializeWebApplicationContext are called.

Issue: SPR-8185

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4353 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-23 10:04:00 +00:00
Chris Beams 1b34c00884 Support "contextInitializerClasses" init-param 
FrameworkServlet now has support equivalent to ContextLoader and its
"contextInitializerClasses" context-param introduced in 3.1 M1.

This allows users to specify ApplicationContextInitializers at the root
(ContextLoader) level and/or at the DispatcherServlet level.

Issue: SPR-8366

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4350 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-23 10:02:18 +00:00
Chris Beams 8f4c1c339e Polish FrameworkServlet Javadoc; fix warnings 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4349 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-23 10:01:49 +00:00
Rossen Stoyanchev 1b48f26900 SPR-7353 Respect 'produces' condition in ContentNegotiatingViewResolver, improve selection of more specific media type in a pair 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4340 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-20 17:02:20 +00:00
Chris Beams 2b6bcf470c Rename {DefaultWeb=>StandardServlet}Environment 
Issue: SPR-8348

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4338 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-20 03:55:56 +00:00
Rossen Stoyanchev f30ae5abc8 SPR-8352 Init and apply MappedInterceptors from AbstractHandlerMapping 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4331 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-19 16:45:25 +00:00
Rossen Stoyanchev 408be8082a SPR-8350 ContentNegotiatingViewResolver initialization for nested ViewResolvers 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4328 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-19 13:07:15 +00:00
Arjen Poutsma 66e1c8c743 @RequestMapping.consumes() and produces() now default to an empty array, instead of */* 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4324 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-18 11:34:47 +00:00
Rossen Stoyanchev 76abf77077 Use request attribute to check producible media types when writing to the response body 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4314 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-17 13:02:48 +00:00
Arjen Poutsma 22f2c2bde0 minor fix. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4313 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-17 12:22:21 +00:00
Arjen Poutsma 4cebd2ef0b Only respect RequestMappingInfos that have a pattern match in handleNoMatch 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4312 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-17 10:07:36 +00:00
Arjen Poutsma 7b6c98ac9b SPR-7353 - @ResponseBody and returned HttpEntity now respect @RequestMapping.produces() 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4311 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-17 09:45:57 +00:00
Rossen Stoyanchev 89b5be3754 SPR-2692 Update mvc chapter with URI template support in redirect: view names 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4310 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-16 13:24:42 +00:00