Commit Graph

3874 Commits

Author SHA1 Message Date
Costin Leau e4261b936a + fix bug that prevented internal expression cache from being used
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4065 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-06 17:06:28 +00:00
Costin Leau 040b5397ce SPR-8006
+ fix contains/get race-condition of caches (by adding an extra cache call)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4064 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-06 12:27:46 +00:00
Costin Leau fbc4c37946 + update copyright headers
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4063 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-06 11:53:12 +00:00
Costin Leau 580d8024fd SPR-8006
SPR-8023
- remove unneeded method


git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4062 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-06 11:43:25 +00:00
Costin Leau 8062b4ad59 SPR-8008
SPR-8023
+ fix bug in Ehcache cache that considered expired entries for key checks

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4061 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-06 11:36:36 +00:00
Sam Brannen 5cdc285aba Fixed typos
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4060 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-04 23:12:09 +00:00
Rossen Stoyanchev ea6f6d9696 SPR-7406 Improve documentation on handler method parameter type conversion.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4059 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-04 19:59:16 +00:00
Rossen Stoyanchev 8f5dc17ebc SPR-6932 Add option to extract value from single-key models in MappingJacksonJsonView
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4058 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-04 14:19:14 +00:00
Rossen Stoyanchev ffb76a6046 SPR-2692 Add URI template support to RedirectView
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4057 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-03 15:54:29 +00:00
Rossen Stoyanchev a9ddca1100 Improve docs for MvcDefaultServletHandler container feature.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4056 50f2f4bb-b051-0410-bef5-90022cba6387
2011-03-01 14:32:34 +00:00
Oliver Gierke 70f61b99d3 SPR-8005 - Made GenericTypeResolver.getTypeVariableMap(…) and resolvetype(…) public.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4055 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-28 17:09:09 +00:00
Arjen Poutsma 0cbaea735c @MVC 2.0: AbstractAnnotationMAR -> AbstractNamedValueMAR
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4037 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-25 11:05:14 +00:00
Costin Leau eda0a1049f + add missing # to SpEL variables
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4035 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-24 15:06:03 +00:00
Rossen Stoyanchev 00fde776d2 SPR-7976 Add MvcInterceptors features.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4030 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-22 16:13:04 +00:00
Arjen Poutsma 237b9b509d Added equals and hashcode
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4029 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-22 13:33:24 +00:00
Juergen Hoeller dcc91fc32a final preparations for 3.1 M1 release
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3996 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 23:20:28 +00:00
Juergen Hoeller 41245cd566 fixed scheduling tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3995 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 23:04:40 +00:00
Juergen Hoeller 637117c51a exceptions thrown by @Scheduled methods will be propagated to a registered ErrorHandler (SPR-7723)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3994 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 22:50:16 +00:00
Juergen Hoeller e116123f3e polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3993 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 22:19:10 +00:00
Chris Beams 53bf88ebaa Further compensation for STS version mismatch
Current STS version of Spring (3.0.5) does not contain
the BeanUtils.instantiateClass(Class<?>, Class<T>) signature
that was added in 3.1.0, therefore NoSuchMethodErrors are
being thrown when STS classloads and delegates to
3.1.0 NamespaceHandler and BeanDefinitionParser implementations
on the user project classpath.

In this case, it's AbstractSpecificationBeanDefinitionParser
doing the calling to the unknown new method.  In this specific
example, reverting back to the old single-arg signature is actually
not a problem, because it does accept Class<T> and returns an
instance of type T, which was the desired behavior in the first
place.

