Permalink
Switch branches/tags
Commits on Feb 15, 2013
  1. Update JavaScriptUtils

    rstoyanchev committed Feb 15, 2013
    Add escaping for <, >, and PS/LS line terminators
    
    Issue: SPR-9983
Commits on Jan 23, 2013
  1. Update changelog for 3.1.4

    cbeams committed Jan 23, 2013
  2. Fixed potential SLF4J version mismatch through referring to fixed Hib…

    jhoeller committed Jan 23, 2013
    …ernate EntityManager 3.4.0.GA-A bundles
Commits on Jan 22, 2013
  1. Raise exception on missing request parameters

    rstoyanchev committed Jan 22, 2013
    Issue: SPR-10193
  2. Support sub-types of ResponseEntity

    rstoyanchev committed Jan 22, 2013
    Issue: SPR-10207
  3. Final preparations for 3.1.4

    jhoeller committed Jan 22, 2013
  4. EntityManagerFactoryUtils finds default EntityManagerFactory in paren…

    jhoeller committed Jan 22, 2013
    …t contexts as well
    
    Also introduces consistent use of getBean(Class) for similar use cases across the framework, accepting a locally unique target bean even if further matching beans would be available in parent contexts (in contrast to BeanFactoryUtils.beanOfType's behavior).
    
    Issue: SPR-10160
  5. MockHttpServletResponse's getHeaderNames declares Collection instead …

    jhoeller committed Jan 21, 2013
    …of Set for Servlet 3.0 compatibility
    
    Issue: SPR-9885
  6. MockHttpServletRequest's getParameter(Values) returns null for null p…

    jhoeller committed Jan 21, 2013
    …arameter name
    
    Issue: SPR-10192
  7. Backport "Remove xsd versions from reference samples"

    cbeams committed Jan 22, 2013
    Issue: SPR-10010
  8. Merge branch 'backport-SPR-9925' into 3.1.x

    cbeams committed Jan 22, 2013
    * backport-SPR-9925:
      Backport "Polish @Imports search code"
      Backport "Ensure @Imports are processed in correct order"
      Backport "Prevent duplicate @Import processing"
      Backport "Polish Javadoc for @Import"
  9. Backport "Polish @Imports search code"

    Phillip Webb committed with cbeams Oct 31, 2012
    Issue: SPR-9925
    Backport-Commit: 4cdf46f
    Conflicts:
    	spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
  10. Backport "Ensure @Imports are processed in correct order"

    Phillip Webb committed with cbeams Oct 31, 2012
    Issue: SPR-9925
    Backport-Commit: 3416e05
    Conflicts:
    	spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
  11. Backport "Prevent duplicate @Import processing"

    Phillip Webb committed with cbeams Oct 31, 2012
    Refactor ConfigurationClassParser to recursively find values from
    all @Import annotations, combining them into a single unique set.
    
    This change prevents ImportBeanDefinitionRegistrars from being
    invoked twice.
    
    Issue: SPR-9925
    Backport-Commit: 6d8b37d
    Conflicts:
    	spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
  12. Backport "Polish Javadoc for @Import"

    Phillip Webb committed with cbeams Oct 31, 2012
    Issue: SPR-9925
    Backport-Commit: e6c4840
    Conflicts:
    	spring-context/src/main/java/org/springframework/context/annotation/Import.java
  13. Backport "Support XML properties in ResourcePropertySource"

    cbeams committed Jan 22, 2013
    JDK 5 introduced an XML-based properties file syntax. This commit
    ensures that when such files are supplied as the underlying resource
    for a ResourcePropertySource instance, they are routed appropriately
    to Properties#loadFromXML as opposed to Properties#load.
    
    Issue: SPR-9896
    Backport-Commit: 3a626f9
Commits on Jan 21, 2013
  1. Fix NPE in FormHttpMessageConverter

    rstoyanchev committed Jan 21, 2013
    Issue: SPR-10187
  2. Backport "Use ExtendedBeanInfo on an as-needed basis only"

    cbeams committed Dec 31, 2012
    Prior to this change, CachedIntrospectionResults delegated to
    ExtendedBeanInfo by default in order to inspect JavaBean
    PropertyDescriptor information for bean classes.
    
    Originally introduced with SPR-8079, ExtendedBeanInfo was designed to
    go beyond the capabilities of the default JavaBeans Introspector in
    order to support non-void returning setter methods, principally to
    support use of builder-style APIs within Spring XML. This is a complex
    affair, and the non-trivial logic in ExtendedBeanInfo has led to various
    bugs including regressions for bean classes that do not declare
    non-void returning setters.
    
    Many of these issues were fixed when overhauling non-void JavaBean write
    method support in SPR-10029, however it appears that some extremely
    subtle issues may still remain. ExtendedBeanInfo was taken out of use
    completely in the 3.2.x line with SPR-9677 and the new BeanInfoFactory
    mechanism. This support was not backported to 3.1.x, however, in the
    interest of stability.
    
    This commit, then, inlines the conditional logic introduced by
    BeanInfoFactory directly into CachedIntrospectionResults. The net effect
    is that ExtendedBeanInfo is out of the code path entirely except for
    bean classes that actually contain 'candidate' methods, i.e. non-void
    and/or static write methods.
    
    This commit also includes the changes made in SPR-10115.
    
    Issue: SPR-9723, SPR-10029, SPR-9677, SPR-8079
  3. Fix exception message about producible media types

    rstoyanchev committed Jan 21, 2013
    Issue: SPR-10175
  4. Update HttpHeaders.getAccept method

    rstoyanchev committed Oct 22, 2012
    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
  5. Fix broken Castor URLs in ref docs and mapping XML

    cbeams committed Jan 21, 2013
    Issue: SPR-10189
    Backport-Commit: d40c8cf
    
    Conflicts:
    	spring-framework-reference/src/oxm.xml
  6. Fix typo in reference documentation

    cbeams committed Jan 21, 2013
    Issue: SPR-10171
    Backport-Commit: 24cc333
    
    Conflicts:
    	spring-framework-reference/src/overview.xml
Commits on Jan 18, 2013
  1. AbstractDriverBasedDataSource does not rely on Properties chaining an…

    jhoeller committed Jan 18, 2013
    …ymore
    
    Issue: SPR-9461
  2. Further preparations for 3.1.4

    jhoeller committed Jan 18, 2013
  3. Added "exposeAccessContext" flag JndiRmiClientInterceptor/ProxyFactor…

    jhoeller committed Jan 18, 2013
    …yBean (for WebLogic)
    
    Issue: SPR-9428
  4. LocalVariableTableParameterNameDiscoverer works for bridge methods as…

    jhoeller committed Jan 18, 2013
    … well
    
    Issue: SPR-9429
  5. SpringBeanAutowiringInterceptor eagerly releases BeanFactory if post-…

    jhoeller committed Jan 18, 2013
    …construction fails
    
    Issue: SPR-10013
  6. AbstractDriverBasedDataSource does not rely on Properties chaining an…

    jhoeller committed Jan 18, 2013
    …ymore
    
     Issue: SPR-9461
  7. Fixed reference to "fallbackToNoOpCache" flag

    jhoeller committed Jan 18, 2013
    Issue: SPR-9064