Commit Graph

3666 Commits

Author SHA1 Message Date
Chris Beams cb0e8dba2c Add proper default values for 'merge' attributes in collection elements (SPR-7656)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3766 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-15 07:56:02 +00:00
Juergen Hoeller 0d66d61117 Hibernate 3.6, etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3765 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 23:10:08 +00:00
Juergen Hoeller bbb728568e optimized AnnotationUtils findAnnotation performance for repeated search on same interfaces (SPR-7630)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3764 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 23:06:45 +00:00
Juergen Hoeller 43e06bfe41 revised OracleTableMetaDataProvider for reliable Oracle Connection detection; autodetect JdbcTemplate's NativeJdbcExtractor (SPR-7611)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3763 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 21:25:14 +00:00
Juergen Hoeller d0846425f5 fixed @Value injection to correctly cache temporary null results for non-singleton beans (SPR-7614)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3762 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 19:49:29 +00:00
Juergen Hoeller 5d4b7ee227 StringToArray/CollectionConverter trims element values before trying to convert them (SPR-7657)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3761 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 19:44:26 +00:00
Juergen Hoeller a52450e21a fixed @Value injection to correctly cache temporary null results for non-singleton beans (SPR-7614)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3760 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 19:40:36 +00:00
Juergen Hoeller 22ba9942f5 consistent caching of @Autowired arguments in field and method case (SPR-7635)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3759 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 09:34:31 +00:00
Juergen Hoeller b5bb1ac952 BeanWrapper etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3758 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:30:38 +00:00
Juergen Hoeller 2e9fe246e7 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3757 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:30:07 +00:00
Juergen Hoeller c025d123c9 BeanWrapper does not attempt to populate Map values on access (just auto-grows Map itself)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3756 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-14 00:14:50 +00:00
Juergen Hoeller f797ff683b resolve dependency outside of synchronized block before subsequently preparing cached arguments (SPR-7635)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3755 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 23:22:57 +00:00
Juergen Hoeller 0754a63e45 applied synchronization in order to avoid race condition in skipping check (SPR-7635, SPR-7642)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3754 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 22:29:28 +00:00
Juergen Hoeller 7f03e62424 moved async aspect to aspectj sub-package
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3753 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 21:06:38 +00:00
Juergen Hoeller 9f30623403 moved async aspect to aspectj sub-package
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3752 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 20:53:12 +00:00
Arjen Poutsma 716dd4a383 Docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3751 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 14:19:48 +00:00
Arjen Poutsma ff620e1f60 SPR-5367 - PathVariable mappings are greedy over hard coded mappings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3750 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-13 12:03:26 +00:00
Juergen Hoeller 6709989d1e fixed Autowired/CommonAnnotationBeanPostProcessor to prevent race condition in skipping check (SPR-7635, SPR-7642)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3749 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 22:56:38 +00:00
Arjen Poutsma 601368d10e SPR-6291 - UrlPathHelper is too aggressive decoding URLs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3748 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 12:09:43 +00:00
Arjen Poutsma a95297e787 SPR-7636 - XStreamMarshaller - Add support for configuring XStream with aliases by class (type) and also defining multiple attributes for the same class.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3747 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 11:55:29 +00:00
Arjen Poutsma 836928a116 SPR-7620 - StaxEventContentHandler does not set Location for StartDocument event
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3746 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:50:39 +00:00
Arjen Poutsma 2eabb640f5 SPR-7621 - AbstractStaxContentHandler sets NamespaceContext on every start/end element
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3745 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:41:23 +00:00
Arjen Poutsma b5e37c6e22 SPR-7621 - AbstractStaxContentHandler sets NamespaceContext on every start/end element
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3744 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-12 09:35:23 +00:00
Juergen Hoeller 4e4dfe5e34 fixed package declaration
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3743 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:26:32 +00:00
Juergen Hoeller 58417b5eaa serializer package etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3742 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:15:56 +00:00
Juergen Hoeller 9332a9eb11 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3741 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:15:26 +00:00
Juergen Hoeller 7fc788a676 revised initial cut of serializer package; moved Converter adapters to sub-package 'support'
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3740 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 21:15:12 +00:00
Juergen Hoeller 99d4de564f polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3739 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 20:03:40 +00:00
Juergen Hoeller c6a068f83d avoid double flushing of ObjectOutputStream when close is being called right afterwards anyway
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3738 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 20:00:45 +00:00
Oliver Gierke 5c7a62ce60 SPR-7641 - Added Principal to listing of supported method parameter types.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3737 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 19:59:16 +00:00
Juergen Hoeller 1a3d05d990 fixed JodaTimeContextHolder to use a non-inheritable ThreadLocal and expose a reset method (SPR-7441); use of remove() even when being called with a null argument
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3736 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 18:55:21 +00:00
Mark Fisher 759d182e4e SPR-7627 added Serializer and Deserializer strategies, Converter adapters, and default implementations
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3735 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 17:36:18 +00:00
Thomas Risberg abe052a3db added a SybaseAnywhereMaxValueIncrementer since syntax is slightly different than for Sybase ASE (SPR-7623)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3734 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-11 14:17:09 +00:00
Juergen Hoeller 37957aee1e revised TypedValue toString representation (SPR-7569)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3733 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:29:18 +00:00
Juergen Hoeller 1f72f746e6 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3732 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:09:59 +00:00
Juergen Hoeller 0ae66ec741 fixed detection of element type in case of nested collections (SPR-7569)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3731 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:09:43 +00:00
Juergen Hoeller 219fc737fe consistent handling of handler methods, init binder methods and model attribute methods (SPR-7355)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3730 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 21:01:04 +00:00
Juergen Hoeller 8e823bcf78 SpEL MapAccessor consistently rejects "target.key" style access to Maps if no such key is found (SPR-7614)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3729 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 20:22:15 +00:00
Juergen Hoeller e531a28d3b polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3728 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 20:11:53 +00:00
Juergen Hoeller 502d2b0779 initialize cache Maps early, turning them into final fields
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3727 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 20:11:44 +00:00
Juergen Hoeller 8c9f96584e SpEL method invocations prefer method with fewest parameters (e.g. no-arg over vararg; SPR-7633)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3726 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 19:23:01 +00:00
Juergen Hoeller 89f3436596 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3725 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 18:31:43 +00:00
Juergen Hoeller 2062b44c16 optimized @Bean error messages (SPR-7628, SPR-7629)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3724 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-10 18:31:03 +00:00
Juergen Hoeller f3be641136 Jdbc4NativeJdbcExtractor etc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3723 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 23:08:23 +00:00
Juergen Hoeller 37b8aa325b added configurable Connection/Statement/ResultSet target types to Jdbc4NativeJdbcExtractor (SPR-7613); added OracleJdbc4NativeJdbcExtractor with pre-configured Oracle JDBC API types
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3722 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 23:04:50 +00:00
Juergen Hoeller f917704e61 fixed embedded database exception test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3721 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 13:29:22 +00:00
Juergen Hoeller e13610b959 consistent handling of unwrap/isWrapperFor/isClosed in JDBC proxies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3720 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 12:38:37 +00:00
Juergen Hoeller e1ec1914d1 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3719 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 12:35:38 +00:00
Juergen Hoeller 0827d38890 ResourceDatabasePopulator throws descriptive ScriptStatementFailedException with resource details (SPR-7546)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3718 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-09 12:35:21 +00:00
Thomas Risberg 52503cfbaf added a nativeJdbcExtractor property for the TableMetaDataProvider and a method to specify the one to use for SImpleJdbcInsert (SPR-7611)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3717 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-08 18:28:01 +00:00