Commit Graph

1089 Commits

Author SHA1 Message Date
Arjen Poutsma d10d95e98d SPR-5426 - Allow for custom processing or result objects returned from handler/controller methods
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1093 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 11:40:36 +00:00
Juergen Hoeller f7642c4e30 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1092 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 09:36:53 +00:00
Juergen Hoeller 699d3f7bbc removed StandardScopes pseudo-enum (superseded by meta-annotated scopes)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1091 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 09:32:55 +00:00
Juergen Hoeller 87f1227a03 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1090 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 09:26:04 +00:00
Sam Brannen 482c7344f3 [SPR-5145] Updated reference manual regarding deprecation of the legacy JUnit 3.8 code base.
[SPR-5713] Updated reference manual with an example demonstrating the new 'value' alias for @ContextConfiguration's 'locations' attribute.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1089 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 08:02:22 +00:00
Sam Brannen 545a704833 [SPR-5713] Added 'value' alias for @ContextConfiguration's 'locations' attribute.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1088 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-05 07:37:14 +00:00
Sam Brannen 41b5e5d8b4 Fixed typo in JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1087 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-04 06:02:59 +00:00
Sam Brannen 075c28f8e1 [SPR-5710] Subclasses of SpringJUnit4ClassRunner can now override the default ContextLoader class via the new getDefaultContextLoaderClassName(Class) method.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1086 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-02 23:24:48 +00:00
Thomas Risberg c73cf2b4d3 clean-up of the @Bean content
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1085 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-01 20:14:23 +00:00
Thomas Risberg 9395d5121c re-arranged the @Bean content
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1084 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-01 19:48:08 +00:00
Thomas Risberg 0ad975b89e removed some JavaConfig references
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1083 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 04:35:30 +00:00
Thomas Risberg 04c3863246 fixed DOCTYPE to refer to the root_element used
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1082 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 04:16:07 +00:00
Sam Brannen c291959f09 [SPR-5145] Updated reference manual regarding upgrade to JUnit 4.5; additional improvements in the testing chapter as well.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1081 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 01:04:39 +00:00
Sam Brannen 2192619936 Corrected grammar and spelling mistakes in reference manual.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1080 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 01:03:44 +00:00
Sam Brannen 9f02216365 Added Eclipse project settings to the reference documentation so that the documentation can be more easily edited and built within Eclipse.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1079 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 00:59:09 +00:00
Sam Brannen 144ebcf793 Now parameterizing with <?> where appropriate.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1078 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-30 00:58:08 +00:00
Sam Brannen 4da2be7e7a [SPR-5145] Improved test suite for SpringJUnit4ClassRunner: added specific unit tests for test timeouts, repeated tests, and expected exceptions.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1077 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 21:29:53 +00:00
Thomas Risberg 84a3cb868a added some JavaConfig content
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1076 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 21:14:01 +00:00
Thomas Risberg 3fa3fcac40 fixed JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1075 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 21:12:45 +00:00
Sam Brannen 644df35108 Removed unused package.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1074 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 19:01:39 +00:00
Sam Brannen 24e41d8822 [SPR-5145] Completed migration to JUnit 4.5: SpringJUnit4ClassRunner now extends BlockJUnit4ClassRunner and uses custom Statements; removed obsolete SpringMethodRoadie and SpringTestMethod classes.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1073 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-29 08:21:23 +00:00
Sam Brannen 6d24e650e4 Corrected typos and sorted Eclipse classpath.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1072 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-28 21:45:14 +00:00
Sam Brannen 7f6d65ecf2 [SPR-5145] Adding custom JUnit 4.5 Statements.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1071 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-28 07:29:24 +00:00
Juergen Hoeller 6747b751be revised target class check for non-Spring CGLIB proxy variants (SPR-5694)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1070 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-27 22:54:39 +00:00
Juergen Hoeller d7836b9fcc fixed potential race condition through additional synchronization (SPR-5658)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1069 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-27 22:53:40 +00:00
Sam Brannen 6c3dd342fe Updated JavaDoc for @TestExecutionListeners.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1068 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-27 22:49:34 +00:00
Mark Pollack ad7fd374b0 Update docs to use of @Bean inside a @Component
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1067 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-27 05:40:11 +00:00
Mark Pollack 2c12a0582f Update docs to use of @Bean inside a @Component
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1066 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-27 05:37:45 +00:00
Juergen Hoeller 906adab5a4 custom stereotype annotations can be meta-annotated with @Service, @Controller etc as well; @Scope and @Transactional are now supported as meta-annotations on custom annotations
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1065 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-26 11:41:06 +00:00
Juergen Hoeller 72a131cf34 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1064 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-26 11:39:00 +00:00
Juergen Hoeller e6a1566854 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1063 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-24 11:25:27 +00:00
Juergen Hoeller a2ca813ce2 updated AnnotationMetadata tests for change in Class exposure
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1062 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-24 11:24:47 +00:00
Juergen Hoeller bf86e7cc9d @Configuration parsing fully relies on Spring's MetadataReader abstraction now
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1061 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-24 11:16:46 +00:00
Keith Donald 539f9b3575 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1060 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-23 19:01:41 +00:00
Keith Donald f51b5811c4 embedded database factory bean
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1059 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-23 18:56:26 +00:00
Scott Andrews a7784bf36d updating Eclipse .classpath settings for Freemarker 2.3.15 upgrade
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1058 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-23 14:13:03 +00:00
Keith Donald f48f1a1222 deleted old test data source factory
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1057 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 21:29:47 +00:00
Keith Donald 58ab4af395 polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1056 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 21:16:22 +00:00
Keith Donald e6b63d73f6 added pre destroy
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1055 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 21:14:06 +00:00
Keith Donald cd9c3c880a polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1054 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 19:41:27 +00:00
Keith Donald 28ae04ead2 added DataSourceFactory strategy; promoted EmbeddedDatabaseConfigurer strategy to public API; added ability to add any number of SQL scripts for db population
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1053 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 19:31:46 +00:00
Andy Clement 95ea243026 SPR-5663: test and fix: inconsistency between canRead() and read() on ReflectivePropertyResolver
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1052 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 17:57:24 +00:00
Keith Donald bab98498d0 embedded
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1051 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 17:47:44 +00:00
Keith Donald 812e7272d5 embedded database support initial commit; moved from spring-test; ResourceDatabasePopulator duplicate code with test.jdbc package that needs review
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1050 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 17:07:20 +00:00
Arjen Poutsma 9818f88199 SPR-4518 - @RequestMapping methods returning null have an implicit ModelAndView created
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1049 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 12:57:30 +00:00
Arjen Poutsma 359af039a5 SPR-5634 - OXM does not permit targetClass and mapping file for CastorMarshaller
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1048 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 12:08:57 +00:00
Arjen Poutsma a9747a6c70 Upgraded to Rome 1.0
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1047 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 11:44:59 +00:00
Juergen Hoeller 3eae3501e8 next cut of JavaConfig metadata reading revision: using cached MetadataReaders
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1046 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 10:46:24 +00:00
Andy Clement 2bc6cb756c SPR-5673: fix for problems with expressions that use the same symbols as are used in the template prefix/suffix
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1045 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-22 00:10:47 +00:00
Arjen Poutsma c9794c0f02 Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1044 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 22:16:32 +00:00