Commit Graph
3956 Commits
Author SHA1 Message Date
Chris Beams 36734d011a Remove unused MethodMetadata#getMethodReturnType
Introduced to support checking return types on @Bean methods but never
actually used.  May be reintroduced as necessary in the future.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4248 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 18:59:26 +00:00
Chris Beams 6c63e682a0 Introduce PropertyResolver#getPropertyAsClass
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4247 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 18:59:05 +00:00
Chris Beams 0b06055095 Rename Property{SourcesProperty}ResolverTests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4246 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 18:58:41 +00:00
Chris Beams 0b1f42ef66 Update MockEnvironment / MockPropertySource types
Reflecting signature changes in getProperty() methods

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4245 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 18:57:41 +00:00
Sam Brannen 0613ced0b2 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4244 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 15:35:40 +00:00
Sam Brannen ab05ddc486 [SPR-6184] Simplifying ContextLoader implmementation:
- Removed AbstractGenericContextLoader's createGenericApplicationContext() method.
- AnnotationConfigContextLoader now uses an AnnotatedBeanDefinitionReader instead of working with an AnnotationConfigApplicationContext.
- AnnotationConfigContextLoader now uses the supplied GenericApplicationContext to load configuration classes.


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4243 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-06 12:05:56 +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
Chris Beams bb4f48dcb3 Automatically close SessionFactory objects
SessionFactory objects created by
SessionFactoryBuilderSupport#buildSessionFactory are now DisposableBean
proxies that call SessionFactory#close and release any threadlocal
DataSource object.

This is the same behavior that has always occurred during LSFBean and
ASFBean destruction lifecycles (and still does). This destruction logic
has now been factored out into
SessionFactoryBuilderSupport#closeHibernateSessionFactory such that all
SFB types can reuse it easily.

Note that LSFBean and ASFBean are subclasses, respectively, of SFBuilder
and ASFBuilder and they each must disable the DisposableBean proxying in
order to avoid duplicate attempts at closing the SessionFactory. See
the implementations of wrapSessionFactoryIfNeccesary() for details.

Issue: SPR-8114

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4240 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-26 10:15:30 +00:00
Chris Beams 999100e7a2 Fix typo in aop reference documentation
Issue: SPR-8268

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4239 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-26 07:44:40 +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
Arjen Poutsma b8438b7396 Buffering RequestFactory that allows for multiple response body reads.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4235 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 15:09:44 +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
Arjen Poutsma d4f714010e added toString to HttpEntity
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4232 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 11:39:20 +00:00
Costin Leau f42da75682 SPR-8238
+ add NPE test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4231 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 08:07:12 +00:00
Costin Leau bff57c7925 SPR-8238
+ add handling for null arguments to prevent NPE in default key generation

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4230 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-21 08:00:42 +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
Thomas Risberg 9c39084b62 SPR-6922 deprecated SimpleJdbcTemplate/SimpleJdbcOperations/SimpleJdbcDaoSupport in favor of JdbcTemplate/NamedParameterJdbcTemplate and related interfaces support classes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4225 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-14 18:44:40 +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
Sam Brannen fd2c472058 Added Apache Commons HTTP JARs to the Eclipse classpath.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4223 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 21:58:38 +00:00
Micha Kiener fb40ff59ab SPR-6416, adding basic conversation object tests, improving the access time of the conversation object
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4222 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 19:51:50 +00:00
Micha Kiener c3db0f1abc SPR-6416, adding repository timeout setting tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4221 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 18:11:18 +00:00
Micha Kiener 41045f3b19 SPR-6416, adding conversation manager test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4220 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 16:02:46 +00:00
Micha Kiener 57e7223cde SPR-6416, reshaping removal of hierarchical conversations and adding repository test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4219 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 14:53:09 +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
Micha Kiener ab4a3568b1 SPR-6416, initial commit for the conversation management
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4217 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 13:21:18 +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
Arjen Poutsma ce8a55209e SPR-6180 - Upgrade Apache HttpClient to version 4.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4215 50f2f4bb-b051-0410-bef5-90022cba6387
2011-04-12 07:55:38 +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
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