spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-21 21:39:05 +00:00
Code Issues Projects Releases Wiki Activity
3,732 Commits 18 Branches 368 Tags
bcb10f2fe47eea8fb448296a85a2b768404a92de
Commit Graph
32 Commits
Author SHA1 Message Date
Chris Beams 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
Juergen Hoeller b0c441b810 DispatcherPortlet's default resource serving explicitly prevents access to WEB-INF and META-INF (SPR-7540) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3708 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-10-02 00:03:09 +00:00
Juergen Hoeller 77e16a1a89 fixed Portlet UnavailableException tests (SPR-7542) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3696 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-29 13:45:50 +00:00
Juergen Hoeller 8a8a6dee7e fixed Portlet UnavailableException tests (SPR-7542) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3695 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-29 13:31:53 +00:00
Juergen Hoeller 4f829f3ae2 added MockMultipartFile to web-portlet module 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3651 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-06 23:22:03 +00:00
Juergen Hoeller 9bb2251455 reverted shortening of action exception parameter value; fixed multipart test (SPR-7495) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3650 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-09-06 23:11:11 +00:00
Juergen Hoeller 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
Juergen Hoeller 93fb8760ff consistent mocks between modules 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3586 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-08-15 22:02:40 +00:00
Juergen Hoeller 9a30fdb3b5 @ExceptionHandler works for inherited method and CGLIB proxies on Portlet controllers as well (SPR-7337) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3475 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-07-08 11:45:35 +00:00
Juergen Hoeller b012508bdf revised Portlet SessionStatus.setComplete() to avoid re-exposure of attributes in render phase (SPR-6126); shortened implicit model render parameter name to "implicitModel" (SPR-7149) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3407 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-06-09 20:09:53 +00:00
Juergen Hoeller 21be98a8b5 fixed @ExceptionHandler resolution in case of multiple matches at different inheritance levels (SPR-7085) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3264 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-04-18 18:48:24 +00:00
Juergen Hoeller 2ec66b066b NativeWebRequest detects native MultipartRequest even when decorated (SPR-6594) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3189 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-03-30 10:24:39 +00:00
Juergen Hoeller 79fc317d2e WebRequest is a resolvable dependency in Servlet/Portlet web application contexts (SPR-6727) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2845 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-20 22:09:13 +00:00
Juergen Hoeller 39bf8dc02e added chaining-capable "add" method to MutablePropertyValues 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2462 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-19 22:30:35 +00:00
Chris Beams 2d0a6d1db8 SPR-5529: removed package.html files 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2280 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-06 23:15:35 +00:00
Chris Beams 68ddf0e1dc SPR-5523: converted a few additional package.html artifacts to package-info.java 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2279 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-06 23:13:15 +00:00
Juergen Hoeller 1edefe991a fixed getBean signature ambiguity in tests 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2165 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-10-20 20:14:49 +00:00
Juergen Hoeller 3608581a42 @Event/ResourceMapping uniquely mapped to through event/resource id, even across controllers (SPR-6062); type-level @RequestMapping header conditions validated in Portlet environments as well 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2020 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-09-25 14:45:35 +00:00
Arjen Poutsma db7751e5ee SPR-2784: Support MultipartFile-array property 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1783 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-08-28 09:15:19 +00:00
Arjen Poutsma 8b37f28f2b SPR-5633 - Portlet-version of @ExceptionHandler 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1658 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-07-30 10:10:36 +00:00
Juergen Hoeller a5eb3d592d minimized local MockServletContext dependencies 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1096 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-05 12:35:33 +00:00
Juergen Hoeller 4a16bf7d5d added local Servlet API mocks 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1095 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-05 12:26:11 +00:00
Juergen Hoeller f70e482841 renamed "contextProperties" attribute to "contextParameters" (matching web.xml naming); "contextParameters" contains Servlet/PortletConfig parameters as well; added default "servletContext" and "servletConfig" environment beans; added default "portletContext" and "portletConfig" environment beans; added default web scope "application", wrapping a ServletContext/PortletContext; MockPortletSession supports destruction of session attributes on invalidation 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1094 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-05 12:12:01 +00:00
Arjen Poutsma d10d95e98d SPR-5426 - Allow for custom processing or result objects returned from handler/controller methods 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1093 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-05-05 11:40:36 +00:00
Juergen Hoeller 1d408b265f introduced @CookieValue annotation 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@560 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-01-20 18:32:24 +00:00
Juergen Hoeller d90f197bb5 consistent copies of mocks 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@558 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-01-20 18:01:51 +00:00
Juergen Hoeller 64c3767850 updated Spring Portlet MVC to Portlet API 2.0 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@552 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-01-19 23:32:32 +00:00
Chris Beams e1965dea0f eliminated svn:externals in favor of localized copies of shared artifacts 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@472 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-12-18 21:27:18 +00:00
Juergen Hoeller a8652700ba removed dependency on Servlet API mocks 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@468 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-12-18 18:58:26 +00:00
Chris Beams 2796c55974 Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@464 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-12-18 14:50:25 +00:00
Chris Beams 2455ed7977 moving unit tests from .testsuite -> .core, .beans, .web, .web.portlet, .web.servlet 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@453 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-12-17 18:45:41 +00:00
Arjen Poutsma fb6e776592 Initial import of portlet module 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@135 50f2f4bb-b051-0410-bef5-90022cba6387
 2008-10-27 12:01:57 +00:00