Permalink
Switch branches/tags
Commits on Nov 29, 2011
Commits on Nov 28, 2011
  1. AbstractCachingViewResolver caches unresolved view names by default (…

    …"cacheUnresolved"=true; SPR-8173)
    jhoeller committed Nov 28, 2011
  2. AbstractCachingViewResolver caches unresolved view names by default (…

    …"cacheUnresolved"=true; SPR-8173)
    jhoeller committed Nov 28, 2011
  3. Allow @Configuration classes to self-@ComponentScan

    Prior to this change, a @Configuration classes that @ComponentScan
    themselves would result in a ConflictingBeanDefinitionException.
    
    For example:
    
        package com.foo.config;
    
        @Configuration
        @ComponentScan("com.foo");
        public class AppConfig {
            // ...
        }
    
    This resulted in a ConflictingBeanDefinitionException that users have
    typically worked around in the following fashion:
    
        package com.foo.config;
    
        @Configuration
        @ComponentScan(basePackages="com.foo",
            excludeFilters=@Filter(value=ANNOTATION_TYPE, type=Configuration.class);
        public class AppConfig {
            // ...
        }
    
    This is obviously more verbose and cumbersome than would be desirable,
    and furthermore potentially too constraining as it prohibits the ability
    to include other legitimate @Configuration classes via scanning.
    
    The exception was being thrown because of a logic problem in
    ClassPathBeanDefinitionScanner.  The bean definition for AppConfig gets
    registered once by the user (e.g. when constructing an
    AnnotationConfigApplicationContext), then again when performing the
    component scan for 'com.foo'. Prior to this change,
    ClassPathBeanDefinitionScanner's #isCompatible returned false if the new
    bean definition was anything other than an AnnotatedBeanDefinition.  The
    intention of this check is really to see whether the new bean definition
    is a *scanned* bean definition, i.e. the result of a component-scanning
    operation.  If so, then it becomes safe to assume that the original bean
    definition is the one that should be kept, as it is the one explicitly
    registered by the user.
    
    Therefore, the fix is as simple as narrowing the instanceof check from
    AnnotatedBeanDefinition to its ScannedGenericBeanDefinition subtype.
    
    Note that this commit partially reverts changes introduced in SPR-8307
    that explicitly caught ConflictingBeanDefinitionExceptions when
    processing recursive @ComponentScan definitions, and rethrew as a
    "CircularComponentScanException.  With the changes in this commit,
    such CBDEs will no longer occur, obviating the need for this check and
    for this custom exception type altogether.
    
    Issue: SPR-8808, SPR-8307
    cbeams committed Nov 28, 2011
  4. refined Resource "exists()" check for HTTP URLs to always return fals…

    …e for 404 status (SPR-7881)
    jhoeller committed Nov 28, 2011
  5. JPA EntityManagerFactoryUtils silently ignores IllegalArgumentExcepti…

    …ons from setHint calls (SPR-7947)
    jhoeller committed Nov 28, 2011
  6. LinkedCaseInsensitiveMap overrides putAll method as well (for IBM JDK…

    … 1.6 compatibility; SPR-7969)
    jhoeller committed Nov 28, 2011
  7. JDO PersistenceManager synchronization performs close attempt after c…

    …ompletion (if necessary; SPR-8846)
    jhoeller committed Nov 28, 2011
  8. TransactionSynchronizationManager eagerly cleans up void ResourceHold…

    …ers on any access (SPR-8844, SPR-8845)
    jhoeller committed Nov 28, 2011
  9. SPR-8867 Fix issue with Content-Length header and UTF-8 charset.

    The AbstractHttpMessageConverter was using the requested Content-Type
    rather than the actual response Content-Type to determine the length
    of the content. This can lead to a problem when a controller returns
    a ResponseEntity with a Content-Type header that ignores (overrides)
    the requested Content-Type. The fix ensures that actual response 
    Content-Type is the one used both to write to the response and to 
    determine the length of the content.
    rstoyanchev committed Nov 28, 2011
  10. polishing

    jhoeller committed Nov 28, 2011
  11. added "forwarder" property to ConnectorServerFactoryBean, accepting a…

    …n MBeanServerForwarder (SPR-8820)
    jhoeller committed Nov 28, 2011
  12. Servlet/PortletContextResource's getFile prefers "file:" URL resoluti…

    …on over calling getRealPath (SPR-8461)
    jhoeller committed Nov 28, 2011
  13. exposed EHCache 1.7's "statisticsEnabled"/"sampledStatisticsEnabled" …

    …on EhCacheFactoryBean ()
    jhoeller committed Nov 28, 2011
  14. fixed "formMultiSelect"/"formCheckboxes" FreeMarker macros to compare…

    … against actual field value (SPR-7721)
    jhoeller committed Nov 28, 2011
  15. + update cache docs

    Costin Leau committed Nov 28, 2011
  16. SimpleJdbcTestUtils executeSqlScript properly closes its LineNumberRe…

    …ader after use (SPR-8872)
    jhoeller committed Nov 28, 2011
  17. + update aspectj cache aspects

    + update integration tests
    Costin Leau committed Nov 28, 2011
  18. SpringValidatorAdapter accepts non-indexed set paths (for Hibernate V…

    …alidator compatibility; SPR-8634)
    jhoeller committed Nov 28, 2011
  19. + align @CacheEvict behaviour with @Cacheable and @CachePut

    + add flag for post method execution
    + add integration tests
    Costin Leau committed Nov 28, 2011
  20. + minor doc fix

    Costin Leau committed Nov 28, 2011
  21. Introduce @EnableSpringConfigured

    Equivalent to <context:spring-configured/>.
    
    Also update @EnableLoadTimeWeaving Javadoc and spring-configured XSD
    documentation to reflect.
    
    Issue: SPR-7888
    cbeams committed Nov 28, 2011
  22. Refactor BeanConfigurerTests

    In preparation for the introduction of @EnableSpringConfigured
    
    Issue: SPR-7888
    cbeams committed Nov 28, 2011
  23. Polish .aop copy of SpringConfiguredBDP

    Add 'infrastructure' bean role to follow suit with original .context SCPDP
    
    Encountered while working on SPR-7888 (@EnableSpringConfigured)
    cbeams committed Nov 28, 2011
  24. [SPR-7996] Improved documentation of the context caching mechanism in…

    … the TestContext framework:
    
    - now discussing cache key generation and uniqueness
    - now discussing cache scope, test suites, and forking
    sbrannen committed Nov 28, 2011
  25. added "namingStrategy" property to Hibernate 4 LocalSessionFactoryBea…

    …n variant (SPR-8864)
    jhoeller committed Nov 28, 2011