1. 13 6月, 2015 3 次提交
  2. 12 6月, 2015 1 次提交
    • S
      Proper support for Root WAC in Spring MVC Test · f6d2fe47
      Sam Brannen 提交于
      The modifications to DefaultMockMvcBuilder performed in conjunction
      with SPR-12553 introduced a breaking change: the WebApplicationContext
      supplied to DefaultMockMvcBuilder's constructor was *always* stored in
      the ServletContext as the root WebApplicationContext, overwriting a
      root WebApplicationContext that had been set by the user or by the
      Spring TestContext Framework (TCF) -- for example, in
      AbstractGenericWebContextLoader. Consequently, the changes in SPR-12553
      cause tests that use @ContextHierarchy to fail if web components rely
      on the correct WebApplicationContext being stored under the
      WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE key.
      
      This commit reverts the breaking changes introduced in SPR-12553: if
      the root WebApplicationContext has already been set in the
      ServletContext of the WebApplicationContext supplied to
      DefaultMockMvcBuilder, no action is taken.
      
      Furthermore, this commit introduces new code to address the initial
      intent of SPR-12553. Specifically, if the root WebApplicationContext
      has NOT been set in the ServletContext of the WebApplicationContext
      supplied to DefaultMockMvcBuilder, the application context hierarchy
      will be traversed in search of the root WebApplicationContext, and the
      root WebApplicationContext will then be stored under the
      ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE key.
      
      Issue: SPR-13075, SPR-12553
      f6d2fe47
  3. 11 6月, 2015 8 次提交
  4. 10 6月, 2015 3 次提交
  5. 09 6月, 2015 3 次提交
  6. 05 6月, 2015 12 次提交
  7. 04 6月, 2015 3 次提交
  8. 03 6月, 2015 3 次提交
    • S
      Allow Cache annotations to not specify any cache name · 08c032d9
      Stephane Nicoll 提交于
      Since Spring 4.1, a CacheResolver may be configured to customize the way
      the cache(s) to use for a given cache operation are retrieved. Since a
      CacheResolver implementation may not use the cache names information at
      all, this attribute has been made optional.
      
      However, a fix was still applied, preventing a Cache operation without a
      cache name to be defined properly. We now allow this valid use case.
      
      Issue: SPR-13081
      08c032d9
    • S
      Polish ConditionalGenericConverter documentation · d6056182
      Stephane Nicoll 提交于
      Issue: SPR-13071
      d6056182
    • S
      Support CORS global configuration in XML namespace · e5f76af1
      Sebastien Deleuze 提交于
      This commit introduces support for this kind of CORS XML namespace configuration:
      
      	<mvc:cors>
      
      		<mvc:mapping path="/api/**"
      					allowed-origins="http://domain1.com, http://domain2.com"
      					allowed-methods="GET, PUT"
      					allowed-headers="header1, header2, header3"
      					exposed-headers="header1, header2" allow-credentials="false"
      					max-age="123" />
      
      		<mvc:mapping path="/resources/**" allowed-origins="http://domain1.com" />
      
      	</mvc:cors>
      
      Issue: SPR-13046
      e5f76af1
  9. 02 6月, 2015 3 次提交
  10. 01 6月, 2015 1 次提交