Commit Graph

4174 Commits

Author SHA1 Message Date
David Syer 24b857ac2c Add ignorable log file to .gitignore
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4466 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 21:01:37 +00:00
Sam Brannen 6a509f49b0 [SPR-8240][SPR-8401] Documenting @Configuration class and @ActiveProfiles support in the TestContext framework.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4465 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:23:29 +00:00
Sam Brannen b8d36919f4 Introduced toClassArray(Collection<Class<?>>).
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4464 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:13:13 +00:00
Sam Brannen 0c787ff902 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4463 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:12:58 +00:00
Thomas Risberg 8921682410 updated codes for Sybase (SPR-8125)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4462 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:05:06 +00:00
Keith Donald 7f93b47b4a narrow and elementType/keyValueType tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4461 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 18:51:37 +00:00
Keith Donald 90bb4c2256 added convert(Object, TypeDescriptor) convenience method; collection and map tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4460 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 18:36:58 +00:00
Keith Donald 0fcbb35889 null type descriptor handling
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4459 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 17:52:26 +00:00
Keith Donald eaa8a4271c improved null handling and javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4458 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 17:41:08 +00:00
Thomas Risberg f52a34e5b3 Added batchUpdate method taking a Collection, a batch size and a ParameterizedPreparedStatementSetter as arguments (SPR-6334)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4457 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 16:42:24 +00:00
Keith Donald c5425d0f43 broke out to top-level class for readability
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4456 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 08:37:08 +00:00
Keith Donald 89096b46b8 removed dependency on java.beans
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4455 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 08:29:14 +00:00
Keith Donald 911eb5fca8 javadoc and polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4454 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 07:14:34 +00:00
Keith Donald 4afc2c926d catch ConversionFailedException and fallback to default container conversion logic rather than propogate exception
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4453 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 06:04:49 +00:00
Keith Donald 15aad4b70a perform narrowing in reflective property accessor read methods as well
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4452 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 06:01:48 +00:00
Keith Donald b58386da08 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4451 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 05:46:27 +00:00
Keith Donald a34147a53d revised TypeDescriptor NULL and element/mapKey/mapValue type semantics
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4450 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 04:43:18 +00:00
Chris Beams ce08298e01 Add "What's new in Spring 3.1" to ref docs
Issue: SPR-8399

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4449 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 12:46:28 +00:00
Chris Beams 1c539e8a65 Rename ref docs section new-in-3 => new-in-3.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4448 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 12:45:58 +00:00
Chris Beams 235f3678ef Remove unused 'new-in-2' ref doc xml
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4447 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 12:45:31 +00:00
Chris Beams f852276232 Fix broken links in ref docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4446 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 12:45:11 +00:00
Keith Donald 4ee2900296 added TypeDescriptor resolveCollectionElement and Map key/value types
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4445 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 05:38:51 +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
Mark Fisher ac176da515 SPR-8205 added support for a 'trigger' attribute (bean ref) on scheduled-task elements
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4441 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 18:54:21 +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 c5cdb5602e Increased timeout in calls to assertStopWatchTimeLimit() to increase stability of the build.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4439 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 15:44:08 +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
Rossen Stoyanchev ad81cb5fcc SPR-8391 Minor documentation fixes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4434 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:50:12 +00:00
Rossen Stoyanchev b585202eb8 SPR-6709 Update changelog and add one test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4433 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:22 +00:00
Rossen Stoyanchev 0ecc885a24 Add ModelFactory test for HttpSessionRequiredException
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4432 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:16 +00:00
Oliver Gierke 67ffadd1f4 SPR-7477 - Added lazy-init attribute to jee namespace
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4431 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 08:51:56 +00:00
Chris Beams 976955f6ad Fix system environment tests on all platforms
Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4430 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 05:16:35 +00:00
Keith Donald b93a2b121d broke out pkg private classes from TypeDescriptor to improve manageability and testability
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4429 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 03:09:05 +00:00
Keith Donald 21e2dd87c9 more tests; several assertions for the programmer
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4428 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:18:22 +00:00
Keith Donald 0b33eb8842 javadoc polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4427 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:01:28 +00:00
Keith Donald 6af117037f more tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4426 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 01:55:41 +00:00
Keith Donald f13b99f4ea javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4425 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 00:51:17 +00:00
Keith Donald c7cae10364 simplified TypeDescriptor usage and updated use of the API across BeanWrapper and SpEL; collapsed PropertyTypeDescriptor into TypeDescriptor for simplicity and ease of use; improved docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4424 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 23:37:19 +00:00
Rossen Stoyanchev 5d69429178 SPR-6709 Handle RequestBodyNotValidException and update reference docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4423 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 18:27:50 +00:00
Sam Brannen 153b3fd101 Reverted Dave's changes to Eclipse project settings since we do not use Maven to build.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4422 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:59:52 +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 3a33f705e7 [SPR-8393] AnnotatedBeanDefinitionReader's constructor now inherits the Environment of supplied BeanDefinitionRegistry.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4420 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:35:02 +00:00
Sam Brannen 6fee394ac0 [SPR-8393] AnnotatedBeanDefinitionReader's constructor now inherits the Environment of supplied BeanDefinitionRegistry.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4419 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:33:12 +00:00
Rossen Stoyanchev da6976b562 SPR-6709 Support @Valid with @RequestBody method arguments
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4418 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:21:44 +00:00
David Syer 1e249085d2 SPR-7364: added separator property to database populator to deal with things like PL/SQL
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4417 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 16:22:26 +00:00