Permalink
Switch branches/tags
Commits on Mar 13, 2013
  1. Hide 'doc' changes from jdiff reports

    Phillip Webb
    Phillip Webb committed Mar 13, 2013
  2. Document @Bean 'lite' mode vs @Configuration

    Phillip Webb
    Phillip Webb committed Mar 13, 2013
    Rework the reference documentation to better distinguish the differences
    between @Bean methods used in @Comonent vs @Configuration classes. The
    'Using the @Bean annotation' section now only covers concepts applicable
    when using @Bean methods in @Configuration _or_ @Component classes.
    Information only applicable to @Configuration classes has been moved to
    a new  'Using the @Configuration annotation' section.
    
    An additional sidebar section attempts to explain the differences
    between the two approaches.
    
    Issue: SPR-9425
  3. Final preparations for 3.2.2

    jhoeller committed Mar 13, 2013
  4. Remove Tiles 3 configuration method

    rstoyanchev committed Mar 13, 2013
    Issue: SPR-10361
  5. Polishing

    jhoeller committed Mar 13, 2013
  6. Extracted buildRequestAttributes template method from FrameworkServlet

    jhoeller committed Mar 13, 2013
    Also, RequestBindingInterceptor now obtains HttpServletRequest from locally passed-in request handle and delegates to buildRequestAttributes as well now.
    
    Issue: SPR-10342
  7. Added "beforeExistingAdvisors" flag to AbstractAdvisingBeanPostProcessor

    jhoeller authored and unknown committed Mar 13, 2013
    Just AsyncAnnotationBeanPostProcessor switches "beforeExistingAdvisors" to "true" by default. So effectively, MethodValidation/PersistenceExceptionTranslationPostProcessor apply after existing advisors by default again, fixing the 3.1->3.2 regression.
    
    Issue: SPR-10309
  8. Minor refinements along the way of researching static CGLIB callbacks

    jhoeller authored and unknown committed Mar 13, 2013
    Specifically, our CallbackFilter doesn't hold an implicit reference to the containing ConfigurationClassEnhancer class anymore.
    
    Issue: SPR-10307
  9. Merge pull request #252 from dharkness/patch-1

    Phillip Webb
    Phillip Webb committed Mar 13, 2013
    # By David Harkness
    * patch-1:
      Compare Kind references before checking log levels
  10. Compare Kind references before checking log levels

    dharkness authored and Phillip Webb committed Mar 13, 2013
    Assuming reference comparisons are much quicker than checking
    likely-nested logger levels, perform the former first.
    
    Also, since the reference can match only one of the instances,
    use "else if" to short-circuit the search.
Commits on Mar 11, 2013
  1. Fix issue with restoring included attributes

    rstoyanchev committed Mar 11, 2013
    Before this change the DispatcherServlet restored modified and also
    removed added attributes but did not restore removed attributes.
    
    Issue: SPR-10360
  2. Merge pull request #251 from dsyer/feature/crontest

    sbrannen committed Mar 11, 2013
    # By Dave Syer
    * dsyer-feature/crontest:
      Add additional test for daylight savings glitch
  3. Add additional test for daylight savings glitch

    dsyer authored and sbrannen committed Mar 10, 2013
    The problem was that clocks go forward *at* 2am, so
    2am doesn't exist once a year. Users might be surprised
    that their cron trigger doesn't go off one night, but that
    is arguably correct (and what happens now). The test can be
    modified if we decide to change the trigger behaviour.
  4. Document context hierarchy support in the TCF

    sbrannen committed Mar 11, 2013
    This commit updates the reference manual regarding the new support for
    @ContextHierarchy and hierarchy modes in @DirtiesContext.
    
    Issue: SPR-10357
