06b6d0a908
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4437 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:40:45 +00:00
dba7795ed7
[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4436 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:39:15 +00:00
03b79452a9
[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4435 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 13:11:06 +00:00
ad81cb5fcc
SPR-8391 Minor documentation fixes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4434 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:50:12 +00:00
b585202eb8
SPR-6709 Update changelog and add one test
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4433 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:22 +00:00
0ecc885a24
Add ModelFactory test for HttpSessionRequiredException
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4432 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 09:38:16 +00:00
67ffadd1f4
SPR-7477 - Added lazy-init attribute to jee namespace
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4431 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 08:51:56 +00:00
976955f6ad
Fix system environment tests on all platforms
...
Issue: SPR-8245
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4430 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 05:16:35 +00:00
b93a2b121d
broke out pkg private classes from TypeDescriptor to improve manageability and testability
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4429 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 03:09:05 +00:00
21e2dd87c9
more tests; several assertions for the programmer
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4428 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:18:22 +00:00
0b33eb8842
javadoc polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4427 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:01:28 +00:00
6af117037f
more tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4426 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 01:55:41 +00:00
f13b99f4ea
javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4425 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 00:51:17 +00:00
c7cae10364
simplified TypeDescriptor usage and updated use of the API across BeanWrapper and SpEL; collapsed PropertyTypeDescriptor into TypeDescriptor for simplicity and ease of use; improved docs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4424 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 23:37:19 +00:00
5d69429178
SPR-6709 Handle RequestBodyNotValidException and update reference docs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4423 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 18:27:50 +00:00
153b3fd101
Reverted Dave's changes to Eclipse project settings since we do not use Maven to build.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4422 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:59:52 +00:00
b986a8f32b
[SPR-7960][SPR-8386] Supporting declarative configuration of bean definition profiles in the TestContext framework:
...
- TextContext now works with MergedContextConfiguration instead of locations and loader
- TextContext now builds context caching key from MergedContextConfiguration
- Test context caching is now based on locations, classes, active profiles, and context loader
- TextContext now delegates to SmartContextLoader or ContextLoader as appropriate
- AbstractContextLoader now implements SmartContextLoader
- AbstractGenericContextLoader now sets active profiles in the GenericApplicationContext
- Introduced integration tests for profile support in the TCF for both XML and annotation config
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4421 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:51:37 +00:00
3a33f705e7
[SPR-8393] AnnotatedBeanDefinitionReader's constructor now inherits the Environment of supplied BeanDefinitionRegistry.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4420 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:35:02 +00:00
6fee394ac0
[SPR-8393] AnnotatedBeanDefinitionReader's constructor now inherits the Environment of supplied BeanDefinitionRegistry.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4419 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:33:12 +00:00
da6976b562
SPR-6709 Support @Valid with @RequestBody method arguments
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4418 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 17:21:44 +00:00
1e249085d2
SPR-7364: added separator property to database populator to deal with things like PL/SQL
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4417 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 16:22:26 +00:00
4497a9ad8d
[SPR-7960][SPR-8386] First draft of SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4416 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:45:22 +00:00
292916c66c
Mention code alternatives in context and mvc XSDs
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4415 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:45:00 +00:00
de347353c6
Polish @Primary Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4414 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:44:26 +00:00
c5d7dcf418
Polish @EnableScheduling Javadoc and related XSD
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4413 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:43:59 +00:00
c3822bd26d
Polish @EnableAsync Javadoc and related XSD
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4412 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:42:26 +00:00
d9ce5f854c
Polish @EnableTransactionManagement Javadoc and XSD
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4411 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:29:06 +00:00
9c73be0869
SPR-6688: Add tests and explicit detection of \ in sql script extractor
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4410 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:28:58 +00:00
28520fd5db
Rename TransactionManagementConfigurer callback
...
Renamed TransactionManagementConfigurer#createTransactionManager()
to #annotationDrivenTransactionManager() to better reflect the fact
that the implemented method is optionally eligible for @Bean annotation.
See Javadoc for details.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4409 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 14:28:16 +00:00
ac9a3d0541
SPR-8059 fix issue with != param condition
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4408 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 12:29:26 +00:00
11b4525f5a
revised cache abstraction
...
+ remove generic signature on key generator (as the type is not used anywhere)
+ add a small improvement to CacheAspect to nicely handle the cases where the aspect is pulled in but not configured
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4407 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 10:01:14 +00:00
569e6a4c37
Introduce ConfigurableConversionService interface
...
Consolidates ConversionService and ConverterRegistry interfaces;
implemented by GenericConversionService.
ConfigurablePropertyResolver#getConversionService now returns this
new type (hence so too does
ConfigurableEnvironment#getConversionService). This allows for
convenient addition / removal of Converter instances from Environment's
existing ConversionService. For example:
ConfigurableApplicationContext ctx = new ...
ConfigurableEnvironment env = ctx.getEnvironment();
env.getConversionService().addConverter(new FooConverter());
Issue: SPR-8389
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4406 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:42 +00:00
3d91946b73
Polish ConfigurablePropertyResolver Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4405 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:00 +00:00
4c66a044d5
Revert "Introduce Ordered#NOT_ORDERED"
...
This reverts commit da914bcfb4https://src.springframework.org/svn/spring-framework/trunk@4404 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:49:15 +00:00
f70fd0965d
[SPR-8388] Cleared up confusing documentation regarding PropertyResolver and Environment.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4403 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 21:05:23 +00:00
d81b19e958
[SPR-8388] Improved documentation on default registered PropertyEditors; fixed typos and grammar in JavaDoc; suppressed warnings due to generics; etc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4402 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 20:54:48 +00:00
138fb7ee5a
[SPR-6184] Introduced AnnotationConfigContextLoader to provide TestContext support for @Configuration classes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4401 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 16:13:40 +00:00
b6a38353ba
[SPR-7960] Trimming profiles for good measure.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4400 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 15:04:34 +00:00
42bc8518db
[SPR-7960] Renamed @ActivateProfiles to @ActiveProfiles and fleshed out JavaDoc.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4399 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 14:40:53 +00:00
f4801fa988
[SPR-8089][SPR-8093] Re-enabled ignored JMX tests based on the feedback that jmxremote_optional.jar is now present "jre/lib/ext/ in both 1.5 and 1.6 JDKs on the build server".
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4398 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 14:12:03 +00:00
5e669b45d7
[SPR-7960] Renamed resolveActivatedProfiles() to resolveActiveProfiles().
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4397 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:59:47 +00:00
7a63437224
[SPR-7960] resolveActivatedProfiles() now resolves a unique set of activated profiles
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4396 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:56:50 +00:00
98202beb7a
fixed typos
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4395 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:55:26 +00:00
4218599fa5
[SPR-7960] No longer tracking empty activated profiles.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4394 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:29:14 +00:00
4449e26b7f
[SPR-7960] No longer tracking empty activated profiles.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4393 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 22:12:53 +00:00
55707983a1
Ignore failing tests on Windows
...
Attempt to access and modify the system environment works on OS X /
Linux but not under Windows. Does not represent any real failure for
production code - the need to modify the system environment is a
testing concern only, and one we can probably live without, considering
the losing battle necessary to make such a hack cross-platform.
Issue: SPR-8245
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4392 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 10:58:24 +00:00
a151da6a10
Polish WebApplicationInitializer Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4391 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:42:36 +00:00
a38c086e62
Fix failing system environment tests on Windows
...
Issue: SPR-8245
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4390 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:42:06 +00:00
fe50d070f9
Polish AdviceMode Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4389 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:41:35 +00:00
886c89cf8b
Sort WebApplicationInitializers properly
...
Issue: SPR-7672
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4388 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 01:12:34 +00:00
Sam Brannen
Rossen Stoyanchev
Oliver Gierke
Chris Beams
Keith Donald
David Syer
Costin Leau