1. 11 12月, 2012 5 次提交
    • P
      Update test tiles.xml files to use v3 DTD · c8a35629
      Phillip Webb 提交于
      Update tiles.xml files used with tests to reference tiles-config_3_0
      instead of tiles-config_2_1 DTD.
      
      Prior to this commit tiles based tests would fail when building
      offline or behind a proxy server.
      c8a35629
    • P
      Merge pull request #199 from rwinch/SPR-10059 · 25a7136a
      Phillip Webb 提交于
      * SPR-10059:
        Make DeferredResult extensible
      25a7136a
    • R
      Make DeferredResult extensible · be7b07f8
      Rob Winch 提交于
      Previously it was cumbersome to associate data or behavior to a
      DeferredResult because it was marked as final and had no extension
      points.
      
      Now DeferredResult is non-final which allows subclasses to associate
      additional data and behavior to it.
      
      Issue: SPR-10059
      be7b07f8
    • R
      Merge plugin copies exclude rules · 455701d2
      Rob Winch 提交于
      Previously the 'merge from' project's configurations exclude rules were
      not used in the dynamically created 'merge into' project configurations.
      This meant that the pom generation for 'merge into' project did not
      exclude the dependencies from the 'merge from' project's configuration
      excludes.
      
      Now the exclude rules are copied into the dynamically created
      'merge into' project's configurations.
      455701d2
    • P
      Add buildSrc to generated eclipse project · 809d62e3
      Phillip Webb 提交于
      Post process the generated 'spring' eclipse project to include the
      buildSrc/src/main/groovy folder.
      809d62e3
  2. 10 12月, 2012 12 次提交
    • P
      Move Merge plugin into a build package structure · 42bbcc32
      Phillip Webb 提交于
      42bbcc32
    • P
      Renamed buildsrc to buildSrc · b206e689
      Phillip Webb 提交于
      Rename buildsrc folder to buildSrc to follow Gradle conventions.
      b206e689
    • P
      Upgrade reference plugin to version 0.2.3 · 9e790829
      Phillip Webb 提交于
      Upgrade to the latest reference plugin, providing slightly refined
      titlepage and admon graphics.
      9e790829
    • P
      Refactor merge-artifacts script to a plugin · 87f7ecf9
      Phillip Webb 提交于
      Refactor the existing merge-artifacts script to a full Gradle plugin.
      The new plugin uses a 'merge' extension in favor of Gradle 'ext'
      configuration and can be applied to all projects in a multi-module
      build.
      
      Any project that defines a 'merge.into' project will now implicitly
      receive a dependency to that project. Furthermore other projects
      with a dependency on 'merge.into' will receive a direct project
      link within the IDE. For example: 'spring-webmvc-tiles3'
      is merged into 'spring-webmvc' and 'spring-test-mvc' depends
      on 'spring-webmvc'. Within the IDE 'spring-test-mvc' will show
      dependencies to both 'spring-webmvc' and 'spring-webmvc-tiles'.
      
      Issue: SPR-10042
      87f7ecf9
    • P
      Remove superfluous exclusions from Gradle build · 4551cfcd
      Phillip Webb 提交于
      Remove several dependency exclusions from the Gradle build that are
      no longer required and were not present in Spring 3.1.
      4551cfcd
    • P
      Convert Gradle build to use new propdeps-plugin · 0751b2cb
      Phillip Webb 提交于
      Replace existing 'optional' and 'provided' Spring specific build
      extensions with a new Gradle propdeps-plugin. Optional and Provided
      dependencies are now defined use dependency configurations.
      
      The new plugin does not currently support the notion of optional
      runtime dependencies. All optional dependencies are implicitly
      part of the 'compile' scope. This is an intentional design decision
      that aims to keep both the plugin and the build simple. Since optional
      dependencies are non-transitive this restriction should not cause
      any real problems for existing users. The only existing dependency
      affected is 'commons-io' in the 'spring-beans' project, however, this
      was an optional compile scope dependency in the previous Spring 3.1
      release.
      
      Both provided and optional dependencies are no longer exported from
      generated eclipse .classpath files. This fixes several tests that
      would previously fail when running within eclipse. The servlet-api
      specific elements of ide.gradle are also no longer required.
      
      Issue: SPR-9656, SPR-10070
      0751b2cb
    • P
      Depend on javax.servlet for version 3.0 API · 7cc406ff
      Phillip Webb 提交于
      Replace tomcat servlet-api 3.0 dependencies with the javax.servlet
      versions that are now available in the Maven central repository.
      7cc406ff
    • P
      Upgrade log4j dependency to version 1.2.17 · 6103a7f1
      Phillip Webb 提交于
      Upgrade to the latest stable release of log4j. The previous 'jms'
      and 'jmx' exclusions are not longer required since these have now
      been marked as optional dependencies in the upstream POM.
      6103a7f1
    • P
      Removed unused gradle import · dc708c5b
      Phillip Webb 提交于
      Remove the unused ProjectDependency import from the Gradle build file.
      dc708c5b
    • P
      Use consistent Gradle dependency style · 22741b1f
      Phillip Webb 提交于
      Update all Gradle files to use a consistent style when specifying
      dependencies. All dependencies are now specified using parentheses,
      for example:
      
         scope("group:artifat:version")
      or scope(project(":projectname"))
      22741b1f
    • P
      Polish quote styles in gradle files · 90cfdbb0
      Phillip Webb 提交于
      Replace singe quote-marks with double quote-marks when possible for a
      more consistent style.
      90cfdbb0
    • P
      Polish .gradle file formatting to use tabs · a2685287
      Phillip Webb 提交于
      Replace spaces with tabs for consistency with Java source code
      a2685287
  3. 09 12月, 2012 1 次提交
  4. 08 12月, 2012 5 次提交
    • S
      Move tests to spring-test module · a436a575
      Sam Brannen 提交于
      When Spr9799XmlConfigTests and Spr9799AnnotationConfigTests were
      created, there were issues with the classpath related to slf4j
      dependencies that made it impossible for these classes to reside in the
      spring-test module. Consequently, these tests were added to the
      spring-test-mvc module. However, the issues with slf4j have since been
      resolved in the Gradle build, and this commit therefore moves these test
      classes to the spring-test module where they belong.
      
      Issue: SPR-9799
      a436a575
    • R
      Fix package cycle among http message converters · 85a552da
      Rossen Stoyanchev 提交于
      This change introduces a new AllEncompassingFormHttpMessageConverter
      class that adds JSON and XML converters for individual mime parts of
      a multi-part request. The new converter is used in place of the
      previously used XmlAwareFormHttpMessageConverter.
      
      Issue: SPR-10055
      85a552da
    • R
      Add web-fragment.xml to spring-web · d309bb4b
      Rossen Stoyanchev 提交于
      The servlet spec treats any jar in WEB-INF/lib as a web fragment:
      "A plain old jar file in the WEB-INF/lib directory with no web-
      fragment.xml is also considered a fragment" (section 8.2.1)
      
      This change adds a web-fragment.xml giving the web fragment an
      explicit name, "spring_web", and indicating there is no need
      to scan for Servlet annotations in the spring-web.jar itself
      through metadata-complete=true.
      
      This allows applications that choose to include only specific
      web fragments, through the <absolute-ordering> element in web.xml
      to also include the "spring_web" fragment, in order to enable scanning
      for WebApplicationInitializer types.
      d309bb4b
    • 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
  5. 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
  6. 06 12月, 2012 5 次提交
  7. 05 12月, 2012 8 次提交
    • 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