Commit Graph

2080 Commits

Author SHA1 Message Date
Juergen Hoeller 77243b1ac1 PropertyPlaceholderConfigurer supports "${myKey:myDefaultValue}" defaulting syntax
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1995 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 22:51:38 +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 afe3442b55 removed outdated "cacheJspExpressions" feature from ExpressionEvaluationUtils
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1993 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:56:00 +00:00
Juergen Hoeller 0978ac24aa added simplest possible ExpressionEvaluator
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1992 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:48:48 +00:00
Juergen Hoeller 1293735c82 removed Apache JSTL references completely
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1991 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:35:28 +00:00
Juergen Hoeller a59eb986b5 removed Apache JSTL references completely
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1990 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 15:31:10 +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 614f52073c initialize transaction synchronization before doBegin call in order to avoid OutOfMemory failures after resource binding
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1986 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 14:02:40 +00:00
Juergen Hoeller 504db8f514 factored out common resolveTypeArgument(s) method to GenericTypeResolver
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1985 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 12:51:52 +00:00
Juergen Hoeller a709d5ffce detect @Bean methods on registered plain bean classes as well (SPR-5795)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1984 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 10:45:56 +00:00
Juergen Hoeller 732f682877 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1983 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 10:21:40 +00:00
Arjen Poutsma dc9396315c SPR-5910 - Slight Improvement for Main JavaDoc in RedirectView
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1982 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 08:31:33 +00:00
Mark Pollack 97b13b66d4 pom maintenance - sync with ivy.xml
update junit version in ivy.xml for org.sf.aspects

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1981 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 06:09:54 +00:00
Mark Fisher 5657c50484 SPR-6142 AbstractMessageListenerContainer now accepts an implementation of the ErrorHandler strategy for handling any uncaught exceptions thrown while processing a Message. The default behavior is still to log at error-level only (no ErrorHandler).
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1980 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 22:06:46 +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 550ef4c700 revised Hessian/Burlap exception clauses (SPR-5897)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1976 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 19:35:44 +00:00
Keith Donald eacab1aa86 more tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1975 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 18:36:11 +00:00
Keith Donald f7569e3281 completed generic converter implementation
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1974 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 18:25:04 +00:00
Juergen Hoeller 86acdaa9e4 allow instrumentation to be specified as a regular VM agent even in OSGi (SPR-6147)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1973 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 18:14:20 +00:00
Juergen Hoeller 33845f11a6 revised JBoss VFS support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1972 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 17:05:39 +00:00
Juergen Hoeller c459b7e905 "data.sql" instead of "test-data.sql" (SPR-6020)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1971 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 16:16:40 +00:00
Juergen Hoeller 32f0a3cea6 "data.sql" instead of "test-data.sql" (SPR-6020)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1970 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 15:58:38 +00:00
Rob Harrop a6938ab41f updated testing chapter of ref guide
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1969 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 14:59: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
Keith Donald dd31f504cc todos
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1967 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 04:50:03 +00:00
Keith Donald 7edc333af9 map converters
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1966 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 04:45:04 +00:00
Keith Donald dd9eb663f2 string to map converters
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1965 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 04:20:23 +00:00
Mark Fisher 3823e25d1f SPR-6142 Moved ErrorHandler strategy interface to the org.springframework.util package so that it can be used by MessageListener containers in addition to TaskSchedulers.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1964 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-23 00:44:58 +00:00
Mark Fisher 21c153cd81 Updated the context module's .classpath file for Groovy 1.6.3 (from 1.5.1)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1963 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-22 23:52:27 +00:00
Keith Donald 46e8745cd8 more generic converters
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1962 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-22 20:28:23 +00:00
Keith Donald 6cfa92a487 conversion utils helper for common code
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1961 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-22 15:37:26 +00:00
Juergen Hoeller 95ea090dd9 restored parent property to accept ConversionService instead of GenericConversionService
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1960 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-22 13:37:32 +00:00
Juergen Hoeller 74b4dfc2bf skip processing when no PlatformTransactionManager found (SPR-3955)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1959 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-22 13:31:56 +00:00
Keith Donald 3c9fa8931d Beefed up test suite
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1958 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 22:59:48 +00:00
Keith Donald aa42b18241 javadoc and final
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1957 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 22:35:39 +00:00
Keith Donald ec1e1fca12 documented hooks
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1956 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 22:24:36 +00:00
Keith Donald ad1798ac6d polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1955 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 21:32:01 +00:00
Keith Donald bea740d62a getConverter calls now throw exception and query parent
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1954 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 21:24:37 +00:00
Arjen Poutsma fdf8b450e6 SPR-6130 - Be able to specify a default content type when no extension is used in ContentNegotiatingViewResolver
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1953 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 14:27:22 +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 ed497bfa50 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1951 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 05:51:10 +00:00
Keith Donald d73d226a53 removed ignored test now that convert system has been revised
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1950 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 05:40:55 +00:00
Keith Donald 7beb6a2e57 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1949 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 05:39:16 +00:00
Keith Donald 0420b17e44 collection to object
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1948 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 05:30:54 +00:00
Keith Donald 1c1d043fc8 generic converter revising
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1947 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 05:14:14 +00:00
Jeremy Grelle 0622172ea0 SPR-5931 - Allow non-standard attributes in <form> tags
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1946 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-21 02:48:00 +00:00