Commit Graph

4214 Commits

Author SHA1 Message Date
Juergen Hoeller 312bda534f avoid Logger.getGlobal() - it's Java 7 only...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4511 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 23:15:27 +00:00
Juergen Hoeller c8627b2236 prepared Spring's DataSource and RowSet adapters for forward compatibility with JDBC 4.1
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4510 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 23:09:55 +00:00
Rossen Stoyanchev 17a83ffec6 SPR-8430
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4509 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 15:12:02 +00:00
Juergen Hoeller 0cb63fc463 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@4507 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 13:26:46 +00:00
Juergen Hoeller dd793ca2b0 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@4506 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 13:10:09 +00:00
Juergen Hoeller d2e7efee7e 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@4505 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 13:01:09 +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
Rossen Stoyanchev 83a5f0bb4a Introduce base class for WebMvcConfiguration
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4503 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 11:17:45 +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 df484f594f prefer use of varargs over arrays in bean property setters (for programmatic consumption)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4501 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 09:15:11 +00:00
Chris Beams 7b9bcc0099 Update javadoc memory and doc publication settings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4500 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 02:54:52 +00:00
Chris Beams 9374f72e41 Revert introduction of AnnotationConfigCapableAC
Per review with Juergen in light of SPR-8413, which will revisit the
overall structure of ACAC and ACWAC.

Issue: SPR-8365, SPR-8413

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4499 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 02:54:34 +00:00
Chris Beams 6e3189bee0 Add @EnableLoadTimeWeaving to "New in 3.1" ref doc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4498 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 02:53:57 +00:00
Juergen Hoeller 80c86075f0 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4497 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-08 22:52:43 +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
Juergen Hoeller b95c43e913 added section on JPA EntityManagerFactory bootstrapping without persistence.xml
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4491 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-08 08:03:03 +00:00
Juergen Hoeller c30b50471b extended coverage of JSF 2.0 implicit attributes: "viewScope", "flash", "resource"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4490 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-08 00:12:50 +00:00
Juergen Hoeller fcd4ca61c6 fixed pattern list test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4489 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 23:24:30 +00:00
Juergen Hoeller 6a20350a09 final preparations for 3.1 M2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4488 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 22:34:52 +00:00
Juergen Hoeller 6ff99b54d8 full support for arbitrary nesting of collections in fields (SPR-8394); proper type detection in nested collections within arrays
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4487 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 22:34:35 +00:00
Juergen Hoeller 0574baa690 full support for arbitrary nesting of collections in fields (SPR-8394); proper type detection in nested collections within arrays
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4486 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 22:33:23 +00:00
Keith Donald 031e9b64a7 added utility method to reduce code duplication
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4485 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:44:02 +00:00
Keith Donald 2410603cc4 assignability examples
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4484 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:14:02 +00:00
Keith Donald f40c101d6d implemented collection/map converter conditional matching checks; updated SpEL to reflect this behavior
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4483 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:00:28 +00:00
Juergen Hoeller cfd8d7dac4 added "packagesToScan" feature to LocalContainerEntityManagerFactoryBean (avoiding persistence.xml)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4482 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 16:56:47 +00:00
Keith Donald a87adacbfe fixed failing test; initial conditional converter impls for collections, arrays, and maps
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4481 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:56:51 +00:00
Keith Donald 2e88435aa4 added back element type checks in TypeDescriptor#isAssignable; clarified semantics in javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4480 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:33:44 +00:00
Rossen Stoyanchev 031f0d52e5 SPR-7994 Add missing optional flag for Rome library in spring-web
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4479 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:01:35 +00:00
Keith Donald b0a9781f0f restored TypeDescriptor getElementType, getMapKeyType, and getMapValueType compatibility; StringToCollection and Array Converters are now conditional and check targetElementType if present; TypeDesciptor#isAssignable no longer bothers with element type and map key/value types in checking assignability for consistency elsewhere; improved javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4478 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 02:51:44 +00:00
Keith Donald 034edc9e1f string to collection and array converters now are conditional and apply target element type match
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4477 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 22:48:00 +00:00
Thomas Risberg e8404a33ee fixed duplicate section ids
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4476 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 13:30:41 +00:00
Chris Beams c84c97d572 Preserve DefaultContextLoadTimeWeaver no-arg ctor
Issue: SPR-8317

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4475 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 13:15:10 +00:00
Arjen Poutsma 9e1d02da2b SPR-7439 - JSON (jackson) @RequestBody marshalling throws awkward exception
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4474 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 10:33:04 +00:00
Sam Brannen ce707c575d Added log entries for recent TestContext framework changes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4473 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 09:52:33 +00:00
Chris Beams a50e4a24a9 Introduce @EnableLoadTimeWeaving
Issue: SPR-8317

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4472 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 08:31:18 +00:00
Chris Beams 991a5f9a3f Polish WebApplicationInitializer Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4471 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 08:30:36 +00:00
David Syer 99e6c7c45d SPR-6717: Added support for database destroy scripts
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4470 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 07:28:25 +00:00
Thomas Risberg fff185d975 added check for existing configuration of generated keys before calling update with a KeyHolder. (SPR-7564)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4469 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 00:52:01 +00:00
Rossen Stoyanchev bbb51ad475 Updates to whats new in Spring 3.1 section
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4468 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 21:45:31 +00:00
David Syer 0905eb333d SPR-5937: add param map to freemarker url macro
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4467 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 21:02:02 +00:00
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