Commit Graph

171 Commits

Author SHA1 Message Date
Arjen Poutsma 0909d43f19 BindingJacsonConverter/View -> MappingJacksonConverter/View
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1510 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-10 14:25:39 +00:00
Mark Pollack 0d92d4afb3 SPR-5619 - (OpenSessionInViewTests, ClassUtilTests fixed)
Update org.sf.web/.classpath to refer to tiles 2.1.2

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1505 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-10 03:30:12 +00:00
Mark Pollack da4f4ef034 POM maintenance/development - initial jarjar support in maven build for ASM
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1504 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-10 02:12:50 +00:00
Mark Pollack ead546b2f2 SPR-5803 and additional POM maintenance/development
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1503 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-09 19:38:07 +00:00
Juergen Hoeller a848f64378 only call LocaleResolver when encountering an actual HttpServletRequest
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1499 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-09 10:03:17 +00:00
Juergen Hoeller 5c19909c61 preserve custom pre-bound RequestAttributes implementations (for Grails)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1490 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-08 15:11:15 +00:00
Juergen Hoeller 59b6b5ef0d extended checkResource(Locale) signature
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1489 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-08 13:37:27 +00:00
Juergen Hoeller 4315988726 updated Tiles support for Tiles 2.1 compatibility (SPR-5411)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1488 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-08 13:29:39 +00:00
Sam Brannen aef72ba508 [SPR-5895] Upgraded to EasyMock 2.5.1.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1462 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-03 09:32:15 +00:00
Sam Brannen 887f8b3c10 [SPR-5887] Upgraded to JUnit 4.6.0.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1461 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-02 18:07:55 +00:00
Arjen Poutsma 0a5241a8a1 Added defaultViews property.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1454 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-01 10:01:19 +00:00
Arjen Poutsma b4bf6c75da FixedJsonView
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1453 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-01 09:40:11 +00:00
Arjen Poutsma d8f28cb3da Fixing the build, stupid java.util.Date
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1450 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-30 09:05:56 +00:00
Sam Brannen 262fef0ff3 Fixed Eclipse .classpath by adding org.codehaus.jackson, org.codehaus.jackson.mapper, and org.mozilla.javascript.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1448 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-29 11:14:39 +00:00
Arjen Poutsma 90221b9fcd Test for SPR-5822 - Extend @CookieValue mapping to support user-defined types
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1423 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-25 11:50:00 +00:00
Arjen Poutsma 68c0ac014e SPR-5853 - JSON formatting view for Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1416 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-24 14:03:10 +00:00
Arjen Poutsma ec63210be3 SPR-5853 - JSON formatting view for Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1415 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-24 13:55:36 +00:00
Arjen Poutsma 79f41818aa Fixing build
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1414 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-24 13:26:01 +00:00
Arjen Poutsma d59c0145c9 SPR-5772 - Annotation handler method matching doesn't get method/param choice right
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1399 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-19 10:26:14 +00:00
Sam Brannen 5705ad0305 Repairing Eclipse classpaths and Ivy config:
- org.apache.openjpa -> 1.1.0
 - com.sun.syndication -> 1.0.0
 - javax.el -> 1.0.0

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1395 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-18 11:36:04 +00:00
Arjen Poutsma efd346d579 Added @Override
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1384 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-15 09:30:46 +00:00
Sam Brannen 1eb0b97748 JavaDoc typo
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1366 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-12 09:56:39 +00:00
Arjen Poutsma 1fe51d4a27 SPR-5802 - NullPointerException when using @CookieValue annotation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1349 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-11 08:53:56 +00:00
Arjen Poutsma 81b3fb47b2 Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1341 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-10 10:36:06 +00:00
Chris Beams 49b6bbc8fa RESOLVED - SPR-5523: Replace all 'package.html' artifacts with 'package-info.java'
* Applied patch submitted by Carlos Zuniga


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1281 50f2f4bb-b051-0410-bef5-90022cba6387
2009-06-01 04:14:22 +00:00
Arjen Poutsma b81ede9f55 Fixing tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1249 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-25 12:00:53 +00:00
Arjen Poutsma e241542e8d SPR-5782 - BufferedImageHttpMessageConverter
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1248 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-25 11:52:43 +00:00
Arjen Poutsma 16af500388 SPR-5766 - @ResponseBody
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1246 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-25 10:28:36 +00:00
Arjen Poutsma e8d4e6949d SPR-5768 - Rearrange logic in ServletHandlerMethodInvoker.getModelAndView()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1231 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-22 10:52:10 +00:00
Arjen Poutsma 76ca1add52 SPR-5767 - Misleading error message in HandlerMethodInvoker.resolveRequestBody()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1230 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-22 10:45:52 +00:00
Juergen Hoeller 3d4cb2a13a added Commons Lang for Velocity tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1177 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-13 20:52:06 +00:00
Juergen Hoeller 6691cd09ec Velocity/FreeMarker/TilesViewResolver only return a view if the target resource exists now
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1171 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-13 14:22:03 +00:00
Juergen Hoeller 8a49660e47 replaced Commons Collections dependency with Spring-provided LinkedCaseInsensitiveMap; revised CollectionFactory and Spring Map implementations for consistency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1166 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-12 23:37:43 +00:00
Juergen Hoeller 11450f1fdb updated all Spring Framework OSGI manifests to list unversioned imports explicitly; relaxed several OSGi bundle dependencies to optional and extended version ranges
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1159 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-12 16:43:15 +00:00
Arjen Poutsma 2b1d156acf SPR-5732 - When no type conversion strategy is found on a @Controller handler method bind target, a 500 error code should be returned not a 400.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1144 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-11 14:52:14 +00:00
Arjen Poutsma 3854aea64b SPR-4927 - Return 405 instead of 404 when HTTP method is not supported
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1142 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-11 13:32:28 +00:00
Arjen Poutsma 0650a6d471 SPR-5731 - @Controller method order effects @RequestMapping behavior in ways not expected
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1141 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-11 10:34:56 +00:00
Arjen Poutsma e22f772c4c SPR-5726: Unexpected @RequestMapping semantics when class-level and method-level mappings used together
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1128 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-08 10:02:17 +00:00
Juergen Hoeller 1d1dba1693 Servlet/Portlet ApplicationContexts use a specific id based on servlet/portlet name; DefaultListableBeanFactory references are serializable now when initialized with an id; scoped proxies are serializable now, for web scopes as well as for singleton beans; injected request/session references are serializable proxies for the current request now
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1127 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-07 22:29:55 +00:00
Juergen Hoeller c5521dfed7 added test for custom controller stereotype
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1104 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 18:37:43 +00:00
Arjen Poutsma 23b2eaa65d Moved DefaultHandlerExceptionResolver to fix a tangle.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1098 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 13:41:03 +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
Scott Andrews a7784bf36d updating Eclipse .classpath settings for Freemarker 2.3.15 upgrade
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1058 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-23 14:13:03 +00:00
Arjen Poutsma 9818f88199 SPR-4518 - @RequestMapping methods returning null have an implicit ModelAndView created
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1049 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 12:57:30 +00:00
Arjen Poutsma a9747a6c70 Upgraded to Rome 1.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1047 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 11:44:59 +00:00
Arjen Poutsma c9794c0f02 Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1044 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 22:16:32 +00:00
Arjen Poutsma f3fd3fa245 SPR-5690 - Request header filtering in @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1043 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 22:03:51 +00:00
Juergen Hoeller 0926cf79e6 revised WebApplicationContext lookup
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1032 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 22:28:31 +00:00
Juergen Hoeller b5e0328914 updated to FreeMarker 2.3.15 (SPR-4962)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1031 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 22:22:56 +00:00
Juergen Hoeller 17c423e2c4 exposed public getModel accessor (SPR-5686)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1028 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 19:51:25 +00:00