Sam Brannen
f7ebe823ff
polishing
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4583 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
6bf3acc605
[SPR-8395][SPR-8386] AnnotationConfigContextLoader now generates a list of default configuration classes by finding all non-private, non-final, static, inner classes of the test class that are annotated with @Configuration ; updated JavaDoc in AbstractGenericContextLoader and AnnotationConfigContextLoader to reflect changes resulting from the SmartContextLoader integration.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4582 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
1bae3f8c99
polishing Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4581 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
2eac13ba10
ignoring patch files
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4580 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
664291a681
[SPR-8386] AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration when generating default configuration classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4579 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
4b38c18b61
[SPR-8386] Polishing SmartContextLoader SPI; AnnotationConfigContextLoader now only considers static inner classes annotated with @Configuration as configuration classes.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4578 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
422799d99a
SPR-7812 Remove remaining (empty) condition packages after moving classes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4577 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
e1ca59e9a3
SPR-7812 Move condition package under mvc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4576 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
29c2207c2e
SPR-7812 Add CustomRequestCondition
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4575 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
69b3be67c4
polishing developer documentation
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4574 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Sam Brannen
b617210d50
[SPR-8386] SmartContextLoader enhancements:
...
- introduced processContextConfigurationAttributes() method in SmartContextLoader SPI
- refactored AnnotationConfigContextLoader, AbstractContextLoader, AbstractGenericContextLoader, ContextLoaderUtils, and TestContext implementations to take advantage of the SmartContextLoader SPI, MergedContextConfiguration, and ContextConfigurationAttributes
- deleted ResourceTypeAwareContextLoader
- deleted ContextLoaderUtils.LocationsResolver and implementations
- moved context key generation from TestContext to MergedContextConfiguration
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4573 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
David Syer
7613a1fc50
SPR-6268: check AnnotationUtils works with Groovy concrete classes (plus remove compiler warnings)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4572 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
82339ea9bf
SPR-7278 extension hook to extend the @ExceptionHandler methods for a controller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4571 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
David Syer
c287a3c71b
SPR-6268: Add proxy-target-class to <lang:groovy/>
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4570 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
089dd342e6
Fix non-compilable example in mvc ref doc
...
Issue: SPR-7750
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4569 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
b68f4d984a
Provide default ParameterNameDiscoverer for AACBF
...
Prior to this change, AbstractAutowireCapableBeanFactory did not support
a default ParameterNameDiscoverer. This meant that attempting to use
<constructor-arg name=".."> syntax would fail (with a fairly obscure
exception) as that feature depends on a ParameterNameDiscoverer to
introspect the constructor arguments.
This lack of a default was originally intended to avoid a dependency on
ASM, but now that (a) .asm is a built-in module and (b) .beans has a
non-optional compile-time dependency on .asm, there is no reason not to
provide this default.
The net effect is that in a number of locations throughout the
framework, namely in GenericApplicationContext and
AbstractRefreshableApplicationContext, it is no longer necessary to
explicitly call AACBF#setParameterNameDiscoverer. This also means that
using a naked BeanFactory (likely for testing scenarios) is that much
easier.
Issue: SPR-8184
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4568 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
4e2f464388
Consolidate tests related to @Config inheritance
...
Issue: SPR-8183
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4567 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
6f537ca74b
SPR-7812 RequestCondition refactoring with the possibility for custom request conditions in mind.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4566 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
12faecff7b
SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4565 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
8836abe57d
SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4564 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
02312e578a
Prefer / or /app/* over /main in servlet examples
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4562 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
efb738cd04
Fix regression with covariant property return types
...
Prior to this change, the Property class introduced in 3.1 M2 validated
read/write property method pairs based on whether their parameter/return
types were equal to one another. This precluded the valid possibility
of read method that returns a subtype of the write method's parameter
type, and represented a regression against 3.1 M1 and earlier versions.
The implementation now uses isAssignableFrom rather than a straight
equals check against the types.
Issue: SPR-8432
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4561 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
5a26457fca
Revert "Re-enable ignored JMX tests"
...
As of SPR-8093, jmxremote_optional.jar is present on the build
server in jre/lib/ext, but it is not by default present on local
developer / user machines, meaning that the build ends up broken
by default.
Issue: SPR-8089, SPR-8093, SPR-8458
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4560 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
6a7cb58fe3
Preserve shadowed fields in DirectFieldAccessor
...
Prior to this change, DirectFieldAccessor would ignore fields shadowed
in subclasses, favoring the last field processed, which happens to be
the most super declaration based on the way ReflectionUtils.doWithFields
works.
Because the locally shadowed field may be of a different type that the
superclass declaration, it is most correct to preserve and work with
the shadowed field.
Issue: SPR-8398
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4559 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
391c4cd67a
Update pom and .classpath to reflect Castor upgrade
...
Issue: SPR-8341 SPR-8453
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4558 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
b8ada5e596
SPR-8448 Remove URI template vars from the model before appending to query string in RedirectView
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4557 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
8c0cfc859b
restored support for String-to-ContextResource conversion (SPR-8383)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4555 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Chris Beams
ca3d9a55d9
Clarify TransactionCallback Javadoc
...
Issue: SPR-8390
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4554 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
d9f6dcf6b4
Ignoring test failing on build server, though it works locally. No idea why.
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4553 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
f09ac3ce82
SPR-8453 - SpringOXM CastorMarshaller tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4552 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
bd8efc1240
Minor changes
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4551 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
aad920d164
SPR-8341 - Spring OXM CastorMarshaller unmarshalling methods
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4550 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
7ffabfaba7
SPR-8453 - SpringOXM CastorMarshaller tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4549 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
09322ae5d8
Upgrade to Castor 1.3.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4548 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
dc80cad45c
Upgrade to Castor 1.3.2
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4547 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
a93f8b8da6
Javadoc
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4546 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
c4605e91b6
SPR-8454 Introduce Registration style objects, rename several Spring MVC *Configurer helpers to *Registry, add more tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4545 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
277573fda8
support for Hibernate 4.0 as a JPA provider
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4544 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
bfa4db9fcb
consistent dependency on Hibernate Validator 4.1.0.GA
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4542 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
a4827a93f6
refined WebLogic RMI descriptor to only mark 'getTargetInterfaceName' method as idempotent (SPR-8369)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4540 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
0c0db1b888
refined EntityManagerFactory proxy exception (SPR-4383)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4538 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
a285d2daec
SPR-8309 - Spring OXM schema improvement for CastorMarshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4537 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
1c509c0be0
Fixing tests
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4536 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
9f176b5f20
SPR-7911 - Better handling of 204 No Content in RestTemplate
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4535 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Arjen Poutsma
fdb834bd27
SPR-7931 - Checking for @XmlRootElement annotation should be made optional in Jaxb2Marshaller
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4534 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Rossen Stoyanchev
9f57017842
Extract base class from RequestMappingHandlerMapping, one that allows for discovering request mappings from something other than annotations
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4533 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
e384b637a3
prepared for 3.1 RC1 release
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4532 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
f88047c80f
added further conversion tests (triggered by 3.0.6 backports)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4528 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
bbeed23f94
added further conversion tests (triggered by 3.0.6 backports)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4526 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago
Juergen Hoeller
22d5a23a54
revised JMS CachedConnectionFactory to avoid unnecessary rollback calls on Session return (SPR-8437); fixed JMS CachedConnectionFactory to fully synchronize its Session list (SPR-8436)
...
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4523 50f2f4bb-b051-0410-bef5-90022cba6387
15 years ago