Commit Graph

639 Commits

Author SHA1 Message Date
Juergen Hoeller df7a5c8d6f ContextLoader and FrameworkServlet support "contextId" parameter for custom serialization id
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4659 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-03 22:36:42 +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
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
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
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
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 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