0045f40831
Cleaning up unused imports.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4765 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-23 15:23:41 +00:00
6da7842bdd
[SPR-8387] Added TODO.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4741 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:22:03 +00:00
2cad384641
[SPR-8549] Documented the equals() method implementation in MergedContextConfiguration.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4740 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:18:55 +00:00
af728a6aca
[SPR-8387] deleted resolved TODO.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4739 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:14:23 +00:00
bf5a4e7119
[SPR-8549] ContextCache is now keyed by MergedContextConfiguration instead of String; MergedContextConfiguration now implements custom hashCode() and equals() methods and no longer generates a context cache key.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4738 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 22:06:05 +00:00
d3a7fdadb0
revised Servlet 3.0 based StandardServletMultipartResolver for correct param/file distinction; added multipart content type and headers access to MultipartRequest (dropping the previous header access solution on MultipartFile); MultipartFilter uses a Servlet 3.0 based StandardServletMultipartResolver by default
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4736 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 20:46:53 +00:00
c76301e1f2
[SPR-8387] Log messages now refer to default detection instead of default generation.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4735 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 20:38:02 +00:00
95b80272c8
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4722 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-18 21:37:24 +00:00
ec3052cb5f
[SPR-8387] Fleshed out the implementation of DelegatingSmartContextLoader and corresponding tests.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4712 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-17 17:16:12 +00:00
539c6f95c9
[SPR-8387] Fixed logic errors in DelegatingSmartContextLoader.processContextConfiguration() and ContextConfigurationAttributes.hasResources().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4710 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 20:01:18 +00:00
d123102495
[SPR-8387] Fixed logic error in DelegatingSmartContextLoader.processContextConfiguration().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4709 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 19:19:29 +00:00
0dd7ca7cf3
[SPR-8387] Introduced hasResources() in ContextConfigurationAttributes; plus minor polishing.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4708 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 19:03:16 +00:00
31047d5cae
[SPR-8387] Fleshing out the implementation of processContextConfiguration() in DelegatingSmartContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4707 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 17:15:45 +00:00
02fc11191f
[SPR-8387] Fleshing out unit tests for DelegatingSmartContextLoader.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4706 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 16:12:34 +00:00
344e8f93b2
extended Servlet API mocks for Servlet 3.0 forward compatibility as far as possible; made MockHttpServletResponse compatible with Servlet 3.0 getHeader(s) method returning Strings (SPR-8529); added getHeaderValue(s) method to MockHttpServletResponse for raw value access
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4705 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 14:51:01 +00:00
9711a7121e
extended Servlet API mocks for Servlet 3.0 forward compatibility as far as possible; made MockHttpServletResponse compatible with Servlet 3.0 getHeader(s) method returning Strings (SPR-8529); added getHeaderValue(s) method to MockHttpServletResponse for raw value access
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4701 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-15 14:16:31 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Juergen Hoeller
Chris Beams