Commits on Mar 10, 2013
  1. Merge pull request #250 from dsyer/feature/crontest

    cbeams committed Mar 10, 2013
    Fix test for daylight savings glitch
  2. Make the methodParameter field of HandlerMethod final

    rstoyanchev committed Mar 10, 2013
    Previously the methodParameter array field was initialized lazily since
    it requires reflection. However, in practice the field is always used
    and there is not much benefit from the lazy initialization.
    
    In Spring Framework 3.2, the methodParameter field was copied when a
    new HandlerMethod instance (with the resolved bean) is created for
    performance reasons. That introduced a synchronization issue since
    the lazy initialization was not synchronized.
    
    Issue: SPR-10365
  3. Reformat the testing chapter

    sbrannen committed Mar 10, 2013
    This commit reformats the testing chapter (and adds minor polishing
    changes) in order to avoid massive merge diffs in upcoming commits.
    
    Issue: SPR-10357
  4. Document context hierarchy support in the TCF

    sbrannen committed Mar 10, 2013
    This commit polishes the Javadoc for @ContextHierarchy and
    @ContextConfiguration.
    
    Issue: SPR-10357
  5. Document context hierarchy support in the TCF

    sbrannen committed Mar 10, 2013
    This commit adds examples to the Javadoc for @ContextHierarchy and
    updates the Javadoc for @ContextConfiguration accordingly.
    
    Issue: SPR-10357
