7e4033f2a5
[SPR-8386] polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4603 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
44d8f9ecbf
[SPR-8386] polishing JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4592 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
f7ebe823ff
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4583 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
1bae3f8c99
polishing Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4581 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
69b3be67c4
polishing developer documentation
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4574 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
786ca258b9
updated dependencies
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4496 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
32bca54000
[SPR-8386] polishing JavaDoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4444 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
d0368e1f1c
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4440 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
06b6d0a908
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4437 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
5e669b45d7
[SPR-7960] Renamed resolveActivatedProfiles() to resolveActiveProfiles().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4397 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
c7d9b440b9
[SPR-6184] completed JavaDoc for @ContextConfiguration .
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4209 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
98346213c1
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4205 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
68f285d39d
[SPR-6184] polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4203 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
772aee728b
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4177 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
Chris Beams
Juergen Hoeller