1. 03 3月, 2015 1 次提交
  2. 02 3月, 2015 3 次提交
  3. 01 3月, 2015 6 次提交
    • S
      Simplify Groovy ContextLoaders in the TCF · e24a7ded
      Sam Brannen 提交于
      This commit simplifies the implementations of loadBeanDefinitions() in
      GenericGroovyXmlContextLoader and GenericGroovyXmlWebContextLoader.
      
      Due to the recent bug fix for GroovyBeanDefinitionReader regarding full
      support for XML config files, these Groovy context loaders can now
      simply use a GroovyBeanDefinitionReader instead of a
      GroovyBeanDefinitionReader plus an XmlBeanDefinitionReader.
      
      Issue: SPR-12769
      e24a7ded
    • S
      Fully support XML config in GroovyBeanDefinitionReader · 7edc7c2c
      Sam Brannen 提交于
      Prior to this commit, the GroovyBeanDefinitionReader claimed (via its
      Javadoc) that it fully supported XML configuration files in addition to
      its Groovy DSL; however, this was unfortunately inaccurate since XML
      validation was disabled by default which led to certain features of XML
      configuration not working. For example, it was impossible to define a
      <qualifier> in an XML config file without specifying the 'type'
      attribute (which has a default value defined in the spring-beans XSD).
      
      This commit fixes this issue by ensuring that bean definitions in XML
      resources are loaded with a "standard" XmlBeanDefinitionReader that is
      created with default settings (i.e., with XML validation enabled). With
      regard to backwards compatibility, bean definitions defined using the
      Groovy DSL are still loaded with an XmlBeanDefinitionReader that has
      XML validation disabled by default which is necessary for proper
      parsing of the Groovy DSL.
      
      Issue: SPR-12769
      7edc7c2c
    • S
      Polish Javadoc for GroovyBeanDefinitionReader · 9cd065c1
      Sam Brannen 提交于
      9cd065c1
    • S
      Support XML config fully in web integration tests · 2ba1151b
      Sam Brannen 提交于
      Prior to this commit, it was impossible to use all features of XML
      configuration (e.g., the <qualifier> tag) in web-based integration
      tests (loaded using @WebAppConfiguration, @ContextConfiguration, etc.)
      if the Groovy library was on the classpath. The reason is that the
      GroovyBeanDefinitionReader used internally by
      GenericGroovyXmlWebContextLoader disables XML validation for its
      internal XmlBeanDefinitionReader, and this prevents some XML
      configuration features from working properly. For example, the default
      value for the 'type' attribute (defined in the spring-beans XSD) of the
      <qualifier> tag gets ignored, resulting in an exception when the
      application context is loaded.
      
      This commit addresses this issue by refactoring the implementation of
      loadBeanDefinitions() in GenericGroovyXmlWebContextLoader to use an
      XmlBeanDefinitionReader or GroovyBeanDefinitionReader depending on the
      file extension of the resource location from which bean definitions
      should be loaded. This aligns the functionality of
      GenericGroovyXmlWebContextLoader with the existing functionality of
      GenericGroovyXmlContextLoader.
      
      Issue: SPR-12768
      2ba1151b
    • S
      Delete unused import in AsyncTests · fa5ea382
      Sam Brannen 提交于
      fa5ea382
    • S
      Include charset in EncodedResource.equals() · 93c70b74
      Sam Brannen 提交于
      Prior to this commit, the implementation of equals() in EncodedResource
      was based solely on the resource and encoding. Thus, if a Charset were
      specified instead of an encoding, invocations of equals() would not
      work as expected.
      
      This commit addresses this issue by including the charset in the
      implementation of equals() and introducing corresponding tests in a new
      EncodedResourceTests class. Furthermore, this commit makes
      EncodedResource immutable and updates all Javadoc to reflect support
      for the encoding and charset properties.
      
      Issue: SPR-12767
      93c70b74
  4. 28 2月, 2015 16 次提交
  5. 27 2月, 2015 7 次提交
  6. 26 2月, 2015 7 次提交