1. 08 12月, 2012 2 次提交
    • R
      Exclude jcl-over-slf4j from tiles-core dependency · 6e7df513
      Rossen Stoyanchev 提交于
      tiles-core-3 brings in a dependency on jcl-overl-slf4 which causes
      an slf4j delegation loop as explained at [1] when tests run inside
      Eclipse. Other modules that depend on tiles-core like
      (tiles-servlet, tiles-jsp) have also had the exclusion added since
      they seem to bring it in as well.
      
      [1] http://www.slf4j.org/codes.html#jclDelegationLoop
      6e7df513
    • R
      Fix issue with creating ServletRequestAttributes · 3643d92c
      Rossen Stoyanchev 提交于
      Prevously the FrameworkServlet created a new ServletRequestAttributes
      instance for every request, unless the RequestContextHolder already
      contained an instance whose type is not ServletRequestAttributes.
      The main intent was that if RequestContextHolder contains a
      PortletRequestAttributes, it should be left in place.
      
      This change does an "instanceof" check against the request in
      RequestContextHolder instead of an "equals" check on the type.
      It still leaves PortletRequestAttributes in place but also allows
      the previous request to be any sub-class of ServletRequestAttributes.
      
      Issue: SPR-10025
      3643d92c
  2. 07 12月, 2012 4 次提交
    • S
      Clean up warnings in spring-test · 69ace016
      Sam Brannen 提交于
       - Deleted unused imports.
      
       - Switched from junit.framework.Assert to org.junit.Assert, since the
         former is deprecated as of JUnit 4.11.
      
       - Suppressed warnings for continued deprecated usage of
         junit.framework.Assert.
      69ace016
    • S
      Fix typo · 2233949a
      Sam Brannen 提交于
      2233949a
    • R
      Fix issue with suffix pattern match · 9cc4bd89
      Rossen Stoyanchev 提交于
      Spring Framework 3.2 M2 added the ability to map requests using only
      file extensions registered through the configured through a
      ContentNeotiationManager, as opposed to allowing any file extension
      (i.e. ".*"). The MVC namespace the MVC Java config automatically
      register extensions such as ".json" and ".xml" depending on libraries
      found on the classpath. That in turn causes issues in cases where
      additional extensions are in use but not registered (e.g. ".html").
      
      This change ensures that matching with registered file extensions only
      works only if explicitly enabled through a property on
      RequestMappingHandlerMapping.
      
      Issue: SPR-10061, SPR-8474
      9cc4bd89
    • P
      Replace SLF4J with ACL TilesConfigurer for Tiles 3 · fb05c7b3
      Phillip Webb 提交于
      Replace the use of SLF4J LoggerFactory and Logger classes with Apache
      commons-logging LogFactory and Log.
      
      Issue: SPR-10077
      fb05c7b3
  3. 06 12月, 2012 5 次提交
  4. 05 12月, 2012 10 次提交
    • S
      Support comments in statements in JdbcTestUtils · d0f687f0
      Sam Brannen 提交于
      Prior to this commit, executing an SQL script with JdbcTestUtils would
      fail if a statement in the script contained a line comment within the
      statement.
      
      This commit ensures that standard SQL comments (i.e., any text beginning
      with two hyphens and extending to the end of the line) are properly
      omitted from the statement before executing it.
      
      In addition, multiple adjacent whitespace characters within a statement
      but outside a literal are now collapsed into a single space.
      
      Issue: SPR-9982
      d0f687f0
    • R
      Update @ModelAttribute javadoc · d1a6ceec
      Rossen Stoyanchev 提交于
      The @ModelAttribute javadoc now explicitly mentions that model content
      is not available after an Exception is raised. This is a very common
      question given that @ExceptionHandler methods are co-located with
      @ModelAttribute and @RequestMapping methods.
      
      Issue: SPR-10071
      d1a6ceec
    • S
      Upgrade to JUnit 4.11 · 2b4ecfad
      Sam Brannen 提交于
      This commit upgrades the compile dependency on JUnit in the spring-test
      module as well as the global test dependency on JUnit for the entire
      test suite to 4.11 GA.
      
      In addition, the spring-test module now depends on junit:junit instead
      of junit:junit-dep since, as of JUnit 4.11, the "junit" Maven artifact
      no longer inlines hamcrest-core.
      
      Issue: SPR-10044
      2b4ecfad
    • S
      Update TODOs with new JIRA issue · 31dfffde
      Sam Brannen 提交于
      Issue: SPR-8116, SPR-10074
      31dfffde
    • S
      Re-enable and document @Ignore'd tests · 025d111e
      Sam Brannen 提交于
      Documented why static nested test cases in the spring-test module are
      ignored, explaining that such "TestCase classes are run manually by the
      enclosing test class". Prior to the migration to Gradle (i.e., with
      Spring Build), these tests would not have been picked up by the test
      suite since they end with a "TestCase" suffix instead of "Test" or
      "Tests".
      
      Re-enabled HibernateMultiEntityManagerFactoryIntegrationTests.
      
      For the remaining tests that were disabled as a result of the migration
      to Gradle, comments have been added to the @Ignore declarations.
      
      Issue: SPR-8116, SPR-9398
      025d111e
    • P
      Merge pull request #196 from KingBuzzer/spring-aspects-dependencies · d12fbcc7
      Phillip Webb 提交于
      * spring-aspects-dependencies:
        Replace dependency to aspectjrt with aspectjweaver
      d12fbcc7
    • F
      Replace dependency to aspectjrt with aspectjweaver · a8589bf0
      Fredrik Sundberg 提交于
      Replace the gradle dependency on aspectjrt with aspectjweaver since
      aspectjrt is a subset of aspectjweaver and the full jar is required
      by Spring. SPR-8896 fixed the original code issue, this change
      just relates to the generated maven pom.
      
      Issue: SPR-10072
      a8589bf0
    • P
      Upgrade reference plugin and remove custom xsl · 1352222e
      Phillip Webb 提交于
      Upgrade to docbook-reference-plugin v0.2.2 and remove custom xsl
      styles in favor of plugin defaults. Modify some docbook source
      files to work with newer style.
      1352222e
    • S
      Fix classpaths regarding slf4j versions · 19d7cedc
      Sam Brannen 提交于
       - Defined global slf4jVersion as '1.6.1' in the Gradle build.
      
       - Replaced dependencies on slf4j-log4j12 with slf4j-jcl where possible;
         however, spring-test-mvc still depends on jcl-over-slf4j and
         slf4j-log4j12 (see SPR-10070).
      
       - Reenabled HibernateSessionFlushingTests.
      
       - Verified that the following tests pass in the Gradle build and within
         Eclipse:
         - HibernateSessionFlushingTests
         - HibernateTransactionManagerTests (Hibernate 3)
         - HibernateTransactionManagerTests (Hibernate 4)
         - RequestResponseBodyMethodProcessorTests
      
      Issue: SPR-9421, SPR-10066
      19d7cedc
    • S
      spring-orm should not build against cglib-repack · 53726612
      Sam Brannen 提交于
      The previous commit by Juergen Hoeller upgraded spring-orm's Hibernate 3
      dependency to 3.3.2.GA, and this commit removes the now unnecessary
      dependency on org.hibernate:hibernate-cglib-repack:2.1_3.
      
      Issue: SPR-10066
      53726612
  5. 04 12月, 2012 15 次提交
  6. 01 12月, 2012 2 次提交
    • R
      polish web.Mock* classpath · 149e6f64
      Rob Winch 提交于
      Previously when running the tests for spring-web, spring-webmvc,
      spring-test-mvc, and spring-orm there were possible collissions in the
      classpath due to the fact that each had its own copy of the web.Mock*
      classes in it. This causes uncertainty for which class the code was
      running against. Furthermore, the maintance of keeping the copies up to
      date was tedious.
      
      Now there are two copies of the web.Mock* classes. The ones that exist
      in spring-test main sources and a copy that supports servlet 3 within
      spring-web test sources. The copy in spring-web test sources has been
      moved to a new package to avoid having the classes exist twice on the
      classpath within Eclipse.
      149e6f64
    • R
      Add beforeConcurrentHandling support · 1e62ad86
      Rob Winch 提交于
      Previously CallableProcessingInterceptor and
      DeferredResultProcessingInterceptor did not have support for capturing
      the state of the original Thread just prior to processing. This made it
      difficult to transfer the state of one Thread (i.e. ThreadLocal) to the
      Thread used to process the Callable.
      
      This commit adds a new method to CallableProcessingInterceptor and
      DeferredResultProcessingInterceptor named beforeConcurrentHandling
      which will be invoked on the original Thread used to submit the Callable
      or DeferredResult. This means the state of the original Thread can be
      captured in beforeConcurrentHandling and transfered to the new Thread
      in preProcess.
      
      Issue: SPR-10052
      1e62ad86
  7. 30 11月, 2012 2 次提交