Commit Graph
4235 Commits
Author SHA1 Message Date
Juergen Hoeller bfa4db9fcb consistent dependency on Hibernate Validator 4.1.0.GA
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4542 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 21:39:17 +00:00
Juergen Hoeller a4827a93f6 refined WebLogic RMI descriptor to only mark 'getTargetInterfaceName' method as idempotent (SPR-8369)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4540 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 15:07:23 +00:00
Juergen Hoeller 0c0db1b888 refined EntityManagerFactory proxy exception (SPR-4383)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4538 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 15:02:40 +00:00
Arjen Poutsma a285d2daec SPR-8309 - Spring OXM schema improvement for CastorMarshaller
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4537 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 13:46:32 +00:00
Arjen Poutsma 1c509c0be0 Fixing tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4536 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 13:16:45 +00:00
Arjen Poutsma 9f176b5f20 SPR-7911 - Better handling of 204 No Content in RestTemplate
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4535 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 10:37:49 +00:00
Arjen Poutsma fdb834bd27 SPR-7931 - Checking for @XmlRootElement annotation should be made optional in Jaxb2Marshaller
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4534 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 09:46:18 +00:00
Rossen Stoyanchev 9f57017842 Extract base class from RequestMappingHandlerMapping, one that allows for discovering request mappings from something other than annotations
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4533 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 09:20:07 +00:00
Juergen Hoeller e384b637a3 prepared for 3.1 RC1 release
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4532 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-14 00:14:09 +00:00
Juergen Hoeller f88047c80f added further conversion tests (triggered by 3.0.6 backports)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4528 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 23:57:53 +00:00
Juergen Hoeller bbeed23f94 added further conversion tests (triggered by 3.0.6 backports)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4526 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 23:43:46 +00:00
Juergen Hoeller 22d5a23a54 revised JMS CachedConnectionFactory to avoid unnecessary rollback calls on Session return (SPR-8437); fixed JMS CachedConnectionFactory to fully synchronize its Session list (SPR-8436)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4523 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 22:32:42 +00:00
Juergen Hoeller c2ca360138 revised JMS CachedConnectionFactory to avoid unnecessary rollback calls on Session return (SPR-8437); fixed JMS CachedConnectionFactory to fully synchronize its Session list (SPR-8436)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4520 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 21:42:11 +00:00
Rossen Stoyanchev 6ecdc6ea2d SPR-8430 Rename WebMvcConfiguration to DelegatingWebMvcConfiguration, make it public and make delegation methods final
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4519 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 12:20:25 +00:00
Chris Beams 1cc3d3d46e Fix html{Encoding=>Escape} typo in spring.tld.xml
Issue: SPR-8380

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4518 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 08:41:06 +00:00
Chris Beams 61fc33ca61 Add missing isDebugEnabled guard in FrameworkServlet
Issue: SPR-8085

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4517 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 08:31:15 +00:00
Chris Beams cf8533fb97 Resolve ${...} placeholders in @PropertySource
Issue: SPR-8442

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4516 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-13 04:23:08 +00:00
Chris Beams 419288562b Polish @EnableScheduling Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4515 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-12 06:56:37 +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
Sam Brannen 5cde94dc4b Polishing Eclipse classpath settings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4513 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-11 19:56:48 +00:00
Sam Brannen f3dc392fde Fixed Eclipse classpath regarding Commons IO and Codec
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4512 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-11 19:26:38 +00:00
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