1. 12 Feb, 2014 4 commits
    • Dave Syer's avatar
      Defensive catch block in LogbackLoggingSystem · be735356
      Dave Syer authored
      Older versions of JBoss AS have a classpath clash with an older
      SLF4J (pre 1.6.5), so to prevent an app from blowing up on
      startup we defensively catch a NoSuchMethodError.
      
      Fixes gh-339
      be735356
    • Phillip Webb's avatar
      Refactor PropertySource support · f0bfecd3
      Phillip Webb authored
      Locate PropertySourcesLoaders using SpringFactoriesLoader and refactor
      the interface to expose file extensions and support 'profiles' within
      documents.
      
      Rework ConfigFileApplicationListener for consistent profile loading.
      Profiles are now loaded in a consistent order for both profile specific
      files, and contained profile documents (i.e. YAML sub-sections).
      
      Also update ConfigFileApplicationListener so that it no longer directly
      processes @ProperySource annotations. Instead the standard Spring
      ConfigurationClassPostProcessor will insert @PropertySource items with
      ConfigFileApplicationListener later re-ordering them.
      
      The SpringApplication can no longer be configured using @ProperySource
      annotations, however, application.properties may still be used.
      
      Fixes gh-322
      f0bfecd3
    • Phillip Webb's avatar
      Consistent property source ordering with names · 06494e06
      Phillip Webb authored
      Update ConfigFileApplicationListener so that custom names and custom
      locations use consistent ordering. i.e. earlier items take precedence
      (same as @ProperySource).
      06494e06
    • Phillip Webb's avatar
      Polish ConfigFileApplicationListenerTests · 52c42059
      Phillip Webb authored
      Add "my.property" to `application.properties` in order to test ordering
      or property sources.
      
      Also use hamcrest for assertions.
      52c42059
  2. 11 Feb, 2014 8 commits
    • Phillip Webb's avatar
      Consistent javadoc "code" block formatting · 9ab886f4
      Phillip Webb authored
      Update javadoc to consistently use the "code" style with <pre> blocks.
      Also include the latest spring-javadoc.css formatting file.
      
      Fixes gh-332
      9ab886f4
    • Phillip Webb's avatar
      Don't register shutdown hook from embedded context · b21f56a2
      Phillip Webb authored
      Change `EmbeddedWebApplicationContext` to no longer automatically call
      `registerShutdownHook()`. Shutdown hooks must now be registered by the
      caller (for users of SpringApplication this will happen automatically).
      
      Fixes gh-314
      b21f56a2
    • Phillip Webb's avatar
      Polish · 5863795e
      Phillip Webb authored
      5863795e
    • Dave Syer's avatar
      Merge pull request #336 from jkubrynski/master · 2f138d84
      Dave Syer authored
      * pull336:
        Now custom SpringApplication class can be used when extending SpringApplicationContextLoader
      2f138d84
    • Jakub Kubrynski's avatar
    • Dave Syer's avatar
      Add placeholder resolution to @PropertySource processing · 76c56c6a
      Dave Syer authored
      Previously the core Spring processing of @PropertySource would
      resolve placeholders in the location attribute, but the pre-loading
      of the property source by Spring Boot didn't do that. Now implemented
      using Environment.resolvePlaceholders() (N.B. at a time when the only
      Environment entries available are system properties and OS env vars).
      
      E.g.
      
      	@Configuration
      	@PropertySource("classpath:/${source.location}.properties")
      	protected static class WithPropertySourcePlaceholders {
                 ...
      	}
      76c56c6a
    • Andy Wilkinson's avatar
      Fix binding of overlapping nested maps · ca7201b4
      Andy Wilkinson authored
      When binding a nested map structure, RelaxedDataBinder pre-populates
      the target object with default empty maps. Previously, when these
      structures overlapped, each step in pre-population process could
      potentially overwrite what had come before it. This led to the output
      of the pre-population process being incomplete which would lead to a
      binding failure.
      
      This commit updates the pre-population process so that it checks to see
      if a property's value has already been set by an earlier step in the
      process. If it has been set, the existing value is now reused rather
      than being overwritten by a new empty map.
      
      Fixes #328
      ca7201b4
    • Dave Syer's avatar
      Add scope=test to hsqldb (fixes #330) · 8de98907
      Dave Syer authored
      8de98907
  3. 10 Feb, 2014 1 commit
    • Andy Wilkinson's avatar
      Filter non-jar artifacts when packaging libs in Gradle plugin · 4f677bec
      Andy Wilkinson authored
      Previously, the Gradle plugin would package all of a project's
      dependencies in the jar's lib directory, irrespective of each
      dependency's type. This led to non-jar artifacts being packaged in
      the lib directory where only jar dependencies are expected. See #334
      for an example failure.
      
      This commit updates the Gradle plugin such that it only packages
      dependencies of type jar, ejb, ejb-client, test-jar, or bundle. This
      brings the Gradle plugin into line with the Maven plugin.
      
      Fixes #334.
      4f677bec
  4. 07 Feb, 2014 3 commits
  5. 06 Feb, 2014 18 commits
  6. 05 Feb, 2014 3 commits
  7. 04 Feb, 2014 3 commits