root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
4,348 Commits 17 Branches 354 Tags 372 MiB
Commit Graph

241 Commits

Author SHA1 Message Date
Juergen Hoeller b0383f9080 fixed getHeaderNames signature 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4636 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-28 14:08:47 +00:00
Juergen Hoeller 30f9c3c937 added headers support to MultipartFile abstraction 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4635 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-27 23:02:13 +00:00
Sam Brannen e31c95bfa6 [SPR-8387] polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4630 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 17:13:09 +00:00
Sam Brannen 91ab10775a [SPR-8387] skeleton for DelegatingSmartContextLoaderTests. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4629 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 17:01:32 +00:00
Sam Brannen 3b8cf1a454 [SPR-8387] Introduced supports(MergedContextConfiguration) method in the SmartContextLoader SPI; updated existing loaders accordingly; and fleshed out implementation of and tests for the new DelegatingSmartContextLoader. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4628 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 16:46:18 +00:00
Sam Brannen 3c32b612c7 [SPR-8387] refined logging. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4627 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 15:47:30 +00:00
Sam Brannen 41461db8a9 [SPR-8387] Initial draft of the new DelegatingSmartContextLoader. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4626 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 15:39:58 +00:00
Sam Brannen a19a8f5c6d [SPR-8387] refined logging for failed generation of defaults; polishing JavaDoc. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4625 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-26 15:36:07 +00:00
Sam Brannen 7e4033f2a5 [SPR-8386] polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4603 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-22 13:21:11 +00:00
Sam Brannen 18b560b769 [SPR-8386] ContextLoader resolution once again ignores the inheritLocations flag on @ContextConfiguration. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4598 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 21:49:44 +00:00
Sam Brannen ef56e8a327 [SPR-8386] Completed JavaDoc for ContextLoaderUtils regarding the SmartContextLoader SPI. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4596 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 19:44:30 +00:00
Sam Brannen 64ef05c047 [SPR-8386] Completed JavaDoc for AnnotationConfigContextLoader regarding the SmartContextLoader SPI. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4594 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 17:30:52 +00:00
Sam Brannen ba046ad658 [SPR-8386] AbstractContextLoader now adheres to the SmartContextLoader contract by verifying the existence of generated default resource locations. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4593 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 16:20:14 +00:00
Sam Brannen 44d8f9ecbf [SPR-8386] polishing JavaDoc. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4592 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 14:33:08 +00:00
Sam Brannen 0f435b495a [SPR-7960] Documented inheritProfiles attribute of @ActiveProfiles. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4591 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 14:32:39 +00:00
Sam Brannen c4dcb63ab2 [SPR-8386] refining JavaDoc for MergedContextConfiguration and related classes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4587 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-20 01:17:25 +00:00
Sam Brannen 8f7edda0da [SPR-8386] fleshing out JavaDoc for SmartContextLoader and related classes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4585 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-19 22:41:18 +00:00
Sam Brannen f7ebe823ff polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4583 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-19 17:40:08 +00:00
Sam Brannen 6bf3acc605 [SPR-8395][SPR-8386] AnnotationConfigContextLoader now generates a list of default configuration classes by finding all non-private, non-final, static, inner classes of the test class that are annotated with @Configuration; updated JavaDoc in AbstractGenericContextLoader and AnnotationConfigContextLoader to reflect changes resulting from the SmartContextLoader integration. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4582 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-19 17:36:25 +00:00
Sam Brannen 1bae3f8c99 polishing Javadoc 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4581 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-19 14:07:59 +00:00
Sam Brannen 664291a681 [SPR-8386] AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration when generating default configuration classes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4579 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-18 19:58:53 +00:00
Sam Brannen 4b38c18b61 [SPR-8386] Polishing SmartContextLoader SPI; AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration as configuration classes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4578 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-18 19:45:39 +00:00
Sam Brannen 69b3be67c4 polishing developer documentation 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4574 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 21:51:01 +00:00
Sam Brannen b617210d50 [SPR-8386] SmartContextLoader enhancements: 
- introduced processContextConfigurationAttributes() method in SmartContextLoader SPI
- refactored AnnotationConfigContextLoader, AbstractContextLoader, AbstractGenericContextLoader, ContextLoaderUtils, and TestContext implementations to take advantage of the SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes
- deleted ResourceTypeAwareContextLoader
- deleted ContextLoaderUtils.LocationsResolver and implementations
- moved context key generation from TestContext to MergedContextConfiguration

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4573 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-17 21:49:06 +00:00
Chris Beams b3e77d9ef2 Add syntax highlighting to Javadoc where necessary 
Issue: SPR-8426

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4514 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-12 06:56:17 +00:00
Juergen Hoeller e33805ddff shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4504 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-09 12:50:55 +00:00
Juergen Hoeller 03adc3b632 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility) 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-09 09:58:15 +00:00
Juergen Hoeller 786ca258b9 updated dependencies 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4496 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-08 22:51:21 +00:00
Sam Brannen 32bca54000 [SPR-8386] polishing JavaDoc 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4444 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 22:51:53 +00:00
Sam Brannen 39b790032f [SPR-7326] MergedContextConfiguration now ensures that it holds non-null arrays with proper semantics for TestContext's cache key generation. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4443 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 22:46:43 +00:00
Sam Brannen 59dea815c7 [SPR-7326] Added unit tests to verify proper semantics of TestContext's cache key generation. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4442 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 21:38:05 +00:00
Sam Brannen d0368e1f1c polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4440 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 16:19:41 +00:00
Sam Brannen 137353b2c2 Suppressing warnings for deprecation of SimpleJdbcTemplate; polishing JavaDoc; using TestNG assertions in TestNG tests. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4438 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 14:10:16 +00:00
Sam Brannen 06b6d0a908 polishing 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4437 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 13:40:45 +00:00
Sam Brannen dba7795ed7 [SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4436 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 13:39:15 +00:00
Sam Brannen 03b79452a9 [SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4435 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-03 13:11:06 +00:00
Sam Brannen b986a8f32b [SPR-7960][SPR-8386] Supporting declarative configuration of bean definition profiles in the TestContext framework: 
- TextContext now works with MergedContextConfiguration instead of locations and loader
- TextContext now builds context caching key from MergedContextConfiguration
- Test context caching is now based on locations, classes, active profiles, and context loader
- TextContext now delegates to SmartContextLoader or ContextLoader as appropriate
- AbstractContextLoader now implements SmartContextLoader
- AbstractGenericContextLoader now sets active profiles in the GenericApplicationContext 
- Introduced integration tests for profile support in the TCF for both XML and annotation config

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4421 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 17:51:37 +00:00
Sam Brannen 4497a9ad8d [SPR-7960][SPR-8386] First draft of SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4416 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-02 14:45:22 +00:00
Sam Brannen b6a38353ba [SPR-7960] Trimming profiles for good measure. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4400 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-01 15:04:34 +00:00
Sam Brannen 42bc8518db [SPR-7960] Renamed @ActivateProfiles to @ActiveProfiles and fleshed out JavaDoc. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4399 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-01 14:40:53 +00:00
Sam Brannen 5e669b45d7 [SPR-7960] Renamed resolveActivatedProfiles() to resolveActiveProfiles(). 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4397 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-01 12:59:47 +00:00
Sam Brannen 7a63437224 [SPR-7960] resolveActivatedProfiles() now resolves a unique set of activated profiles 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4396 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-06-01 12:56:50 +00:00
Sam Brannen 4218599fa5 [SPR-7960] No longer tracking empty activated profiles. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4394 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-31 22:29:14 +00:00
Sam Brannen 4449e26b7f [SPR-7960] No longer tracking empty activated profiles. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4393 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-31 22:12:53 +00:00
Sam Brannen 4e52a6da68 [SPR-7960] Initial support for @ActivateProfiles in tests. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4387 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-30 22:00:12 +00:00
Sam Brannen 675b6d0d33 [SPR-7960] Initial support for @ActivateProfiles in tests. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4386 50f2f4bb-b051-0410-bef5-90022cba6387
 2011-05-30 21:59:12 +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 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
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
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