Commit Graph

160 Commits

Author SHA1 Message Date
David Syer 1a4fac31d9 SPR-7705: re-order rules and befores
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3801 50f2f4bb-b051-0410-bef5-90022cba6387
2010-11-17 17:27:03 +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
Juergen Hoeller 80e66fc84d getTestExecutionListeners() returns actual List which allows for iteration as well as modification (SPR-7595)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3709 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-02 01:05:40 +00:00
Juergen Hoeller 72b836f379 avoid ConcurrentModificationException when iterating attribute names (SPR-7557)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3707 50f2f4bb-b051-0410-bef5-90022cba6387
2010-10-01 22:27:34 +00:00
Ben Hale 82e5f5f5d6 Publishing license and notice files
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3612 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-23 13:17:31 +00:00
Arjen Poutsma 750dc01862 Prepping for 3.0.5
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3611 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-19 11:04:04 +00:00
Juergen Hoeller bcd552abfe polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3592 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 23:01:10 +00:00
Juergen Hoeller 29c3bb3152 MockMultipartHttpServletRequest pre-defines method "POST" and content type "multipart/form-data"
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3587 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:46:15 +00:00
Juergen Hoeller 93fb8760ff consistent mocks between modules
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3586 50f2f4bb-b051-0410-bef5-90022cba6387
2010-08-15 22:02:40 +00:00
Arjen Poutsma 7f54fe732f Upgrading version to 3.0.4
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3428 50f2f4bb-b051-0410-bef5-90022cba6387
2010-06-15 14:18:29 +00:00
Juergen Hoeller 9fa9615409 MockHttpServletResponse supports multiple includes (SPR-7188)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3323 50f2f4bb-b051-0410-bef5-90022cba6387
2010-05-12 14:05:21 +00:00
David Syer faa0f29f0f Update version in POMs to 3.0.3
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3246 50f2f4bb-b051-0410-bef5-90022cba6387
2010-04-15 10:26:14 +00:00
Chris Beams 8825909f04 removed duplicate junit and aspectjweaver dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3153 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-24 10:09:58 +00:00
Sam Brannen a59bad673d [SPR-6918] Now verifying support for @Value in conjunction with the Spring TestContext Framework.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3118 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-19 12:57:17 +00:00
Juergen Hoeller e054e8cd6b fixed test failures
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3102 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:55:44 +00:00
Juergen Hoeller 651d6636da polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3101 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:45:02 +00:00
Juergen Hoeller 630ecacac9 @Transactional qualifiers work in unit tests as well (SPR-6892)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3100 50f2f4bb-b051-0410-bef5-90022cba6387
2010-03-12 20:44:41 +00:00
Sam Brannen eb32403fcd [SPR-6879] @DirtiesContext is now an @Inherited annotation.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3033 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-23 17:43:00 +00:00
David Syer 25ef81476d Update Central POMs to 3.0.2
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3022 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-21 15:32:18 +00:00
Costin Leau 4be6044db9 + make use or property placeholders inside template.mf
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3014 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-19 09:43:22 +00:00
Juergen Hoeller 508d9ba48b added warning about pointing to a custom transaction manager bean (SPR-5174)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2924 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 16:47:57 +00:00
Chris Beams f86e3bcfd2 Updated Eclipse .classpath to aspectj 1.6.8
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2920 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 13:45:14 +00:00
Costin Leau 5e677feda0 + upgrade to AspectJ 1.6.8
+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2918 50f2f4bb-b051-0410-bef5-90022cba6387
2010-02-04 11:46:21 +00:00
David Syer e6d2f9428c SPR-6678: fix poms for 3.0.1
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2809 50f2f4bb-b051-0410-bef5-90022cba6387
2010-01-13 11:07:08 +00:00
Juergen Hoeller d800fc21d3 revised javadoc (SPR-5720)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2607 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-09 15:24:47 +00:00
David Syer 2bad74c238 SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2579 50f2f4bb-b051-0410-bef5-90022cba6387
2009-12-04 18:25:31 +00:00
Juergen Hoeller 2cc308174e avoid potential NPE (SPR-6300)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2397 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-12 13:42:07 +00:00
Costin Leau c5a0c30f75 SPR-6194
+ add setter for servlet minor version to MockServletContext

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2296 50f2f4bb-b051-0410-bef5-90022cba6387
2009-11-09 11:51:30 +00:00
Sam Brannen b3f3c03505 [SPR-6124] Verified that timed transactional tests fail with the TestNG integration in the TestContext framework.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2182 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-26 13:38:59 +00:00
Sam Brannen 751f80d1bb [SPR-6128] Verified that claims raised in this issue no longer apply.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2181 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-26 13:00:04 +00:00
Juergen Hoeller 94ee22dffd updated version ranges for javax.el and javax.inject
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2171 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-23 17:26:12 +00:00
Sam Brannen 5b2a0f422e Updated Eclipse classpath regarding javax.inject and javax.validation.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2136 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-16 10:16:25 +00:00
Sam Brannen 084ef7ce58 Now verifying support for @Named as well.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2057 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-06 21:10:06 +00:00
Sam Brannen 3a7c2ffa6b SpringJUnit4ClassRunnerAppCtxTests now verifies seamless support for using @Inject in addition to @Autowired, etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2053 50f2f4bb-b051-0410-bef5-90022cba6387
2009-10-05 22:08:01 +00:00
Arjen Poutsma 05f9ce8292 Renamed org.springframework.instrument.classloading module to org.springframework.instrument.tomcat
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2016 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-25 12:51:58 +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
Mark Pollack 97b13b66d4 pom maintenance - sync with ivy.xml
update junit version in ivy.xml for org.sf.aspects

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1981 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-24 06:09:54 +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
Sam Brannen c0d38136cc [SPR-6104] @TestExecutionListeners now supports a 'listeners' alias for its existing 'value' attribute.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1872 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-13 13:55:34 +00:00
Sam Brannen aca7cf4c58 [SPR-4643] SpringJUnit4ClassRunner now optionally calls JUnit 4.7's BlockJUnit4ClassRunner.withRules() method using reflection in order to provide backward compatibility with JUnit 4.5 and 4.6.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1835 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-07 21:03:32 +00:00
Sam Brannen 5e9f8ac4ce Including HibernateSessionFlushingTests in the suite.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1795 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-01 17:33:29 +00:00
Sam Brannen f2e434b960 [SPR-4702] now updating TestContext state before calling before/after test class life cycle callbacks.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1794 50f2f4bb-b051-0410-bef5-90022cba6387
2009-09-01 17:33:12 +00:00
Juergen Hoeller a521abefcc updated dependencies
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1791 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-31 11:25:54 +00:00
Sam Brannen f2a3b079ad [SPR-6011] SpringJUnit4ClassRunner once again supports collective timeouts for repeated tests.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1786 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 17:28:25 +00:00
Sam Brannen 94b16a169b Added assertPersonCount() functionality for increased robustness.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1784 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 09:23:02 +00:00
Arjen Poutsma db7751e5ee SPR-2784: Support MultipartFile-array property
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1783 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-28 09:15:19 +00:00
Sam Brannen 9bfc5b6d28 [SPR-6043] @NotTransactional is now deprecated
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1769 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 23:23:07 +00:00
Sam Brannen d26121edbd [SPR-5995] Updated documentation regarding compatibility with JUnit 4.5, 4.6, and 4.7.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1764 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 13:13:06 +00:00
Sam Brannen 0c3f4fc03b [SPR-5995] Renamed makeNotifier() to springMakeNotifier() in order to allow compatibility with JUnit 4.5, 4.6, and 4.7.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1763 50f2f4bb-b051-0410-bef5-90022cba6387
2009-08-26 12:37:59 +00:00