Chris Beams ae0dc34f29 Test interaction of @ComponentScan and @Import ...

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4280 50f2f4bb-b051-0410-bef5-90022cba6387

2011-05-10 11:54:37 +00:00

..

.settings

Merge 3.1.0 development branch into trunk

2010-10-25 19:48:20 +00:00

src

Test interaction of @ComponentScan and @Import

2011-05-10 11:54:37 +00:00

.classpath

moved cache abstraction from context.support to context

2011-02-07 17:41:25 +00:00

.project

SPR-6158: Initial implementation and tests for @ImportXml

2009-11-07 00:32:40 +00:00

.springBeans

Remove "Feature" support introduced in 3.1 M1

2011-05-06 19:03:52 +00:00

build.xml

+ upgrade to AspectJ 1.6.8

2010-02-04 11:46:21 +00:00

context.iml

moved cache abstraction from context.support to context

2011-02-07 17:41:25 +00:00

ivy.xml

moved cache abstraction from context.support to context

2011-02-07 17:41:25 +00:00

pom.xml

Sync pom.xml deps with ivy.xml changes since 3.0.5

2011-02-09 06:56:53 +00:00

template.mf

SPR-6416, initial commit for the conversation management

2011-04-12 13:21:18 +00:00