The newer signature remains in order to accommodate callers
who do not know the generic type of the Class to be instantiated
(i.e. Class<?>), but do know the type that it should be assignable
to -- this becomes the second argument Class<T>, and an instance
of type T is returned (if indeed it is assignable to the specified
type; otherwise IllegalArgumentException.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3992 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 17:59:26 +00:00
Chris Beams 780b32c909 Re-introduce and deprecate BDPD.initDefaults(Element)
For compatibility with Spring Integration's standalone usage of
BeanDefinitionParserDelegate.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3991 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 13:33:09 +00:00
Sam Brannen d94cbd236a [SPR-7953] BeanDefinitionVisitor now actually visits factory method names.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3990 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 13:08:31 +00:00
Sam Brannen ff2aae8ba3 [SPR-7953] BeanDefinitionVisitor now actually visits factory method names.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3989 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 13:01:58 +00:00
Juergen Hoeller 1b2625e20a prepared 3.1 M1 changelog
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3988 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 02:07:14 +00:00
Juergen Hoeller 27766b7fab renamed AbstractPropertyPlaceholderConfigurer to PlaceholderConfigurerSupport
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3987 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 02:01:02 +00:00
Juergen Hoeller c182283beb turned to package visibility
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3986 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 01:58:21 +00:00
Juergen Hoeller 541f8595ab renamed AbstractPropertyPlaceholderConfigurer to PlaceholderConfigurerSupport
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3985 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 01:55:11 +00:00
Juergen Hoeller c16e01cb14 removed ConversionService/TypeConverter convenience methods in order to restore 3.0's SPI (for backwards compatibility with implementers)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3984 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 01:36:57 +00:00
Juergen Hoeller 4bd265f0a4 removed ConversionService/TypeConverter convenience methods in order to restore 3.0's SPI (for backwards compatibility with implementers)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3983 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 01:24:08 +00:00
Chris Beams 1a751de04f Further compensations for STS; binary compat fixes
Defensively catch NoSuchMethodError when calling BDPD.getEnvironment()
and supply a DefaultEnvironment if not available.

Replace the single-arg constructor for BDPD and deprecate, preserving
binary compat particularly for Spring Integration who instantiates
this class directly, which is unusual.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3982 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-10 00:30:30 +00:00
Chris Beams 3fbe9d5a55 Fix STS compatibility issues; other improvements
Revert changes to ParserContext, ReaderContext, and XmlReaderContext

    These changes cause cross-version incompatibilities at tooling time
    -- for instance, an STS version that ships with Spring 3.0.5
    classloads the ParserContext defined in that version, whereas it
    classloads NamespaceHandlers and BeanDefinitionParsers (by default)
    from the user application classpath, which may be building against
    3.1.0. If so, the changes introduced to these types in 3.1.0 are
    incompatible with expectations in the 3.0.5 world and cause all
    manner of problems.  In this case, it was NoSuchMethodError due to
    the newly-added XmlReaderContext.getProblemReporter() method; also
    IncompatibleClassChangeError due to the introduction of the
    ComponentRegistrar interface on ParserContext.

    Each of these problems have been mitigated, though the solutions
    are not ideal. The method mentioned has been removed, and instead
    the problemReporter field is now accessed reflectively.
    ParserContext now no longer implements ComponentRegistrar, and
    rather a ComponentRegistrarAdapter class has been introduced that
    passes method calls through to a ParserContext delegate.

Introduce AbstractSpecificationBeanDefinitionParser

    AbstractSpecificationBeanDefinitionParser has been introduced in
    order to improve the programming model for BeanDefinitionParsers
    that have been refactored to the new FeatureSpecification model.
    This new base class and it's template method implementation of
    parse/doParse ensure that common concerns like (1) adapting a
    ParserContext into a SpecificationContext, (2) setting source and
    source name on the specification, and (3) actually executing the
    specification are all managed by the base class.  The subclass
    implementation of doParse need only actually parse XML, populate
    and return the FeatureSpecification object.  This change removed
    the many duplicate 'createSpecificationContext' methods that had
    been lingering.

Minor improvement to BeanDefinitionReaderUtils API

    Introduced new BeanDefinitionReaderUtils#registerWithGeneratedName
    variant that accepts BeanDefinition as opposed to
    AbstractBeanDefinition, as BeanDefinition is all that is actually
    necessary to satisfy the needs of the method implementation. The
    latter variant accepting AbstractBeanDefinition has been deprecated
    but remains intact and delegates to the new variant in order to
    maintain binary compatibility.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3980 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 16:44:26 +00:00
Thomas Risberg 7b25351288 switched to create the PreparedStatementCreatorFactory using a list of SqlParameters to preserve type names (SPR-7699)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3976 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 13:58:30 +00:00
Arjen Poutsma 000346972b Fixing compilation error with javac.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3970 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 09:39:29 +00:00
Chris Beams 975e44079f Revert signature change in BDRU.registerWithGeneratedName
This change broke binary compatibility as evidenced by running
the greenhouse test suite and finding that Spring Integration's
AbstractConsumerEndpointParser.parseInternal fails with
NoSuchMethodError when trying to invoke.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3969 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:57:24 +00:00
Chris Beams 437a753e26 Sync pom.xml deps with ivy.xml changes since 3.0.5
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3968 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:56:53 +00:00
Chris Beams adc9400905 Include license.txt and notice.txt in module JARs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3967 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:56:40 +00:00
Chris Beams 8fcce02cde Add FeatureMethodErrorTests
Capture common mistakes with @Feature method declarations and ensure
that useful error messages are produced.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3966 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-09 06:54:02 +00:00
Sam Brannen 0146bf787a Suppressing warnings, polishing JavaDoc, etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3965 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 22:50:45 +00:00
Sam Brannen 79c72a96f3 polishing JavaDoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3963 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 22:08:38 +00:00
Chris Beams f8a4dfa5da Rename ExecutorContext => SpecificationContext
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3961 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 19:08:41 +00:00
Chris Beams df4edc1c73 Rename spring.{profile}.active => {profiles}
Same for spring.profiles.default

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3960 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 19:07:46 +00:00
Chris Beams 9fd86f589f Extract ProblemCollector interface
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3959 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 19:07:03 +00:00
Juergen Hoeller 0620860078 updated for the 3.1 M1 release
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3958 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 16:58:34 +00:00
Juergen Hoeller df9857fa2b removed assertions
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3957 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 16:35:38 +00:00
Chris Beams dc22760978 Introduce FeatureSpecification support
Introduce FeatureSpecification interface and implementations

    FeatureSpecification objects decouple the configuration of
    spring container features from the concern of parsing XML
    namespaces, allowing for reuse in code-based configuration
    (see @Feature* annotations below).

    * ComponentScanSpec
    * TxAnnotationDriven
    * MvcAnnotationDriven
    * MvcDefaultServletHandler
    * MvcResources
    * MvcViewControllers

Refactor associated BeanDefinitionParsers to delegate to new impls above

    The following BeanDefinitionParser implementations now deal only
    with the concern of XML parsing.  Validation is handled by their
    corresponding FeatureSpecification object.  Bean definition creation
    and registration is handled by their corresponding
    FeatureSpecificationExecutor type.

    * ComponentScanBeanDefinitionParser
    * AnnotationDrivenBeanDefinitionParser (tx)
    * AnnotationDrivenBeanDefinitionParser (mvc)
    * DefaultServletHandlerBeanDefinitionParser
    * ResourcesBeanDefinitionParser
    * ViewControllerBeanDefinitionParser

Update AopNamespaceUtils to decouple from XML (DOM API)

    Methods necessary for executing TxAnnotationDriven specification
    (and eventually, the AspectJAutoProxy specification) have been
    added that accept boolean arguments for whether to proxy
    target classes and whether to expose the proxy via threadlocal.

    Methods that accepted and introspected DOM Element objects still
    exist but have been deprecated.

Introduce @FeatureConfiguration classes and @Feature methods

    Allow for creation and configuration of FeatureSpecification objects
    at the user level.  A companion for @Configuration classes allowing
    for completely code-driven configuration of the Spring container.

    See changes in ConfigurationClassPostProcessor for implementation
    details.

    See Feature*Tests for usage examples.

    FeatureTestSuite in .integration-tests is a JUnit test suite designed
    to aggregate all BDP and Feature* related tests for a convenient way
    to confirm that Feature-related changes don't break anything.
    Uncomment this test and execute from Eclipse / IDEA. Due to classpath
    issues, this cannot be compiled by Ant/Ivy at the command line.

Introduce @FeatureAnnotation meta-annotation and @ComponentScan impl

    @FeatureAnnotation provides an alternate mechanism for creating
    and executing FeatureSpecification objects.  See @ComponentScan
    and its corresponding ComponentScanAnnotationParser implementation
    for details.  See ComponentScanAnnotationIntegrationTests for usage
    examples

Introduce Default[Formatting]ConversionService implementations

    Allows for convenient instantiation of ConversionService objects
    containing defaults appropriate for most environments.  Replaces
    similar support originally in ConversionServiceFactory (which is now
    deprecated). This change was justified by the need to avoid use
    of FactoryBeans in @Configuration classes (such as
    FormattingConversionServiceFactoryBean). It is strongly preferred
    that users simply instantiate and configure the objects that underlie
    our FactoryBeans. In the case of the ConversionService types, the
    easiest way to do this is to create Default* subtypes. This also
    follows convention with the rest of the framework.

Minor updates to util classes

    All in service of changes above. See diffs for self-explanatory
    details.

    * BeanUtils
    * ObjectUtils
    * ReflectionUtils

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3954 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 14:42:33 +00:00
Chris Beams 6a68b44ca9 Make ObjectUtils.addObjectToArray() generic
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3951 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-08 13:01:29 +00:00
Costin Leau 91ecefdaa1 renamed EhcacheCacheManager to EhCacheCacheManager
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3949 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-07 17:45:29 +00:00
Costin Leau 61d1324dc9 renamed EhcacheCacheManager to EhCacheCacheManager
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3948 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-07 17:44:41 +00:00
Costin Leau 1f92a12c1e moved cache abstraction from context.support to context
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3947 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-07 17:41:25 +00:00
Keith Donald ded88e3a7b added support for Instant and MutableDateTime binding to JodaTime formatting system; allow for use of @DateTimeFormat on any ReadableInstant field
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3941 50f2f4bb-b051-0410-bef5-90022cba6387
2011-02-04 20:17:52 +00:00