Commit Graph
11 Commits
Author SHA1 Message Date
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 5871cb4f35 Add @Ignored repro test for SPR-7538
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3677 50f2f4bb-b051-0410-bef5-90022cba6387
2010-09-10 16:32:20 +00:00
Chris Beams 9cc8d7ef91 SPR-7009, SPR-6972: backed out unintentionally committed tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3145 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 15:29:35 +00:00
Chris Beams 0041848f1b SPR-7009: TransactionInterceptor now extracts ultimate target class before evaluating @Transactional metadata to accommodate double-proxying cases
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3144 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-23 12:06:30 +00:00
Costin Leau b77d06e903 + fix test by disabling autowiring
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2979 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-15 13:23:47 +00:00
Juergen Hoeller 4ae829da56 component-scan's scoped-proxy attribute applies to scope-annotated singleton beans as well (SPR-6683)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2895 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-01 16:51:46 +00:00
Juergen Hoeller e94bf69c1a @Scope annotations not sufficient for scanning anymore
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1895 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:36:45 +00:00
Juergen Hoeller a65d974b14 initial JSR-330 injection support
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1894 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-15 12:00:55 +00:00
Juergen Hoeller 1d1dba1693 Servlet/Portlet ApplicationContexts use a specific id based on servlet/portlet name; DefaultListableBeanFactory references are serializable now when initialized with an id; scoped proxies are serializable now, for web scopes as well as for singleton beans; injected request/session references are serializable proxies for the current request now
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1127 50f2f4bb-b051-0410-bef5-90022cba6387
2009-05-07 22:29:55 +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
Chris Beams 91d7b44c47 renamed .testsuite -> .integration-tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@492 50f2f4bb-b051-0410-bef5-90022cba6387
2008-12-20 09:36:46 +00:00