Commits on Mar 9, 2013
  1. UriComponentsBuilder parse of empty fragments

    olivergierke authored and Phillip Webb committed Mar 8, 2013
    Check for an empty fragment in UriComponentsBuilder.fromUriString(...)
    to prevent the invocation of fragment(...).
    
    Previously, UriComponentsBuilder.fromUriString(...) threw an exception
    in the case of an empty fragment being provided (e.g. /example#).
    
    Issue: SPR-10363
Commits on Mar 7, 2013
  1. Use null in MockServletContext for unknown mime types

    rstoyanchev committed Mar 7, 2013
    MockServletContext.getMimeTypes now returns null if the Java Activation
    Framework returns "application/octet-stream", which is the default
    media type it returns if the mime type is unknown. This enforces the
    contract for ServletContext.getMimeTypes (return null for uknown mime
    types) but does mean "application/octet-stream" cannot be returned.
    
    Issue: SPR-10334
  2. Add context hierarchy tests to Spring MVC Test

    rstoyanchev committed Mar 7, 2013
    Issue: SPR-5613
  3. Merge pull request #247 from sbrannen/SPR-5613

    sbrannen committed Mar 7, 2013
    * SPR-5613:
      Provide support for context hierarchies in the TCF
  4. Provide support for context hierarchies in the TCF

    sbrannen committed Jan 11, 2013
    Prior to this commit the Spring TestContext Framework supported creating
    only flat, non-hierarchical contexts. There was no easy way to create
    contexts with parent-child relationships.
    
    This commit addresses this issue by introducing a new @ContextHierarchy
    annotation that can be used in conjunction with @ContextConfiguration
    for declaring hierarchies of application contexts, either within a
    single test class or within a test class hierarchy. In addition,
    @DirtiesContext now supports a new 'hierarchyMode' attribute for
    controlling context cache clearing for context hierarchies.
    
    - Introduced a new @ContextHierarchy annotation.
    - Introduced 'name' attribute in @ContextConfiguration.
    - Introduced 'name' property in ContextConfigurationAttributes.
    - TestContext is now aware of @ContextHierarchy in addition to
      @ContextConfiguration.
    - Introduced findAnnotationDeclaringClassForTypes() in AnnotationUtils.
    - Introduced resolveContextHierarchyAttributes() in ContextLoaderUtils.
    - Introduced buildContextHierarchyMap() in ContextLoaderUtils.
    - @ContextConfiguration and @ContextHierarchy may not be used as
      top-level, class-level annotations simultaneously.
    - Introduced reference to the parent configuration in
      MergedContextConfiguration and WebMergedContextConfiguration.
    - Introduced overloaded buildMergedContextConfiguration() methods in
      ContextLoaderUtils in order to handle context hierarchies separately
      from conventional, non-hierarchical contexts.
    - Introduced hashCode() and equals() in ContextConfigurationAttributes.
    - ContextLoaderUtils ensures uniqueness of @ContextConfiguration
      elements within a single @ContextHierarchy declaration.
    - Introduced CacheAwareContextLoaderDelegate that can be used for
      loading contexts with transparent support for interacting with the
      context cache -- for example, for retrieving the parent application
      context in a context hierarchy.
    - TestContext now delegates to CacheAwareContextLoaderDelegate for
      loading contexts.
    - Introduced getParentApplicationContext() in MergedContextConfiguration
    - The loadContext(MergedContextConfiguration) methods in
      AbstractGenericContextLoader and AbstractGenericWebContextLoader now
      set the parent context as appropriate.
    - Introduced 'hierarchyMode' attribute in @DirtiesContext with a
      corresponding HierarchyMode enum that defines EXHAUSTIVE and
      CURRENT_LEVEL cache removal modes.
    - ContextCache now internally tracks the relationships between contexts
      that make up a context hierarchy. Furthermore, when a context is
      removed, if it is part of a context hierarchy all corresponding
      contexts will be removed from the cache according to the supplied
      HierarchyMode.
    - AbstractGenericWebContextLoader will set a loaded context as the
      ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE in the MockServletContext when
      context hierarchies are used if the context has no parent or if the
      context has a parent that is not a WAC.
    - Where appropriate, updated Javadoc to refer to the
      ServletTestExecutionListener, which was introduced in 3.2.0.
    - Updated Javadoc to avoid and/or suppress warnings in spring-test.
    - Suppressed remaining warnings in code in spring-test.
    
    Issue: SPR-5613, SPR-9863
Commits on Mar 6, 2013
  1. Do not sort the mvc:resources location attribute

    Phillip Webb
    Phillip Webb committed Mar 6, 2013
    Update ResourcesBeanDefinitionParser to use ensure that location
    attribute values remain in the order that they are specified. The
    order was inadvertently changed in commit 3838d159f3 due to the use
    of StringUtils.commaDelimitedListToSet which sorts items.
    
    Issue: SPR-10355
  2. Merge branch 'cleanup-3.2.x' into 3.2.x

    Phillip Webb
    Phillip Webb committed Mar 6, 2013
    * cleanup-3.2.x:
      Replace EasyMock with Mockito
  3. Replace EasyMock with Mockito

    Phillip Webb
    Phillip Webb committed Mar 5, 2013
    Issue: SPR-10126
  4. Added locale-independent "commonMessages" property to AbstractMessage…

    jhoeller committed Mar 6, 2013
    …Source
    
    Issue: SPR-10291
Commits on Mar 4, 2013
  1. Merge branch '3.2.x' into cleanup-3.2.x

    Phillip Webb
    Phillip Webb committed Mar 4, 2013
    * 3.2.x: (111 commits)
      Fix FreeMarker form checbox macro generated names
      Fix DefaultMockMvcBuilder fluent API generic type
      Catch IAE when parsing content type
      Update @RequestParam javadoc
      Fix AntPathMatcher rule for combining with extensions
      DefaultLobHandler etc
      Minor javadoc updates
      Deprecated OracleLobHandler in favor of DefaultLobHandler for the Oracle 10g driver and higher
      Added "createTemporaryLob" flag to DefaultLobHandler, using JDBC 4.0's createBlob/Clob mechanism
      Add Castor XSD information to reference docs
      Do not use Servlet 3.0 API in doOptions()
      Cache target type per bean definition and allow for specifying it in advance
      Mentioning JDBC 4's unwrap method for obtaining the native connection now
      LazyConnectionDataSourceProxy catches setReadOnly exception analogous to DataSourceUtils
      Refined predictBeanType's typesToMatch check for FactoryBeans
      Fix minor javadoc typos
      Fix incorrect closing <web-app> tag in MVC docs
      Fixed minor typo
      Suppress warnings for resource leaks
      Update spring-test re: deprecated queryForInt()
      ...
  2. DefaultListableBeanFactory clears by-type matching cache on runtime r…

    jhoeller authored and unknown committed Mar 1, 2013
    …egister/destroySingleton calls
    
    Issue: SPR-10326