Commit Graph

497 Commits

Author SHA1 Message Date
Sam Brannen d176edd69c Removed @Override.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2078 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-08 13:32:49 +00:00
Sam Brannen dcd8a34b1f Added an empty implementation of the missing setExclude() method so that the class compiles.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2077 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-08 13:25:43 +00:00
Keith Donald 8a7596d684 custom mappable type tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2076 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 21:33:53 +00:00
Keith Donald 0570219941 mappable type factory extension point / polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2075 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 20:27:48 +00:00
Keith Donald ae91b2f25b polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2074 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 19:37:07 +00:00
Keith Donald cabf63b8b1 mapping exclusions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2073 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 19:28:39 +00:00
Keith Donald 5bd6b04d37 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2072 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 19:11:22 +00:00
Keith Donald cc0959b59d nested bean mapper test
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2071 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 19:03:33 +00:00
Keith Donald 9e7b87105b addNestedMapper
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2070 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:50:03 +00:00
Keith Donald 89e7caa35b polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2069 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:36:30 +00:00
Keith Donald d6fe401c43 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2068 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:28:28 +00:00
Keith Donald b58da6e135 javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2067 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:18:10 +00:00
Keith Donald 0235eaad6c polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2066 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:03:02 +00:00
Keith Donald 65c91e5d81 javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2065 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 17:02:22 +00:00
Keith Donald a4bbec9726 renamed to MappingContext since no spel dep
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2064 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 16:56:13 +00:00
Keith Donald 5415ff882f added conversion service performance optimizations; added mapping cyclical ref handling; removed ConverterInfo in favor of specifying S and T at registration time if necessary
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2063 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-07 16:54:36 +00:00
Keith Donald a67c0f3065 nested revision
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2061 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-06 21:40:59 +00:00
Keith Donald 6719f4a1b3 spel mapping, polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2060 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-06 21:31:49 +00:00
Chris Beams d39d457d0e Continued progress on SPR-5682: Provide dedicated ApplicationContext implementations for use with @Configuration classes
Resolved sub-task SPR-6186: Eliminate duplicate code between ConfigurationClassApplicationContext and ConfigurationClassWebApplicationContext


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2055 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-06 01:38:16 +00:00
Keith Donald 73cc1b9fbe recursive mapping support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2052 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 20:28:10 +00:00
Chris Beams feaa82a874 SPR-5682:
* polishing for ConfigurationClassApplicationContext & tests
* added ConfigurationClassWebApplicationContext & tests
* next: refactoring out duplications between ConfigurationClassApplicationContext & ConfigurationClassWebApplicationContext


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2051 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 05:27:30 +00:00
Chris Beams b543486b18 SPR-5682: fixing test breakage on CI server due to strange non-determinism in the order of bean names being returned in the key set of the map of beans matching the required type.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2050 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 03:29:20 +00:00
Chris Beams ccdce1f590 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2049 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 00:51:19 +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 4af6fd7e0d SPR-6179, additional mapper test cases
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2047 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-04 04:13:27 +00:00
Sam Brannen 2efb56dcaa Fixed minor grammatical errors.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2044 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-03 22:19:21 +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
Sam Brannen 72c1465353 [SPR-6174] DataBinder now uses var-args to set allowed/disallowed/required fields.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2041 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-01 23:28:27 +00:00
Juergen Hoeller 2b72499587 expose arrays as comma-delimited element String
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2032 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-01 11:05:45 +00:00
Mark Fisher 23129d453c updated javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2019 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 14:25:56 +00:00
Mark Fisher 49ed02282c Renamed the 'size' attribute to 'pool-size' for the <executor/> and <scheduler/> elements in the task namespace.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2017 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 14:19:42 +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 092ff94ce7 removed 3.1 feature classes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1996 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 22:53:17 +00:00
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 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 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
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 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
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
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 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
Juergen Hoeller fd6037099c specified excluded names matched against unprefixed FactoryBean names as well (SPR-5926)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1945 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-20 22:22:35 +00:00
Keith Donald 4342f50946 generic converter updates
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1933 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-18 20:08:45 +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
Keith Donald 615834c23d updated formatter conversion service adapter to work with type descriptor
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1913 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-17 19:48:55 +00:00