Commit Graph
1054 Commits
Author SHA1 Message Date
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
Arjen Poutsma f3fd3fa245 SPR-5690 - Request header filtering in @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1043 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 22:03:51 +00:00
Keith Donald 0898f09f97 test datasource factory initial commit; needs review from Juergen on how to best make DataSource available as a Spring bean when desired
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1042 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 21:31:16 +00:00
Chris Beams 79cf4ce20a Temporarily ignoring GroovyScriptFactoryTests#testResourceScriptFromTag in order to allow more important fixes to roll out.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1041 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 18:14:08 +00:00
Chris Beams 8217d81d02 Fixing build breakage with GroovyScriptFactoryTests.
The problem was that the Messenger object was not being proxed (assertTrue(AopUtils.isAopProxy(messenger)) was returning false).  The cause for this seemed to be that the
pointcut was malformed / out of date, reading execution(* org.springframework.scripting.Messenger.*(..)), when the groovy Messenger class is actually declared in the org.springframework.scripting.groovy package.
I tried updating the fully-qualified package name in the pointcut expression, and this caused AspectJ matching errors saying that there was not such type that matches that FQ name.
So as a final resort, I removed the full-qualification entirely and went with execution(* *..Messenger.*(..)).  All tests pass now, but it raises the question, why was AJ having matching errors?  Is it because
the pointcut matching is being done before the groovy class is loaded?  There could be a potential bug here.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1040 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 17:20:39 +00:00
Chris Beams 95d6f50fc8 (temporarily) increasing visibility of the ConfigurationClassAnnotation interface in an attempt to resolve the issue encountered at http://is.gd/tCud
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1039 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 16:24:54 +00:00
Arjen Poutsma 24c7108e76 MediaType.parseMediaTypes now accepts null and ""
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1038 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-21 13:41:15 +00:00
Ben Hale 4ed4544a88 Updated spring-build
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1037 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-20 12:16:50 +00:00
Juergen Hoeller c8ee279f7c EntityResolvers and DefaultNamespaceHandlerResolver support concurrent access now (SPR-5679)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1036 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-20 12:07:00 +00:00
Juergen Hoeller 9ef50ddc98 refined sequence of registration calls
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1035 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-20 11:20:01 +00:00
Juergen Hoeller ba2fe0879a serialize full Pattern objects
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1034 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-20 11:14:28 +00:00
Juergen Hoeller b4b61316a7 revised support for annotated factory methods (merged @FactoryMethod functionality into JavaConfig facility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1033 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 23:45:31 +00:00
Juergen Hoeller 0926cf79e6 revised WebApplicationContext lookup
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1032 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 22:28:31 +00:00
Juergen Hoeller b5e0328914 updated to FreeMarker 2.3.15 (SPR-4962)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1031 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 22:22:56 +00:00
Juergen Hoeller b1ecb0de45 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1030 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 20:36:33 +00:00
Juergen Hoeller 1b8294a379 moved Scope annotation to local test package
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1029 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 20:35:32 +00:00
Juergen Hoeller 17c423e2c4 exposed public getModel accessor (SPR-5686)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1028 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 19:51:25 +00:00
Juergen Hoeller 56e344a668 fixed "org.hibernate.ejb" version range
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1027 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 19:36:26 +00:00
Juergen Hoeller 07b161ad42 AspectJ matchesMethodExecution call needs to be synchronized (SPR-5687)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1026 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-19 19:33:23 +00:00
Arjen Poutsma 6b1983e944 Added AspectJ dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1025 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-18 09:06:04 +00:00
Chris Beams ba5cd6b03a Fixed whitespace and added private modifiers to @Value-annotated fields in the @Configuration example
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1024 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-18 00:22:03 +00:00
Thomas Risberg 5f1646167d fixed JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1023 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 19:43:11 +00:00
Juergen Hoeller 8f32e7c647 relaxed @AspectJ detection check (for CGLIB subclasses to still be recognized as an aspect)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1022 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 17:32:29 +00:00
Juergen Hoeller a54dc6fb77 avoiding synchronization as far as possible (SPR-5668)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1021 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 17:28:31 +00:00
Juergen Hoeller 63a4d3dd9f polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1020 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 17:23:50 +00:00
Juergen Hoeller e54dd9731f mergePropertiesIntoMap copies non-String values as well (SPR-5669)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1019 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 12:21:57 +00:00
Arjen Poutsma 6f016dd18a SPR-5636 - @RequestMapping matching should be insensitive to trailing slashes
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1018 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 09:41:04 +00:00
Arjen Poutsma 138e17d620 SPR-5631 - Implicit /** mapping on type-level @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1017 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 09:28:08 +00:00
Arjen Poutsma 6cafb84b9e Changed variable names from path to pattern
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1016 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 08:26:18 +00:00
Andy Clement a0493f5a20 filled in some basic details on the type conversion support. No TODOs left in this section now. Also properly added the selection/projection sections.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1015 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 05:14:07 +00:00
Andy Clement 93ded6edf7 minor fix
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1014 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-17 05:02:05 +00:00
Andy Clement 511c082cb6 removed unnecessary class. improvements to map projection/selection
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1013 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 19:21:50 +00:00
Arjen Poutsma 16b6e94276 Increased debug level of mapping info
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1012 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 13:25:46 +00:00
Arjen Poutsma 77d364af60 Working on SPR-5631 - Implicit /** mapping on type-level @RequestMapping
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1011 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 13:23:24 +00:00
Scott Andrews 674d7870ba adding 'target' to svn:ignore
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1010 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 13:23:17 +00:00
Arjen Poutsma 72ad199618 Added Copyright plugin info
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1009 50f2f4bb-b051-0410-bef5-90022cba6387
2009-04-16 13:20:33 +00:00