1. 03 4月, 2012 1 次提交
  2. 27 3月, 2012 2 次提交
  3. 20 3月, 2012 1 次提交
  4. 15 3月, 2012 2 次提交
    • C
      Merge pull request #58 from sslavic/SPR-7865 · bb5c81e0
      Chris Beams 提交于
      * SPR-7865:
        Use configured encoding during JiBX unmarshalling
      bb5c81e0
    • S
      Use configured encoding during JiBX unmarshalling · e25183ea
      Stevo Slavic 提交于
      Before this change JibxMarshaller did not use the configured encoding
      when unmarshalling XML. This caused issues when content being
      unmarshalled was not encoded using the default encoding.
      
      This commit fixes the issue by passing configured encoding to JiBX so
      it gets used when unmarshalling instead of the default encoding.
      
      Issue: SPR-7865
      e25183ea
  5. 09 3月, 2012 3 次提交
  6. 08 3月, 2012 1 次提交
    • C
      Move QueryTimeoutException to spring-tx · 6d94b74a
      Chris Beams 提交于
      This change fixes a mistake made during an earlier sync with the 3.1.x
      branch in which the new QueryTimeoutException class was accidentally
      placed in spring-transaction instead of spring-tx.
      
      Issue: SPR-7680
      6d94b74a
  7. 05 3月, 2012 2 次提交
  8. 03 3月, 2012 2 次提交
    • R
      Merge pull request #48 from sslavic/SPR-5984 · 9c8332a6
      Rossen Stoyanchev 提交于
      9c8332a6
    • S
      Fix MultipartResolver javadoc implementation refs · 104f13e4
      Stevo Slavic 提交于
      Before this fix MultipartResolver javadoc mentioned that there is only
      one concrete implementation included in Spring. This was true as of
      Spring 2.5 but Spring 3.1 added another one, Servlet 3.0 Part API based
      implementation.
      
      This fix changes MultipartResolver javadoc so that the other one,
      StandardServletMultipartResolver implementation, gets also listed.
      Changed javadoc mentions also as of which version does Spring bundle
      two MultipartResolver implementations.
      
      Issue: SPR-5984
      104f13e4
  9. 02 3月, 2012 1 次提交
  10. 01 3月, 2012 6 次提交
  11. 29 2月, 2012 1 次提交
    • C
      Return null correctly from MutablePropertySources#get · 15d1d824
      Chris Beams 提交于
      Prior to this commit, MutablePropertySources#get(String) would throw
      IndexArrayOutOfBoundsException if the named property source does not
      actually exist. This is a violation of the PropertySource#get contract
      as described in its Javadoc.
      
      The implementation now correctly checks for the existence of the named
      property source, returning null if non-existent and otherwise returning
      the associated PropertySource.
      
      Other changes
      
       - Rename PropertySourcesTests => MutablePropertySourcesTests
       - Polish MutablePropertySourcesTests for style, formatting
       - Refactor MutablePropertySources for consistency
      
      Issue: SPR-9179
      15d1d824
  12. 28 2月, 2012 1 次提交
  13. 27 2月, 2012 1 次提交
  14. 24 2月, 2012 1 次提交
    • C
      Avoid infinite loop in AbstractResource#contentLength · 7ca5fba0
      Chris Beams 提交于
      Due to changes made in commit 2fa87a71 for SPR-9118,
      AbstractResource#contentLength would fall into an infinite loop unless
      the method were overridden by a subclass (which it is in the majority of
      use cases).
      
      This commit:
      
       - fixes the infinite recursion by refactoring to a while loop
      
       - asserts that the value returned from #getInputStream is not null in
         order to avoid NullPointerException
      
       - tests both of the above
      
       - adds Javadoc to the Resource interface to clearly document that the
         contract for any implementation is that #getInputStream must not
         return null
      
      Issue: SPR-9161
      7ca5fba0
  15. 23 2月, 2012 2 次提交
  16. 22 2月, 2012 2 次提交
    • C
      Merge pull request #41 from sslavic/SPR-7843 · f5042d19
      Chris Beams 提交于
      * SPR-7843:
        Predict specific object type in EhCacheFactoryBean
      f5042d19
    • S
      Predict specific object type in EhCacheFactoryBean · 0690b588
      Stevo Slavic 提交于
      Prior to this change, before a bean is created by EhCacheFactoryBean,
      its #getObjectType would return only an Ehcache interface. This caused
      unwanted wiring issues as described in the related JIRA issue.
      
      This fix makes use of EhCacheFactoryBean's configuration to determine
      the specific Ehcache object type even before it's created, such that
      the container is provided with as much information as possible when
      resolving dependencies. Nevertheless, users are advised to code to
      the Ehcache interface.
      
      Issue: SPR-7843
      0690b588
  17. 21 2月, 2012 1 次提交
    • C
      Map ORA-30006 to CannotAcquireLockException as well · b2291ff8
      Chris Beams 提交于
      ORA-00054 is already mapped to CannotAcquireLockException and is
      described as
      
        "resource busy and acquire with NOWAIT specified"
      
      As pointed out in the associated JIRA issue, ORA-30006 is quite similar
      being described as
      
        "resource busy; acquire with WAIT timeout expired"
      
      This commit maps ORA-30006 to CannotAcquireLockException as well.
      
      Issue: SPR-9141
      b2291ff8
  18. 20 2月, 2012 2 次提交
    • C
      Fix regression in @PropertySource placeholder resolution · 4df2a14b
      Chris Beams 提交于
      Changes in commit 41ade68b introduced
      a regression causing all but the first location in the
      @PropertySource#value array to be ignored during ${...} placeholder
      resolution. This change ensures that all locations are processed and
      replaced as expected.
      
      Issue: SPR-9133, SPR-9127
      4df2a14b
    • C
      Sync with 3.1.x · 37d547c5
      Chris Beams 提交于
      * 3.1.x:
        Warn re Environment construction and instance vars
        Disallow empty @PropertySource(value = {})
        Fix @PropertySource bug with multiple values
        final preparations for 3.1.1 release
        added "receive-timeout" attribute to "jms:listener-container" element
      37d547c5
  19. 17 2月, 2012 4 次提交
    • C
      Warn re Environment construction and instance vars · 7535e24d
      Chris Beams 提交于
       - Add warning regarding access to default instance variable values
         during AbstractEnvironment#customizePropertySources callback
      
       - Polish AbstractEnvironment Javadoc and formatting
      
      Issue: SPR-9013
      7535e24d
    • C
      Disallow empty @PropertySource(value = {}) · 80dd32e9
      Chris Beams 提交于
      Previously, a user could specify an empty array of resource locations
      to the @PropertySource annotation, which amounts to a meaningless no-op.
      
      ConfigurationClassParser now throws IllegalArgumentException upon
      encountering any such misconfiguration.
      80dd32e9
    • C
      Fix @PropertySource bug with multiple values · 41ade68b
      Chris Beams 提交于
      Prior to this commit, specifying a named @PropertySource with multiple
      values would not work as expected. e.g.:
      
        @PropertySource(
            name = "ps",
            value = { "classpath:a.properties", "classpath:b.properties" })
      
      In this scenario, the implementation would register a.properties with
      the name "ps", and subsequently register b.properties with the name
      "ps", overwriting the entry for a.properties.
      
      To fix this behavior, a CompositePropertySource type has been introduced
      which accepts a single name and a set of PropertySource objects to
      iterate over. ConfigurationClassParser's @PropertySource parsing routine
      has been updated to use this composite approach when necessary, i.e.
      when both an explicit name and more than one location have been
      specified.
      
      Note that if no explicit name is specified, the generated property
      source names are enough to distinguish the instances and avoid
      overwriting each other; this is why the composite wrapper is not used
      in these cases.
      
      Issue: SPR-9127
      41ade68b
    • J
      final preparations for 3.1.1 release · ff862add
      Juergen Hoeller 提交于
      ff862add
  20. 16 2月, 2012 4 次提交
    • C
      Add link to contributor guidelines in readme · 624ba720
      Chris Beams 提交于
      624ba720
    • C
      Sync with 3.1.x · 3e814827
      Chris Beams 提交于
      * 3.1.x:
        Demonstrate use of @Configuration as meta-annotation
        Prune dead code from JmsTransactionManager#doBegin
        Apply @Configuration BeanNameGenerator consistently
        Improve @Configuration bean name discovery
        Fix infinite recursion bug in nested @Configuration
        Polish static imports
        Minor fix in ServletResponseMethodArgumentResolver
        extracted ResourceUtils.useCachesIfNecessary(URLConnection) method (SP
        prepared for 3.1.1 release
        CustomSQLExceptionTranslatorRegistry/Registrar etc
        revised CustomSQLExceptionTranslatorRegistry/Registrar method naming
        use custom InputStream traversal instead of a full byte array (SPR-911
        PathMatchingResourcePatternResolver preserves caching for JNLP jar con
        Resource "contentLength()" implementations work with OSGi bundle resou
        fixed MethodInvokingJobDetailFactoryBean for compatibility with Quartz
        fixed MethodInvokingJobDetailFactoryBean for compatibility with Quartz
      3e814827
    • J
    • C
      Demonstrate use of @Configuration as meta-annotation · 1c2b1d2c
      Chris Beams 提交于
      Issue: SPR-9090
      1c2b1d2c