1. 01 3月, 2013 7 次提交
  2. 28 2月, 2013 9 次提交
  3. 27 2月, 2013 7 次提交
  4. 26 2月, 2013 17 次提交
    • C
      Merge branch 'SPR-8089' into 3.2.x · 4f99e4cf
      Chris Beams 提交于
      4f99e4cf
    • C
      Segregate tests that depend on the jmxmp: protocol · 9a48c10d
      Chris Beams 提交于
      This commit introduces TestGroup#JMXMP and adds assumptions to related
      tests accordingly. These tests require the jmxoptional_remote jar on the
      classpath, and are run nightly in the SPR-PERF build.
      
      Issue: SPR-8089
      9a48c10d
    • C
      Update AbstractMBeanServerTests hierarchy to JUnit 4 · 10648942
      Chris Beams 提交于
      This commit lays the groundwork for introducing TestGroup#JMXMP and
      related assumptions in select JMX-related tests in a subsequent commit;
      JUnit assumptions require JUnit 4+ to function properly, so the entire
      AbstractMBeanServerTests hierarchy must be moved over to JUnit 4+ style.
      
      Issue: SPR-8089
      10648942
    • C
      Improve diagnostics for invalid testGroup values · 55caf7bd
      Chris Beams 提交于
      55caf7bd
    • C
      Revert "Revert "Re-enable ignored JMX tests"" · cbe03093
      Chris Beams 提交于
      This reverts commit cc814519.
      
      Issue: SPR-8089
      Conflicts:
      	spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java
      	spring-context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java
      cbe03093
    • C
      Merge branch 'SPR-10074' into 3.2.x · 1bdd081a
      Chris Beams 提交于
      1bdd081a
    • C
      Update @Ignore'd JPA+AspectJ tests · 9c2b5b24
      Chris Beams 提交于
      Issue: SPR-10074, SPR-10333
      9c2b5b24
    • C
      Re-enable JaxWsSupportTests · 0e8c950f
      Chris Beams 提交于
      These tests still fail under Eclipse for unknown reasons, but do work
      under Gradle, so are thus re-enabled by removing the @Ignore.
      
      Issue: SPR-10074
      0e8c950f
    • C
      Re-enable ignored SecurityManager-related test · 58ab8b69
      Chris Beams 提交于
      Prior to this change, CallbacksSecurityTests#testContainerPrivileges was
      @Ignored because it caused the build to fail under Gradle. After some
      analysis, the root cause was determined to be the fact that (a) a
      restrictive SecurityManager is active during the running of this test,
      and (b), Gradle intercepts System.out and routes it through its internal
      LogBack-based logging system. LogBack requires a call to
      Class#getClassLoader when handling logging statements, and the
      SecurityManager disallows this call, thus raising the error that fails
      the build.
      
      This commit solves the problem by eliminating the System.out.println
      call in question and removing the @Ignore annotation from the test. The
      console output was diagnostic in nature anyway, and not required for the
      successful execution of the test's assertions.
      
      Issue: SPR-10074
      58ab8b69
    • C
      Update Eclipse import organization rules · 3a192a07
      Chris Beams 提交于
      The following changes have been made to the JDT UI prefs to conform to
      existing conventions throughout the codebase:
      
       - always favor .* syntax for static imports
       - always list static imports last
      
      Re-run `gradle eclipse` and refresh projects within Eclipse to make
      this change take effect.
      3a192a07
    • C
      Clean up console output for spring-beans tests · 3100d89d
      Chris Beams 提交于
      3100d89d
    • P
      Replace references to SimpleJdbcTemplate in docs · da034eb0
      Phillip Webb 提交于
      Rework JDBC section of the manual to remove references to the now
      deprecated SimpleJdbcTemplate class.
      
      Issue: SPR-10317
      da034eb0
    • P
      Remove unnecessary null check in SysEnvPropSource · 009d2a5e
      Phillip Webb 提交于
      Remove unnecessary null check and dead code from
      SystemEnvironmentPropertySource.
      
      Issue: SPR-10318
      009d2a5e
    • P
      MergePlugin uses project source not jar source · 29f4374b
      Phillip Webb 提交于
      Update gradle MergePlugin to use the 'project.sourceSets.main.output'
      for jar content rather than 'project.jar.source'. This prevents
      superfluous MANIFEST.MF files from appearing in the merged jar.
      
      Issue: SPR-10324
      29f4374b
    • P
      Protect against missing SpEL selection expression · 82bd06f2
      Phillip Webb 提交于
      Update InternalSpelExpressionParser to ensure that SPeL selections
      ('$[...]', '^[...]', '?[...]') always include a nested expression.
      
      Issue: SPR-10328
      82bd06f2
    • P
      StringToEnumConverterFactory class from enum value · 9a6c6b9e
      Phillip Webb 提交于
      Update StringToEnumConverterFactory to search superclasses until
      Class.isEnum() returns true. This allows conversion when the
      enum class is obtained from the enum value:
      
          public static enum SubFoo {
              BAR { String s() { return "x"; } };
              abstract String s();
          }
      
          conversionService.convert("BAR", SubFoo.BAR.getClass())
      
      This fix is particularly important when converting collections of
      enums.
      
      Issue: SPR-10329
      9a6c6b9e
    • P
      Deprecate HttpStatus.MOVED_TEMPORARILY · e2e4cbe6
      Phillip Webb 提交于
      Deprecate HttpStatus.MOVED_TEMPORARILY in favor of HttpStatus.FOUND
      since HttpStatus.valueOf(302) will always return FOUND.
      
      The name of the 302 status code was changed between HTTP 1.0 and
      HTTP 1.1 but the underlying meaning remains the same.
      
      Issue: SPR-10300
      e2e4cbe6