1. 21 Mar, 2014 6 commits
    • brockwmills's avatar
      Allow multiple connectors with Tomcat · 8b77a029
      brockwmills authored
      Update TomcatEmbeddedServletContainerFactory to allow for additional
      containers (e.g. SSL or AJP in addition to HTTP).
      
      Fixes gh-528
      8b77a029
    • Dave Syer's avatar
      Add additional grouping of property sources by profile · 48636e3d
      Dave Syer authored
      Before this change the PropertySources loaded from external config
      files were just added to the list for resolution in the order that
      they were loaded. That worked for simple cases, but when there are
      profiles active, and files themselves can activate profiles, it led
      to users not being able to change default settings easily (either
      on command line or in files, mostly in files).
      
      The solution proposed here is to group PropertySources by profile
      and resolve them in order of profile first, and then in order of
      the files being loaded.
      
      There are additional shenanigans because the order of the files
      being loaded also has to be carefully defined. The rule for users
      is that in a list of files to load (e.g. if set via
      spring.config.location), the last one wins (natural if you think of
      it as a merge of multiple maps). In addition, anything specified
      by a user takes precedence over the defaults (which was broken in
      some scenarios before).
      
      Additionally, fixes profile ordering in @ConfigurationProperties(path=...)
      
      Fixes gh-483
      48636e3d
    • Phillip Webb's avatar
      Remove logging from spring-boot-starter-test · 84cc1103
      Phillip Webb authored
      Fixes gh-541
      84cc1103
    • Phillip Webb's avatar
      Rename spring-boot-starter-shell -> remote-shell · 47eb8180
      Phillip Webb authored
      Fixes gh-462
      47eb8180
    • Phillip Webb's avatar
      Spaces -> Tabs · 8c0703ad
      Phillip Webb authored
      8c0703ad
    • Christian Dupuis's avatar
  2. 20 Mar, 2014 9 commits
  3. 19 Mar, 2014 10 commits
  4. 18 Mar, 2014 15 commits