1. 28 10月, 2012 7 次提交
    • P
      Polish whitespace · 376eeed8
      Phillip Webb 提交于
      376eeed8
    • S
      Fix package cycles in spring-test · 461d99af
      Sam Brannen 提交于
      Code introduced in conjunction with SPR-5243 introduced package cycles
      between the ~.test.context and ~.test.context.web packages. This was
      caused by the fact that ContextLoaderUtils worked directly with the
      @WebAppConfiguration and WebMergedContextConfiguration types.
      
      To address this, the following methods have been introduced in
      ContextLoaderUtils. These methods use reflection to circumvent hard
      dependencies on the @WebAppConfiguration and
      WebMergedContextConfiguration types.
      
       - loadWebAppConfigurationClass()
       - buildWebMergedContextConfiguration()
      
      Issue: SPR-9924
      461d99af
    • S
      Reduce code duplication in ContextLoaderUtils · 33d5b011
      Sam Brannen 提交于
      Prior to this commit, the following two methods in ContextLoaderUtils
      contained almost identical loops for traversing the test class
      hierarchy:
      
       - resolveContextLoaderClass(Class<?>, String)
       - resolveContextConfigurationAttributes(Class<?>)
      
      With this commit, resolveContextLoaderClass() no longer traverses the
      class hierarchy. Instead, it now works directly with the resolved list
      of ContextConfigurationAttributes, thereby removing code duplication.
      
      Issue: SPR-9918
      33d5b011
    • S
      Update changelog · 397d20b5
      Sam Brannen 提交于
      Issue: SPR-9593
      397d20b5
    • S
      Fix package cycles in spring-test · 90c5f226
      Sam Brannen 提交于
      Code introduced in conjunction with SPR-5243 introduced package cycles
      between the ~.test.context.web and ~.test.context.support packages. This
      was caused by the fact that ServletTestExecutionListener extended
      AbstractTestExecutionListener.
      
      To address this, ServletTestExecutionListener now implements
      TestExecutionListener directly.
      
      Issue: SPR-9924
      90c5f226
    • S
      Update changelog · acc83645
      Sam Brannen 提交于
      Issue: SPR-9724
      acc83645
    • S
      Configurable locales in MockHttpServletRequest · 591aa017
      Sam Brannen 提交于
      Prior to this commit the MockHttpServletRequest constructor chain set
      the preferred local to Locale.ENGLISH. Furthermore, it was possible to
      add additional preferred locales "in front" of ENGLISH; however, it was
      not possible to delete ENGLISH from the list of preferred locales.
      
      This commit documents the fact that ENGLISH is the default preferred
      locale and makes it possible to set the list of preferred locales via a
      new setPreferredLocales(List<Locale> locales) method.
      
      Issue: SPR-9724
      591aa017
  2. 27 10月, 2012 7 次提交
    • S
      Delete unused imports · 7d9c823a
      Sam Brannen 提交于
      7d9c823a
    • R
      Fix failing test · fe77c3d5
      Rossen Stoyanchev 提交于
      fe77c3d5
    • R
      Add config options for MVC async interceptors · e14ba9de
      Rossen Stoyanchev 提交于
      The MVC namespace and the MVC Java config now allow configuring
      CallableProcessingInterceptor and DeferredResultProcessingInterceptor
      instances.
      
      Issue: SPR-9914
      e14ba9de
    • R
      Polish (minor) RequestMappingHandlerAdapter · e4a13cd4
      Rossen Stoyanchev 提交于
      Revise order of fields reflecting configurable vs internal fields and
      also grouping them accordingly.
      e4a13cd4
    • R
      Polish (major) MVC async processing interceptors · f036ed63
      Rossen Stoyanchev 提交于
      New afterTimeout and afterCompletion callbacks
      
      afterTimeout can provide a concurrent result to be used instead of the
      one that could not be set or returned on time
      
      Interceptor exceptions cause async processing to resume treating the
      exception as the concurrent result
      
      Adapter classes for convenient implementation of the interfaces
      
      Issue: SPR-9914
      f036ed63
    • C
      Allow PropertyResolvers to ignore unresolvable ${placeholders} · 06e34f05
      Chris Beams 提交于
      Prior to this commit, the PropertyResolver API (and therefore the
      Environment API) allowed callers a choice between
       #resolvePlaceholders and #resolveRequiredPlaceholders for low-level
      ${placeholder} resolution. However, when calling the higher level
       #getProperty variants, users had no control over whether property
      values returned with unresolvable ${placeholders} would result in an
      exception or simply be passed through.
      
      This commit introduces a #setIgnoreUnresolvableNestedPlaceholders
      property via ConfigurablePropertyResolver, defaulting to false, the
      value of which is respected by AbstractPropertyResolver#getProperty
      method implementations. See the new test in
      PropertySourcesPropertyResolverTests for usage examples.
      
      Issue: SPR-9569, SPR-9473
      06e34f05
    • P
      Polish whitespace for conversion service packages · 01272fb0
      Phillip Webb 提交于
      01272fb0
  3. 26 10月, 2012 5 次提交
    • C
      Rename ref doc PDF spring-{=>framework-}reference · 61186b0b
      Chris Beams 提交于
       - Upgrade to 0.1.6 snapshot of docbook plugin
      
       - Fully qualify PDF artifact name as 'spring-framework-reference.pdf'
         instead of former 'spring-reference.pdf'
      
      Issue: SPR-9598
      61186b0b
    • C
      Filter @Configuration classes out of LTW test · 0bd4dab4
      Chris Beams 提交于
      Moving @EnableMBeanExport and its MBeanExportConfiguration
      @Configuration class into context.annotation caused a side effect with
      ComponentScanningWithLTWTests, which component scans context.annotation
      in order to test LTW behavior. Picking up MBeanExportConfiguration
      without proper MBean configuration resulted in a NullPointerException
      during test execution.
      
      This commit simply filters out all @Configuration classes from the LTW
      test's component-scanning directive.
      
      Issue: SPR-8943
      0bd4dab4
    • C
      Fix package cycle in @EnableMBeanExport · 5d4d1eac
      Chris Beams 提交于
      Prior to this commit, @EnableMBeanExport was declared in the
      jmx.export.annotation package. This makes logical sense, but
      nevertheless creates a package cycle, because @EnableMBeanExport depends
      on MBeanExportConfiguration which in turn depends on context.annotation
      types like @Configuration, @Bean, and @Role.
      
      context.annotation.config.MBeanExportBeanDefinitionParser, on the other
      hand already has dependencies on types in jmx.support. Together, this
      means that a package cycle was introduced.
      
      The solution to this is simple: move @EnableMBeanExport and friends from
      jmx.export.annotation => context.annotation. This has been the strategy
      for other @Enable annotations and for the same reasons. It also makes a
      kind of logical sense: just like you find <context:mbean-export> and
      <context:load-time-weaver> under the context: XML namespace, so too do
      you find their @Enable* counterparts under the context.annotation
      namespace.
      
      Issue: SPR-8943
      5d4d1eac
    • C
      Fix split package introduced by @EnableSpringConfigured · 54db7387
      Chris Beams 提交于
      Commit 5327a7a3 moved
      @EnableSpringConfigured from beans.factory.aspectj =>
      context.annotation within the spring-aspects module. This resolved a
      package cycle but had the side-effect of causing a "split package" [1]
      problem between spring-context and spring-aspects in OSGi-based
      classloader environments because the context.annotation package now
      exists in both modules.
      
      The simplest and best solution from an OSGi perspective is to relocate
      @EnableSpringConfigured and its supporting SpringConfiguredConfiguration
      class into a new package. This commit moves both these types into
      context.annotation.aspectj, following convention with other such
      "aspectj"-qualified packages in the spring-aspects module.
      
      As with the previous move, it is presumed this change will be low-impact
      as the "spring-configured" approach to domain object injection is a
      niche feature to begin with, and @EnableSpringConfigured has existed in
      its current location only since 3.1.2 and this change is being made in
      time for 3.1.3.
      
      [1]: http://wiki.osgi.org/wiki/Split_Packages
      
      Issue: SPR-9811, SPR-9441
      54db7387
    • R
      Provide method to set async TimeoutHandler · cb867121
      Rossen Stoyanchev 提交于
      Issue: SPR-9914
      cb867121
  4. 25 10月, 2012 9 次提交
  5. 24 10月, 2012 5 次提交
    • C
      Update SpEL test to reflect native float support · 59fb67e3
      Chris Beams 提交于
      Issue: SPR-9486
      59fb67e3
    • C
      Merge pull request #114 from satyapalreddy/master · 37babc5c
      Chris Beams 提交于
      # By Satyapal Reddy
      * SPR-9486:
        Add SpEL support for float literals
      37babc5c
    • S
      Add SpEL support for float literals · be8f23d7
      Satyapal Reddy 提交于
      This change ensures that SpEL expressions involving floats are
      supported natively as opposed to the previous behavior which required
      conversion to double, leading to potential downstream conversion
      ambiguities.
      
      Issue: SPR-9486
      be8f23d7
    • C
      Merge pull request #172 from aclement/SPR-9751 · 2ab2c2e9
      Chris Beams 提交于
      * SPR-9751:
        Add SpEL support for increment/decrement operators
      2ab2c2e9
    • A
      Add SpEL support for increment/decrement operators · f6432588
      Andy Clement 提交于
      With this commit the Spring Expression Language now supports
      increment (++) and decrement (--) operators. These can be
      used as either prefix or postfix operators. For example:
      'somearray[index++]' and 'somearray[--index]' are valid.
      
      In order to support this there are serious changes to the
      evaluation process for expressions. The concept of a
      value reference for an expression component has been introduced.
      Value references can be passed around and at any time the actual
      value can be retrieved (via a get) or set (where applicable). This
      was needed to avoid double evaluation of expression components.
      For example, in evaluating the expression 'somearray[index++]--'
      without a value reference SpEL would need to evaluate the
      'somearray[index++]' component twice, once to get the value and
      then again to determine where to put the new value. If that
      component is evaluated twice, index would be double incremented.
      A value reference for 'somearray[index++]' avoids this problem.
      
      Many new tests have been introduced into the EvaluationTests
      to ensure not only that ++ and -- work but also that the
      introduction of value references across the all of SpEL has
      not caused regressions.
      
      Issue: SPR-9751
      f6432588
  6. 23 10月, 2012 7 次提交
    • P
      Polish · 33d37e86
      Phillip Webb 提交于
      33d37e86
    • R
      Improve async support in Spring MVC Test · 3bb515be
      Rossen Stoyanchev 提交于
      When obtaining an async result, tests will now await concurrent
      processing to complete for the exact amount of time equal to the
      actual async timeout value.
      
      Issue: SPR-9875
      3bb515be
    • R
      Fix failing test · 8270d82b
      Rossen Stoyanchev 提交于
      Issue: SPR-7905
      8270d82b
    • R
      Update AbstractView with method to set content type · c7e7e80a
      Rossen Stoyanchev 提交于
      Before this change View implementations set the response content type
      to the fixed value they were configured with.
      
      This change makes it possible to configure a View implementation with
      a more general media type, e.g. "application/*+xml", and then set the
      response type to the more specific requested media type, e.g.
      "application/vnd.example-v1+xml".
      
      Issue: SPR-9807.
      c7e7e80a
    • R
      Merge pull request #130 from tmeighen/SPR-7905 · 4f114a65
      Rossen Stoyanchev 提交于
      * tmeighen-SPR-7905:
        Support wildcard style media types in JSON converters
      4f114a65
    • T
      Support wildcard style media types in JSON converters · e16c4035
      Tim Meighen 提交于
      Add "application/*+json" to supported media types for both Jackson
      message converters.
      
      Issue: SPR-7905
      e16c4035
    • R
      Update HttpHeaders.getAccept method · 2e1a6889
      Rossen Stoyanchev 提交于
      Some servlet containers (iPlanet) parse the Accept header and return
      multiple values from request.getHeader("Accept"). The HttpHeaders
      getAccept method has been updated to accommodate that hopefully
      without causing any other issues.
      
      The extra functionality is in effect only if we find only one
      MediaType and there is more than one value for the 'Accept' header.
      
      Issue: SPR-9655
      2e1a6889