1. 29 7月, 2014 10 次提交
  2. 28 7月, 2014 4 次提交
    • S
      Groovy loader should delegate to XML loader in the TCF · f862a009
      Sam Brannen 提交于
      If a resource location in the MergedContextConfiguration has a ".xml"
      extension, the GenericGroovyXmlContextLoader now delegates to a
      dedicated XmlBeanDefinitionReader for loading bean definitions from that
      resource, thus preserving XML validation for all XML resource locations.
      For all other extensions (presumably only ".groovy"), the
      GenericGroovyXmlContextLoader delegates to a GroovyBeanDefinitionReader.
      
      Issue: SPR-11233
      f862a009
    • J
      Polishing · 9fa4dad1
      Juergen Hoeller 提交于
      9fa4dad1
    • J
      JmsListener/ScheduledAnnotationBeanPostProcessor uses... · 92c657e1
      Juergen Hoeller 提交于
      JmsListener/ScheduledAnnotationBeanPostProcessor uses SmartInitializingSingleton instead of ContextRefreshedEvent
      
      Also reducing the container dependencies to BeanFactory instead of ApplicationContext, wherever possible.
      
      Issue: SPR-12039
      92c657e1
    • S
      Jms request/reply operations · b6389a6c
      Stephane Nicoll 提交于
      This commit updates JmsMessagingTemplate to support the
      MessageRequestReplyOperation interface that provides synchronous
      request/reply operations.
      
      As JmsMessagingTemplate delegates everything under the scenes to
      JmsTemplate, the latter has been updated as well to offer such lower
      level operation.
      
      Issue: SPR-12037
      b6389a6c
  3. 26 7月, 2014 1 次提交
    • R
      Add WebLogicRequestUpgradeStrategy · c89325b9
      Rossen Stoyanchev 提交于
      This change creates an AbstractTyrusRequestUpgradeStrategy shared
      between the WebLogic and GlassFish sub-classes.
      
      The version of Tyrus is lowered to 1.3.5 to match the version used
      in WebLogic (12.1.3) and that in turn requires a little extra effort
      in the base AbstractTyrusRequestUpgradeStrategy to make up for
      changes that have taken place from Tyrus 1.3.5 to 1.7.
      
      Issue: SPR-11293
      c89325b9
  4. 25 7月, 2014 5 次提交
  5. 24 7月, 2014 15 次提交
    • S
      polishing · 0a46f385
      Stephane Nicoll 提交于
      0a46f385
    • S
      Merge from sbrannen/SPR-11233 · 105a6023
      Sam Brannen 提交于
      * SPR-11233:
        Support Groovy scripts in the TCF
      105a6023
    • S
      Support Groovy scripts in the TCF · 35c372f2
      Sam Brannen 提交于
      Spring Framework 4.0 introduced first-class support for a Groovy-based
      DSL for defining the beans for an ApplicationContext. However, prior to
      this commit, the Spring TestContext Framework (TCF) did not provide any
      out-of-the-box support for using Groovy scripts as path-based resource
      locations when loading an application context for tests.
      
      This commit addresses this issue by introducing first-class support for
      using Groovy scripts to load the ApplicationContext for integration
      tests managed by the TCF. Specifically, the following changes have been
      made in the TCF to support Groovy scripts.
      
       - Introduced getResourceSuffixes() in AbstractContextLoader in order
         to support multiple resource suffixes in the default detection
         process. This feature is used by the new Groovy/Xml context loaders.
      
       - Introduced GenericGroovyXmlContextLoader and
         GenericGroovyXmlWebContextLoader which support both Groovy scripts
         and XML config files for loading bean definitions. Furthermore,
         these loaders support "-context.xml" and "Context.groovy" as
         resource suffixes when detecting defaults. Note that a default XML
         config file will be detected before a default Groovy script.
      
       - DelegatingSmartContextLoader and WebDelegatingSmartContextLoader now
         use reflection to choose between using GenericGroovyXmlContextLoader
         and GenericGroovyXmlWebContextLoader vs. GenericXmlContextLoader and
         GenericXmlWebContextLoader as their XML loaders, depending on
         whether Groovy is present in the classpath.
      
       - Groovy scripts can be configured via the 'locations' or 'value'
         attributes of @ContextConfiguration and can be mixed seamlessly with
         XML config files.
      
      Issue: SPR-11233
      35c372f2
    • J
      Typo fixes and cleanup of outdated Java 5 references · d4fe732f
      Juergen Hoeller 提交于
      Issue: SPR-12020
      d4fe732f
    • R
      Upgrade to Tyrus 1.7 · 88d8dff3
      Rossen Stoyanchev 提交于
      This change provides WebSocket support for the upcoming Glassfish 4.0.1
      release while at the same dropping support for Glassfish 4.0 due to
      incompatible changes.
      
      Issue: SPR-11094
      88d8dff3
    • R
      Fix minor issue in StandardToWebSocketExtensionAdapter · afb56681
      Rossen Stoyanchev 提交于
      This change ensures proper initialization of a WebSocketExtension
      from a JSR-356 Extension.
      
      This is in preparation for SPR-11094
      afb56681
    • R
      Filter WebSocket extensions · e74ac067
      Rossen Stoyanchev 提交于
      Before this change the DefaultHandshakeHandler by default passed the
      list of requested WebSocket extensions as-is relying on the WebSocket
      engine to remove those not supported.
      
      This change ensures that WebSocket extensions not supported by the
      runtime are proactively removed instead.
      
      This change is preparation for SPR-11094.
      e74ac067
    • J
      78484129
    • S
      Clean up Spring MVC Test Framework code · b75eb609
      Sam Brannen 提交于
       - Formatting
       - Suppress warnings
       - Remove unused imports
      b75eb609
    • J
      Self reference detection defensively handles null bean names · fe05e7e5
      Juergen Hoeller 提交于
      Issue: SPR-12018
      fe05e7e5
    • J
    • J
      496492b2
    • S
      Revert ea16ce0a · df3b1f25
      Stephane Nicoll 提交于
      The latest build preview of jdk 1.8.0_20 does not exhibit the problem
      anymore.
      
      Issue: SPR-11973
      df3b1f25
    • S
      Fix compiler warning · 8d8d47fb
      Stephane Nicoll 提交于
      8d8d47fb
    • S
      Fix potential NPE · e849bc3e
      Stephane Nicoll 提交于
      This commit fixes a potential NPE when determining the priority of a
      bean instance in case multiple candidates exist and no bean was marked
      as @Primary
      
      Issue: SPR-12024
      e849bc3e
  6. 23 7月, 2014 5 次提交