Commit Graph

5 Commits

Author SHA1 Message Date
Costin Leau a118023af6 SPR-7308
+ add support for multiple cache names
+ require each annotation to specify a cache name
+ add method support in Key generator interface
+ add bug fix for embedded JDK concurrent declaration

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3819 50f2f4bb-b051-0410-bef5-90022cba6387
2010-12-16 13:19:01 +00:00
Chris Beams 45e5b46fc2 Merge 3.1.0 development branch into trunk
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:

    git merge -s recursive -Xtheirs --no-commit env

No merge conflicts, but did need to

    git rm spring-build

prior to committing.

With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch.  3.1.0 snapshots will be available
per the usual nightly CI build from trunk.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-25 19:48:20 +00:00
Chris Beams b33d28d6cf updated .jms dependency on junit 4.6.0 from test->runtime to test->compile. touched all org.eclipse.jdt.core.prefs (during the process of importing the projects). only the date comments within each have changed.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1541 50f2f4bb-b051-0410-bef5-90022cba6387
2009-07-15 07:26:31 +00:00
Chris Beams 2796c55974 Whitespace polishing: leading spaces->tabs; updated eclipse configuration to default to leading tabs for all bundles
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@464 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-18 14:50:25 +00:00
Scott Andrews ea21bb3114 adding eclipse project settings
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@138 50f2f4bb-b051-0410-bef5-90022cba6387
2008-10-27 15:48:40 +00:00