Commit Graph

590 Commits

Author SHA1 Message Date
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
Chris Beams c0b7d175e9 Delegate parent environment to child app contexts
Calls to AbstractApplicationContext#setParent delegate the parent
context environment to the child.

This ensures that any property sources added to the parent are available
to the child as well as ensuring that any profiles activated are
activated everywhere.

Child contexts may still choose to replace their environment (through an
ApplicationContextInitializer, for example).  In any case, however, in
the root/child web application context relationship established by
ContextLoader + DispatcherServlet, the child is guaranteed to have
already been given the parent environment by the time it is delegated
to any ACIs.

See AbstractApplicationContext#setParent for implementation

See FrameworkServlet#createWebApplicationContext for order in which
setParent then initializeWebApplicationContext are called.

Issue: SPR-8185

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4353 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:04:00 +00:00
Chris Beams 1b34c00884 Support "contextInitializerClasses" init-param
FrameworkServlet now has support equivalent to ContextLoader and its
"contextInitializerClasses" context-param introduced in 3.1 M1.

This allows users to specify ApplicationContextInitializers at the root
(ContextLoader) level and/or at the DispatcherServlet level.

Issue: SPR-8366

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4350 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:02:18 +00:00
Chris Beams 8f4c1c339e Polish FrameworkServlet Javadoc; fix warnings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4349 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 10:01:49 +00:00
Rossen Stoyanchev 1b48f26900 SPR-7353 Respect 'produces' condition in ContentNegotiatingViewResolver, improve selection of more specific media type in a pair
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4340 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 17:02:20 +00:00
Chris Beams 2b6bcf470c Rename {DefaultWeb=>StandardServlet}Environment
Issue: SPR-8348

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4338 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-20 03:55:56 +00:00
Rossen Stoyanchev f30ae5abc8 SPR-8352 Init and apply MappedInterceptors from AbstractHandlerMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4331 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-19 16:45:25 +00:00
Rossen Stoyanchev 408be8082a SPR-8350 ContentNegotiatingViewResolver initialization for nested ViewResolvers
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4328 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-19 13:07:15 +00:00
Arjen Poutsma 66e1c8c743 @RequestMapping.consumes() and produces() now default to an empty array, instead of */*
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4324 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-18 11:34:47 +00:00
Rossen Stoyanchev 76abf77077 Use request attribute to check producible media types when writing to the response body
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4314 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-17 13:02:48 +00:00
Arjen Poutsma 22f2c2bde0 minor fix.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4313 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-17 12:22:21 +00:00
Arjen Poutsma 4cebd2ef0b Only respect RequestMappingInfos that have a pattern match in handleNoMatch
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4312 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-17 10:07:36 +00:00
Arjen Poutsma 7b6c98ac9b SPR-7353 - @ResponseBody and returned HttpEntity now respect @RequestMapping.produces()
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4311 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-17 09:45:57 +00:00
Rossen Stoyanchev 89b5be3754 SPR-2692 Update mvc chapter with URI template support in redirect: view names
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4310 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-16 13:24:42 +00:00
Rossen Stoyanchev f4bfd5766a SPR-6996 Add mvc:interceptor bean references
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4307 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-13 18:06:55 +00:00
Rossen Stoyanchev 461c3dd1a6 SPR-8289 Ensure BeanNameUrlHandlerMapping and default HandlerAdapters are never 'turned off' through the MVC namespaces
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4304 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-13 15:46:37 +00:00
Arjen Poutsma 3f9a857d4c SPR-7353 - Added equivalent of JAX-RS @Produces to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4301 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-13 09:43:45 +00:00
Rossen Stoyanchev 416c282609 Add method to allow further validation of request mapping infos at startup + other minor javadoc updates.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4297 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-12 15:03:36 +00:00
Rossen Stoyanchev 4e0594afaf Rename EnableMvcConfiguration->EnableWebMvc, refine method names in WebMvcConfigurer, fix issue with MappedInterceptors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4290 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-11 18:02:07 +00:00
Arjen Poutsma f01ba3249f Make HTTP methods a RequestCondition
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4287 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-11 10:38:30 +00:00
Arjen Poutsma 5d10187239 SPR-7354 - Added equivalent of JAX-RS @Consumes to Spring MVC
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4279 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-10 09:23:00 +00:00
Rossen Stoyanchev da3ad5623b Refine HandlerMethod registration to allow detection by handler instance as well as by bean name
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4276 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-08 19:31:29 +00:00
Chris Beams fc3ccd1052 Expose return-value-handlers in mvc namespace
Mirroring the MvcConfigurer#addCustomReturnValueHandlers callback which
allows for providing a list of HandlerMethodReturnValueHandler types

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4271 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:13:44 +00:00
Chris Beams 9e0b7303b4 Rename RequestMapping types for concision
Remove 'Method' from RequestMappingHandlerMethodMapping and
RequestMappingHandlerMethodAdapter

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4270 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:13:05 +00:00
Chris Beams 210e278ce0 Rename DataBinderFactory subtypes for concision
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4269 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:12:14 +00:00
Chris Beams 078222d807 Introduce @EnableMvcConfiguration
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4268 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:11:19 +00:00
Chris Beams c892028705 Remove "Feature" support introduced in 3.1 M1
Feature-related support such as @Feature, @FeatureConfiguration,
and FeatureSpecification types will be replaced by framework-provided
@Configuration classes and convenience annotations such as
@ComponentScan (already exists), @EnableAsync, @EnableScheduling,
@EnableTransactionManagement and others.

Issue: SPR-8012,SPR-8034,SPR-8039,SPR-8188,SPR-8206,SPR-8223,
SPR-8225,SPR-8226,SPR-8227

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4255 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 19:03:52 +00:00
Rossen Stoyanchev 4bb26a9878 Resolve custom args after annotated args, set PATH_WITHIN_HANDLER_MAPPING attribute, and rename resolver for @ExceptionHandler methods
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4242 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-03 15:39:13 +00:00
Rossen Stoyanchev 18e98329db SPR-6909 Include URI template vars in data binding
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4241 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-26 11:54:54 +00:00
Rossen Stoyanchev 99a4e3bc0e SPR-7543 Add @PathVariables to the model
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4236 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 15:18:45 +00:00
Rossen Stoyanchev ef6efa3f6f Remove consumes from @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4234 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 14:54:55 +00:00
Rossen Stoyanchev ff1b05cd94 SPR-8247 review changes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4233 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 11:40:24 +00:00
Rossen Stoyanchev 4992938ee4 SPR-8247
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4229 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-20 21:41:17 +00:00
Rossen Stoyanchev 6aaff404ab SPR-8255
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4228 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-20 08:43:57 +00:00
Rossen Stoyanchev aae28ee298 SPR-8214 review unit tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4227 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-15 18:42:58 +00:00
Rossen Stoyanchev 6f8fa24e59 SPR-8248
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4226 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-15 06:42:18 +00:00
Rossen Stoyanchev 1660ec4b0e SPR-8214 Javadoc and polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4224 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-13 23:15:19 +00:00
Rossen Stoyanchev 19fdaaa74a SWF-8214 javadoc updates
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4218 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 13:23:14 +00:00
Rossen Stoyanchev ef1ce7d990 SPR-8094
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4216 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 10:46:57 +00:00
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
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
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
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