1. 04 6月, 2013 5 次提交
    • P
      Introduce java.nio.file.Path based Resource · 2313c9a0
      Philippe Marschall 提交于
      Develop new org.springframework.core.io.Resource implementation
      backed by java.nio.file.Path. Primarily developed to allow custom
      file system implementations to be used with Spring.
      
      Since the minimum requirement for Spring is still Java 6 the
      existing FileSystemResource can't be retrofitted (and no #getPath
      method can be added to the Resource interface).
      
      Unlike FileSystemResource, PathResource delegates to the underlying
      file system instead of StringUtils. It has therefore slightly
      different semantics. First, when building relative resources via
      createRelative the relative path will apply to this path (like URL or
      Unix). Second, equality is delegated to the underlying file system
      provider so it's case-insensitive on Windows.
      
      Issue: SPR-10608
      2313c9a0
    • P
      Merge pull request #286 from sslavic/SPR-10571 · 1f5467a2
      Phillip Webb 提交于
      # By Stevo Slavic
      * SPR-10571:
        Replace MaxPermSize use in build scripts
      1f5467a2
    • S
      Replace MaxPermSize use in build scripts · ecf8464d
      Stevo Slavic 提交于
      Since JDK 8 is required to build Spring framework 4, and permanent
      generation is gone from Java 8, to eliminate warnings about no longer
      available MaxPermSize switch, it should be removed or replaced with new
      MaxMetaspaceSize switch.
      
      This fix replaces old with new switch to limit the amount of native
      memory used for class metadata.
      
      Issue: SPR-10571
      ecf8464d
    • P
      Support EnvironmentAware ImportSelector/Registrar · 4d338324
      Phillip Webb 提交于
      Add support for the EnvironmentAware interface with ImportSelector
      and ImportBeanDefinitionRegistrar implementations.
      
      Issue: SPR-10602
      4d338324
    • P
      Test for property placeholder with defaults · d7ec20a2
      Phillip Webb 提交于
      Test property placeholder with multiple locations and default values.
      
      Issue: SPR-10619
      d7ec20a2
  2. 31 5月, 2013 2 次提交
  3. 29 5月, 2013 1 次提交
  4. 28 5月, 2013 4 次提交
  5. 26 5月, 2013 1 次提交
  6. 23 5月, 2013 2 次提交
    • R
      Fix MergePlugin · 07b75533
      Rob Winch 提交于
      The submitted pull requests for SPR-10572 did not build.
      
      This commit fixes the MergePlugin to create from configurations rather
      than the project. It also removes unnecessarily added code that was
      commented out.
      
      Issue: SPR-10572
      07b75533
    • S
      Eliminate Gradle 1.6 deprecation warnings · bf205bfe
      Stevo Slavic 提交于
      Recently Spring framework build has been updated to use Gradle 1.6.
      With the new version some of the Gradle APIs have been deprecated.
      These deprecated APIs have been used by Spring build specific Gradle
      plugins, which resulted in deprecation warnings in build output.
      
      This patch changes Spring build specific Gradle plugins to use new
      Gradle APIs instead of deprecated ones.
      
      Even after this change build still produces warnings about Gradle
      deprecated APIs being used. These come from Spring shared Gradle
      plugins and other 3rd party Gradle plugins in use, like Gradle
      Artifactory Plugin (GAP), which are still not updated to Gradle 1.6.
      Related tickets for updating of these plugins to Gradle 1.6 are
      GRADLE-53 and GAP-144, and once they get resolved Spring framework
      build should further be updated.
      
      Issue: SPR-10572
      bf205bfe
  7. 22 5月, 2013 5 次提交
  8. 18 5月, 2013 1 次提交
  9. 17 5月, 2013 5 次提交
  10. 16 5月, 2013 7 次提交
  11. 15 5月, 2013 7 次提交
    • J
      Polishing · 7cddeb6d
      Juergen Hoeller 提交于
      7cddeb6d
    • J
    • J
      Properly handle knownSuperclasses in case of an overridden ConfigurationClass · 3f7007f7
      Juergen Hoeller 提交于
      Issue: SPR-10546
      (cherry picked from commit 6e4317eb)
      3f7007f7
    • R
      Ensure Parent ConfigurationClass loaded on overrides · d1859c8c
      Rob Winch 提交于
      Previously ConfigurationClassParser could override a nested
      @Configuration without consideration of @Bean's defined in parent
      classes.
      
      This commit ensures that if the original ConfigurationClass contains
      additional bean definitions it is processed again.
      
      Issue: SPR-10546
      (cherry picked from commit 940011e2)
      d1859c8c
    • R
      Make removal of jsessionid case insensitive · a86283eb
      Rossen Stoyanchev 提交于
      Issue: SPR-10398
      a86283eb
    • R
      Reinstate removal of semicolon content · d23de282
      Rossen Stoyanchev 提交于
      Commit 5b1165 was an attempt to leave semicolon content in the URL path
      while ignoring it for request mapping purposes. However, it becomes
      quite difficult to manage and semicolon content should not always be
      ignored (sometimes a semicolon is used as a separator of multiple items
      in a path segment, rather than for matrix variables).
      
      This change effectively reverts back to the original approach in 3.2
      where a flag on AbstractHandlerMapping can be used to have semicolon
      content removed or kept. If kept, path segments with matrix variables
      must be represented with a path segment.
      
      The main difference is that by default it is removed everywhere
      including the MVC namespace and Java config.
      
      Issue: SPR-10427, SPR-10234
      d23de282
    • R
      Fix deadlock issue in DeferredResult · db596d23
      Rossen Stoyanchev 提交于
      Previously DeferredResult locked around the setting of the result
      including handling up to the part of submitting a dispatch. This
      can cause a deadlock if a timeout occurs at the same time since
      the Tomcat timeout thread has its own locking that permits only
      one thread to do timeout or dispatch processing.
      
      The fix reduces the locking to cover only the attempt to set the
      DeferredResult but not the dispatching.
      
      Issue: SPR-10485
      db596d23