Commit Graph

211 Commits

Author SHA1 Message Date
Juergen Hoeller e35ed65ff9 Enum counts as simple value type
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2098 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-13 20:51:59 +00:00
Chris Beams d2cef2201b SPR-5682: Initial support for ConfigurationClassApplicationContext
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2048 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 00:35:17 +00:00
Keith Donald 722bdb7222 mapper initial commit
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2042 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-02 16:28:53 +00:00
Juergen Hoeller c6444ee017 renamed getAnnotations to getMethodAnnotations; added getMethodAnnotation and getParameterAnnotation convenience methods
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2037 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-01 15:20:31 +00:00
Juergen Hoeller bac9fee0be CustomEditorConfigurer supports PropertyEditor instances again (with deprecation warning); for XFire compatibility (SPR-6157)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2036 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-01 13:40:55 +00:00
Keith Donald 06201b5eb4 SPR-6032 & SPR-6033: Auto grow nested path enhancements to BeanWrapper
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2030 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-29 19:54:35 +00:00
Juergen Hoeller 599910699a fixed overview files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2005 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 08:47:18 +00:00
Mark Pollack 4e2aaf7934 SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2001 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 05:16:55 +00:00
Juergen Hoeller 7d68ca8992 PropertyPlaceholderConfigurer supports "${myKey:myDefaultValue}" defaulting syntax
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1994 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 22:34:02 +00:00
Juergen Hoeller c032a53d71 consistent dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1989 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:09:57 +00:00
Juergen Hoeller 0708205690 fixed regression: looking for annotation on original bean class as well, not just on exposed bean type (SPR-5981)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1988 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 14:59:26 +00:00
Juergen Hoeller 7f532b126d PropertyOverrideConfigurer's "ignoreInvalidKeys" ignores invalid property names as well (SPR-5792)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1987 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 14:40:13 +00:00
Juergen Hoeller c96e42e41e polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1979 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 21:19:28 +00:00
Juergen Hoeller 3cc2a42bec made InitDestroyAnnotationBeanPostProcessor's logger field transient (SPR-5962)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1978 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 21:17:30 +00:00
Juergen Hoeller 4a95222c98 SPR-6094: PostConstruct now processed top-down (base class first); @PreDestroy processed bottom-up (subclass first)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1977 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 20:53:21 +00:00
Juergen Hoeller 5446706ec7 AbstractBeanDefinitionParser can deal with null return value as well (SPR-5872)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1968 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 13:51:14 +00:00
Mark Pollack b5e25453d2 pom maintenance
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1952 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 07:37:30 +00:00
Keith Donald aa9794526d updated for change in conversion service api; source type desc now required
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1935 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 20:32:41 +00:00
Keith Donald fad7b691bf refined generic converter concept
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1932 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 19:57:59 +00:00
Juergen Hoeller 09cb11776e added default editors for "java.util.Currency" and "java.util.TimeZone"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1929 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 14:15:06 +00:00
Juergen Hoeller 472af43b0e polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1928 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 14:07:19 +00:00
Juergen Hoeller e8a9ef9bcf consistent loading of optional classes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1926 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 14:01:39 +00:00
Juergen Hoeller 56d0246713 adapted to Converter signature change
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1908 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-17 15:20:04 +00:00
Juergen Hoeller 5713ee318c consistently use varargs signature
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1907 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-17 10:24:56 +00:00
Juergen Hoeller 7fbf1cf583 avoid caching for expression results even when specified as TypedStringValue (SPR-6115)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1905 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-17 10:04:36 +00:00
Rob Harrop b4f29862b1 [SPR-6063] fixed issue with inconsistent views of PropertyDescriptors
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1900 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-16 09:53:14 +00:00
Juergen Hoeller 856b7edc51 protected @Autowired method can be overridden with non-annotated method to suppress injection; private @Autowired methods with same signature will be called individually across a hierarchy (SPR-6112)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1897 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 15:52:13 +00:00
Juergen Hoeller a65d974b14 initial JSR-330 injection support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:00:55 +00:00
Juergen Hoeller 44c7ef0d16 revised DefaultBindingErrorProcessor to use direct getPropertyName() and getValue() calls on PropertyAccessException itself (SPR-6111)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1892 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 10:51:50 +00:00
Rob Harrop 23e67fbe1c [SPR-6017] a few more tweaks to how getLocalName is handled
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1878 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-14 15:00:37 +00:00
Juergen Hoeller 05ab1cea77 @RequestParam and co support placeholders and expressions in their defaultValue attributes (SPR-5922); @Value expressions supported as MVC handler method arguments as well (against request scope)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1877 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-14 10:48:15 +00:00
Rob Harrop f809d37db3 [SPR-6017] a few more tweaks to how getLocalName is handled
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1876 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-14 10:43:04 +00:00
Rob Harrop 8bfc41077f [SPR-6017] a few more tweaks to the BeanDefinitionParserDelegate public contract
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1874 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-14 10:02:15 +00:00
Rob Harrop ebf625b081 more work on enabling non-namespace extensions of xml parsing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1871 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-11 20:00:04 +00:00
Rob Harrop fc6156dde9 [SPR-5644] Support for Enum<?> and Enum<T> values as FQN.FIELD_NAME in type conversion
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1869 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-11 18:31:51 +00:00
Juergen Hoeller 49e0531f37 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1858 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 23:03:22 +00:00
Juergen Hoeller 641f1eb58d BeanFactory prefers local primary bean to primary bean in parent factory (SPR-5871)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1857 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 23:01:26 +00:00
Rob Harrop b98d52b16b [SPR-3635] [SPR-5039] [SPR-5813] JMX annotation inheritance fixed
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1852 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 21:37:02 +00:00
Juergen Hoeller 54f08aeb88 added copy of SerializationTestUtils to beans module
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1851 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 21:00:48 +00:00
Juergen Hoeller 1e16aecadd BeanFactory supports ObjectFactory as a dependency type for @Autowired and @Value (SPR-6079)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1850 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 20:55:00 +00:00
Rob Harrop fd5b40d1cc reworked PropertyPlaceholderConfigurer to use new PropertyPlaceholderHelper
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1849 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 20:10:26 +00:00
Rob Harrop 2103fde78f fix to resource handling in PluggableSchemaResolver
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1842 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-08 08:37:10 +00:00
Juergen Hoeller 317022ee8e initial JSR-303 Bean Validation support; revised ConversionService and FormatterRegistry
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1836 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 23:58:42 +00:00
Juergen Hoeller 75e4b86c95 expression parser uses context's ConversionService by default
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1834 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 18:53:01 +00:00
Juergen Hoeller e4c3adba2d polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1832 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 18:37:01 +00:00
Juergen Hoeller 4354ffd683 updated to CGLIB 2.2 and EHCache 1.6.2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1830 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 18:04:27 +00:00
Juergen Hoeller 4446156e2f fixed currently-in-creation check to apply with any log level (SPR-5996)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1829 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 12:50:49 +00:00
Rob Harrop 4d0b327678 [SPR-6017] updated DBDR and BDPD to allow for overriding of namespace-specific methods
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1820 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-04 18:22:37 +00:00
Rob Harrop 17821d8d39 updated javax.el dependency to match the IDEA project file
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1819 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-04 18:17:38 +00:00
Rob Harrop f00f605469 [SPR-6004] Fixed NPE in BeanDefinitionParserDelegate when using empty namespace as the default
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1818 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-04 16:59:07 +00:00