1. 19 3月, 2013 8 次提交
  2. 14 3月, 2013 5 次提交
    • P
      Merge branch '3.2.x' · 4e1cab28
      Phillip Webb 提交于
      * 3.2.x: (28 commits)
        Hide 'doc' changes from jdiff reports
        Document @Bean 'lite' mode vs @Configuration
        Final preparations for 3.2.2
        Remove Tiles 3 configuration method
        Polishing
        Extracted buildRequestAttributes template method from FrameworkServlet
        Added "beforeExistingAdvisors" flag to AbstractAdvisingBeanPostProcessor
        Minor refinements along the way of researching static CGLIB callbacks
        Compare Kind references before checking log levels
        Polish Javadoc in RequestAttributes
        Fix copy-n-paste errors in NativeWebRequest
        Fix issue with restoring included attributes
        Add additional test for daylight savings glitch
        Document context hierarchy support in the TCF
        Fix test for daylight savings glitch
        Make the methodParameter field of HandlerMethod final
        Disable AsyncTests in spring-test-mvc
        Reformat the testing chapter
        Document context hierarchy support in the TCF
        Document context hierarchy support in the TCF
        ...
      4e1cab28
    • P
      Hide 'doc' changes from jdiff reports · f62f6975
      Phillip Webb 提交于
      f62f6975
    • P
      Document @Bean 'lite' mode vs @Configuration · 5730b8d3
      Phillip Webb 提交于
      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
      5730b8d3
    • J
      Final preparations for 3.2.2 · 457ee073
      Juergen Hoeller 提交于
      457ee073
    • R
      Remove Tiles 3 configuration method · d9540ff3
      Rossen Stoyanchev 提交于
      Issue: SPR-10361
      d9540ff3
  3. 13 3月, 2013 8 次提交
  4. 11 3月, 2013 7 次提交
  5. 10 3月, 2013 4 次提交
  6. 09 3月, 2013 1 次提交
    • O
      UriComponentsBuilder parse of empty fragments · 3eb36106
      Oliver Gierke 提交于
      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
      3eb36106
  7. 08 3月, 2013 2 次提交
  8. 07 3月, 2013 5 次提交
    • S
      Merge pull request #247 from sbrannen/SPR-5613 · 4c5d7717
      Sam Brannen 提交于
      * SPR-5613:
        Provide support for context hierarchies in the TCF
      4c5d7717
    • S
      Provide support for context hierarchies in the TCF · 98074e77
      Sam Brannen 提交于
      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
      98074e77
    • P
      Do not sort the mvc:resources location attribute · 7bc5353e
      Phillip Webb 提交于
      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
      7bc5353e
    • P
      Merge branch 'cleanup-3.2.x' into 3.2.x · 85f8d6f6
      Phillip Webb 提交于
      * cleanup-3.2.x:
        Replace EasyMock with Mockito
      85f8d6f6
    • P
      Replace EasyMock with Mockito · 05765d75
      Phillip Webb 提交于
      Issue: SPR-10126
      05765d75