1. 23 Dec, 2013 7 commits
    • Dave Syer's avatar
      Add basic build.xml to actuator sample · f5ad4be2
      Dave Syer authored
          $ ant -lib ivy-2.2.jar
      
      (substitute the location of your actual ivy jar)
      
          $ java -jar target/*.jar
      
      Fixes gh-140
      f5ad4be2
    • Dave Syer's avatar
      8e2a6eec
    • Dave Syer's avatar
      Close connection properly in /health · 063403a0
      Dave Syer authored
      Fixes gh-181
      063403a0
    • Dave Syer's avatar
      Adjust @PropertySource handling so @Conditionals are accounted for · 22762f20
      Dave Syer authored
      User can now do this, for instance:
      
          @Configuration
          @PropertySource("classpath:my.properties")
          public class MainConfiguration {}
      
          @Configuration
          @PropertySource("classpath:foo.properties")
          @Profile("foo")
          public class FooConfiguration {}
      
      and the "foo" properties ar eonly loaded in the "foo" profile.
      22762f20
    • Dave Syer's avatar
      Add PoolConfig to Redis · 6c4ee0b0
      Dave Syer authored
      6c4ee0b0
    • Dave Syer's avatar
      Parse @PropertySource annotations on SpringApplication sources · bd0a499a
      Dave Syer authored
      If any of the sources has a @PropertySource annotation (or many)
      then we can add those properties to the Environment. It's a nice
      convenient way of specifying a custom external properties location
      for an app.
      
      One problem is that Spring will come along and parse the same
      annotations later as part of the @Configuration parsing. The
      user has pretty limited control over how that is done, and it
      will never be done in a "natural" way for a Boot application
      (which would prefer that the default application.properties
      is applied *last*, whereas Spring will apply the @PropertySource
      last).
      
      To get round that problem we add the property sources with
      a different name (key in the PropertySources in Environment),
      prefixing named property sources with "boot.", and adding
      others with a name that is the same as the resource location
      (instead of its description, which is the default for
      Spring).
      
      Another problem is that Spring doesn't know about YAML, so
      the user is currently restricted to using properties files
      with this annotation.
      bd0a499a
    • Dave Syer's avatar
      Make SpringApplication.getSources() do what it says on the can · 808daa54
      Dave Syer authored
      We still need the distinction internally between initial and additional
      sources, but the SpringApplication API (getSources()) itself doen't
      need to reflect that.
      808daa54
  2. 22 Dec, 2013 1 commit
  3. 20 Dec, 2013 2 commits
  4. 19 Dec, 2013 28 commits
  5. 18 Dec, 2013 2 commits