45e5b46fc2
Merge 3.1.0 development branch into trunk
...
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:
git merge -s recursive -Xtheirs --no-commit env
No merge conflicts, but did need to
git rm spring-build
prior to committing.
With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch. 3.1.0 snapshots will be available
per the usual nightly CI build from trunk.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:48:20 +00:00
6ea12936c8
AbstractJasperReportsView only sets locale model attributes if not present already
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3775 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-20 05:22:43 +00:00
92a3c025e8
reintroduced getHandler(request, cache) in deprecated form (after removing it in 3.0.4)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3768 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-15 14:05:22 +00:00
2e9fe246e7
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3757 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:30:07 +00:00
ff620e1f60
SPR-5367 - PathVariable mappings are greedy over hard coded mappings
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3750 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 12:03:26 +00:00
33c4c04276
made ResourceHttpRequestHandlerTests more reliable (SPR-7565)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3693 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-29 13:14:18 +00:00
32c08d1b3f
Review recent documentation and default servlet changes
...
- Relocate and fix typos in interface-based @RequestMapping tip (SPR-7537)
- Fix typos in constructor-arg 'name' disambiguation section (SPR-7443)
- Polish whitespace in DefaultServletHttpRequestHandler (SPR-7553)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3689 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-15 08:45:21 +00:00
41c5c62d2e
SPR-7553 - DefaultServletHttpRequestHandler fails on Google App Engine
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3679 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-13 19:58:26 +00:00
383b4c68a2
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3666 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 22:53:39 +00:00
9e04940e1c
fixed @MVC processing of parameter-level annotations to work with interface-based proxies again (SPR-7483)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3658 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 14:45:00 +00:00
f835d5f604
revised @RequestParam processing to support CSV-to-array/collection binding with ConversionService (SPR-7479)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3657 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-08 13:56:42 +00:00
ea2bbbb3be
allow for writing the response directly in a Portlet @ExceptionHandler method (like in the Servlet equivalent)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3645 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 21:43:26 +00:00
25a6ffa75f
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3644 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 21:20:03 +00:00
ba1e4c2d10
extended synchronization for methodResolverCache (SPR-7525)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3643 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-06 20:41:50 +00:00
c2a1d571d8
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3629 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 18:41:10 +00:00
be6a363e70
fixed EvalTag's EvaluationContext caching (SPR-7482)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3624 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-01 13:33:45 +00:00
7778cd8aed
SPR-7490 - Reverting RedirectView to it's 3.0.3 version
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3614 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-25 09:00:09 +00:00
000b904f7d
SPR-7316 - writeAcceptCharset now also set to false when using mvc namespace.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3613 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 14:53:00 +00:00
82e5f5f5d6
Publishing license and notice files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 13:17:31 +00:00
750dc01862
Prepping for 3.0.5
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 11:04:04 +00:00
2d3eeeb4ea
SPR-7471 - Regression in redirect URL encoding
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3607 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 08:54:42 +00:00
6e2e676581
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3601 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 21:24:21 +00:00
162a2b535a
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3600 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 20:39:28 +00:00
71c052155e
consistent converting and escaping of label values (following AbstractMultiCheckedElementTag's SPR-7174)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3599 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 20:39:14 +00:00
fded7496d5
renamed "mapping-order" to "order"; added "cache-period"
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3598 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 19:04:51 +00:00
628eff0773
return 404 in case of no media type found
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3597 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-16 19:02:12 +00:00
e39f0704a2
WebDataBinder and @MVC request param binding detect and introspect MultipartFile arrays as well (SPR-2784)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3588 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:51:02 +00:00
29c3bb3152
MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3587 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:46:15 +00:00
8a43bf4949
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3580 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 21:17:39 +00:00
3f7c46e16d
revised handler method resolution, in particular with respect to generic interfaces (SPR-7355)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3579 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 21:12:54 +00:00
7fa2da7e9a
revised DispatcherServlet's last-modified handling to properly work with scoped controllers
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3575 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-12 23:32:53 +00:00
0c98b55bc1
revised DispatcherServlet's last-modified handling to properly work with scoped controllers; added HEAD support to ResourceHttpRequestHandler
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3573 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-12 22:54:24 +00:00
93b98f48ed
refined logging of handler objects in order to avoid early access to scoped proxies (SPR-7456)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3571 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-12 22:14:20 +00:00
39787d0745
fixed JSP EvalTag to render null result as empty String instead of "null" String (SPR-7459)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3568 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-12 18:41:24 +00:00
2dccb96f85
SPR-7427 - URL in a redirect is not escaped by RedirectView
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3564 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-11 11:44:44 +00:00
385b21fc27
changed contentLength() from int to long
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3550 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-09 15:58:07 +00:00
1e389ddcc7
fixed package-info
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3549 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-08 23:31:48 +00:00
3f23b8f258
revised ResourceHttpRequestHandler (SPR-7116)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3548 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-08 23:25:49 +00:00
e820dda201
Clarify ServletException is thrown when no view is resolved (SPR-7339)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3530 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-07 13:57:07 +00:00
66fc997f5d
SPR-7116 - javadocs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3518 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-02 22:37:14 +00:00
c7f1a2fd76
SPR-7116 - Simplified (removed gzip and white-listing) and completed XML namespace config.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3516 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-31 01:09:40 +00:00
9406f95807
SPR-7116 further work in progress. Added white-listing by media type, checking MIME type from the ServletContext, and some additional validations.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3512 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-29 00:01:13 +00:00
5e2f7c9c6f
SPR-7116 work in progress. ResourceHttpRequestHandler is now functionally equivalent to the Spring JS ResourceServlet, with the exception of the resource concatenation feature (which will be deferred for reconsideration in 3.1).
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3510 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-27 04:45:43 +00:00
db2a10a1eb
avoid double ConversionFailedException nesting
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3505 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-26 20:33:34 +00:00
df00d608e2
SPR-7381 - HTTP headers returned as part of ResponseEntity(MultiValueMap<String, String> headers, HttpStatus statusCode) are ignored when using this constructor
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3488 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-16 13:47:19 +00:00
5592c72b25
SPR-7345 - HTTP 405 (Method not supported) returned when 404 Status (Not Found) was expected
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3487 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-16 10:06:19 +00:00
4852217b79
SPR-7346 - @RequestHeader negation expressions (e.g. !Accept=text/plain) are not applied
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3484 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-15 08:49:18 +00:00
c04668931d
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3481 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-12 19:54:37 +00:00
37bc8cf630
MVC HandlerExceptionResolvers prevent caching for exception views if preventResponseCaching=true (SPR-7334)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3480 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-12 19:54:05 +00:00
6b55137d3e
JSP EvalTag resolves "@myBeanName" references in expressions against the WebApplicationContext (SPR-7312); for consistency, expressions in an ApplicationContext support the same syntax against the local BeanFactory
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3479 50f2f4bb-b051-0410-bef5-90022cba6387
2010-07-12 19:36:26 +00:00
Chris Beams
Juergen Hoeller
Arjen Poutsma
Jeremy Grelle
Ben Hale