Commit Graph

4174 Commits

Author SHA1 Message Date
Rossen Stoyanchev 148a1378af Add UriTemplateServletHandlerMethodTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4214 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 17:18:07 +00:00
Rossen Stoyanchev 8246d7023d Add UriTemplateServletHandlerMethodTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4213 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 17:17:51 +00:00
Rossen Stoyanchev 68a7e5b3e2 SPR-8234 Switch to strongly typed custom argument resolvers property
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4212 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 15:50:04 +00:00
Arjen Poutsma 87473307d1 SPR-6180 - Upgrade Apache HttpClient to version 4.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4211 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 13:12:45 +00:00
Rossen Stoyanchev 69189ef12b SPR-8234 Argument resolver and return value handler configuration improvements
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4210 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-11 12:37:33 +00:00
Sam Brannen c7d9b440b9 [SPR-6184] completed JavaDoc for @ContextConfiguration.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4209 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-10 23:20:05 +00:00
Rossen Stoyanchev 238a2bc815 Fix issues encountered in Greenhouse
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4208 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-10 06:01:11 +00:00
Sam Brannen ab2083d4b8 [SPR-6184] completed JavaDoc for AnnotationConfigContextLoader; polished JavaDoc for other concrete context loaders.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4207 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 23:24:34 +00:00
Sam Brannen 833e85d991 [SPR-6184] added tests to verify support for @Configuration classes with TestNG; simplified existing TestNG tests using Spring 3.0 and 3.1 features.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4206 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 22:44:53 +00:00
Sam Brannen 98346213c1 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4205 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 21:40:08 +00:00
Sam Brannen 689016f074 [SPR-6184] additional sanity check tests analogous to those developed for [SPR-3896].
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4204 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 21:39:42 +00:00
Sam Brannen 68f285d39d [SPR-6184] polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4203 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 14:46:49 +00:00
Sam Brannen 3be106c34d [SPR-6184] Fleshed out JavaDoc for ResourceTypeAwareContextLoader and ContextLoaderUtils.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4202 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 14:34:16 +00:00
Sam Brannen 0598e870f0 Updated Eclipse code formatter settings for use with STS 2.6. Specifically, format_javadoc_comments=false, which requires that JavaDoc be formatted manually.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4201 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 13:31:02 +00:00
Sam Brannen 077328ea32 Added ? wildcard to suppress warnings.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4200 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-09 13:29:59 +00:00
Sam Brannen 5d0c5f7698 [SPR-6184] Introduced ResourceType enum for context loaders; documented tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4199 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 22:57:45 +00:00
Arjen Poutsma ca89d6e123 SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4198 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 13:33:58 +00:00
Arjen Poutsma a37c85f4fc SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4197 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 12:06:53 +00:00
Arjen Poutsma adc5aa7a69 SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4196 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 11:12:54 +00:00
Arjen Poutsma 7717b8cb5a SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4195 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 10:50:45 +00:00
Arjen Poutsma 16bae7e143 SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4194 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-08 09:26:17 +00:00
Rossen Stoyanchev bdc1544091 Javadoc updates
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4193 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-07 22:16:41 +00:00
Rossen Stoyanchev c0692e2ddf ModelAndViewContainer related refinements
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4192 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-07 18:09:28 +00:00
Sam Brannen 8ce2377066 fixed typo
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4191 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-07 08:00:23 +00:00
Rossen Stoyanchev cf6046e2dc SPR-8217 adding one class missed on last checkin
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4190 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 20:33:10 +00:00
Rossen Stoyanchev 64fbd3740d SPR-8217 update MVC namespace to use HandlerMethod infrastructure
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4189 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 20:28:47 +00:00
Rossen Stoyanchev 5338b4f012 Configurable arg resolvers and return value handlers
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4188 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 16:55:21 +00:00
Rossen Stoyanchev bc794c1304 Replace ModelAndViewContainer parameter with Object
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4187 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 15:30:19 +00:00
Rossen Stoyanchev 26f332b600 SPR-8216 Replicate ServletAnnotationControllerTests for HandlerMethod infrastructure
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4186 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 15:30:01 +00:00
Rossen Stoyanchev 674fd869b5 SPR-8215 Fix issue with tests compiling
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4185 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 11:52:18 +00:00
Rossen Stoyanchev cd93c27598 SPR-8215 Move HandlerMethod code into trunk
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4184 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-06 11:30:59 +00:00
Arjen Poutsma ed38afc3dd Allow for customization of the media type for forms.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4180 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-05 09:48:09 +00:00
Chris Beams 8dedf111bc Ignore non-prop 'set' methods in ExtendedBeanInfo
Previously, ExtendedBeanInfo would attempt to process methods named
exactly 'set'.  JavaBeans properties must have at least one character
following the 'set' prefix in order to qualify, and this is now
respected by EBI.

Thanks to Rob Winch for the patch fixing this problem.

Issue: SPR-8175

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4178 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-05 03:45:38 +00:00
Sam Brannen 772aee728b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4177 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 22:06:05 +00:00
Sam Brannen b953ffc0be polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4176 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 22:05:49 +00:00
Chris Beams 30fc529379 Touch up ApplicationContextInitializer Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4172 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 14:57:51 +00:00
Chris Beams 1dd763da18 Make ConfigurationClassBeanDefinitionReader public
Issue: SPR-8200

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4171 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 14:14:17 +00:00
Arjen Poutsma 0dd43ab107 SPR-7805 - Add support for package binding in the JibxMashaller
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4169 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-04 08:50:15 +00:00
Sam Brannen 190da51082 [SPR-6184] Implemented recursive search for configuration classes; introduced LocationsResolver strategy in ContextLoaderUtils with ResourcePathLocationsResolver and ClassNameLocationsResolver implementations.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4168 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 23:10:28 +00:00
Sam Brannen 29c33bcd7d [SPR-6184] Refactored internals of ContextLoaderUtils; @Ignore'd broken test.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4166 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:45:20 +00:00
Sam Brannen d63dba327d [SPR-6184] Updated TODOs.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4165 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:23:57 +00:00
Sam Brannen 9d601f8504 [SPR-6184] Added DefaultConfigClassInheritedTests to verify proper recursive search for configuration classes configured via @ContextConfiguration. This test is currently failing (as expected) and therefore @Ignore'd.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4164 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:22:43 +00:00
Sam Brannen 619ac47b00 Removed unnecessary declaration of @TestExecutionListeners.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4163 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:20:02 +00:00
Sam Brannen 7d88c46caa [SPR-6184] Extracted ContextLoader resolution functionality from TestContext into a new ContextLoaderUtils utility class.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4162 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 17:00:45 +00:00
Sam Brannen f4d500dfeb [SPR-6184] Introduced ResourceTypeAwareContextLoader interface and removed dependency on AnnotationConfigContextLoader in TestContext.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4161 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 16:37:24 +00:00
Sam Brannen caad437248 polishing JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4160 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 15:26:13 +00:00
Sam Brannen dac8a4087c [SPR-6184] Simplified AnnotationConfigContextLoader in TestContext.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4159 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 15:16:13 +00:00
Sam Brannen f2c2fed6e1 [SPR-6184] AnnotationConfigContextLoader now generates a default configuration class name; fleshed out documentation of AnnotationConfigContextLoader; introduced sub-package and suite for configuration class tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4158 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-03 14:37:29 +00:00
Andy Clement 3b666f9897 SPR-8174: varargs and primitive handling in SpEL
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4157 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-01 21:59:25 +00:00
Andy Clement 5b07305e7d SPR-7840: comparator dealing with nulls
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4156 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-01 18:51:35 +00:00