1. 25 Sep, 2014 4 commits
    • Phillip Webb's avatar
      Merge branch '1.1.x' · 0d0e5eb5
      Phillip Webb authored
      0d0e5eb5
    • Dave Syer's avatar
      Copy server customization to management context · 336b96b8
      Dave Syer authored
      If the actuator endpoints are configured on a different port then there
      are some settings in the main ServerProperties that we would like to
      re-use (e.g. the access log). The easiest way to do that is to just
      configure the management server using the same ServerProperties instance
      and then overwrite the things that are different (and stored in
      ManagementServerProperties).
      
      Fixes gh-1581
      336b96b8
    • Dave Syer's avatar
      Make Thymeleaf @ConditionalOnWebApplication · 304920df
      Dave Syer authored
      If user creates a Thymeleaf app with a parent-child context then the
      child should contain all the web-specific pieces (and they are likely
      to fail fast if they need to be ServletContextAware, or slower if they
      try to locate a WebApplicationContext at runtime). This can't happen
      if the view resolver is being added to the parent.
      
      Freemarker and Velocity already have similar tests because it is assumed
      that they should be usable outside a web app, so this change just does the
      same for Thymeleaf.
      
      Fixes gh-1611
      304920df
    • Stéphane DERACO's avatar
      Fix broken documentation links · 68ff7d45
      Stéphane DERACO authored
      Fix links to `actuator-noweb`, `actuator-log4j` and `hornetq` samples.
      
      Fixes gh-1613
      68ff7d45
  2. 24 Sep, 2014 4 commits
  3. 23 Sep, 2014 6 commits
  4. 22 Sep, 2014 6 commits
  5. 20 Sep, 2014 3 commits
  6. 19 Sep, 2014 2 commits
    • Dave Syer's avatar
      Merge branch '1.1.x' · b06d10dd
      Dave Syer authored
      b06d10dd
    • Dave Syer's avatar
      A few tweaks that might improve performance on startup · d6165d97
      Dave Syer authored
      ... or couldn't hurt anyway.
      
      1. Extends the definition of a web application for @ConditionalOnWebapp
      so that a StandardEnvironment can be used (cutting out JNDI failures
      for Environment properties)
      
      2. Doesn't bother using StandardServletEnvironment in integration tests
      
      3. Make the NON_ENUMERABLE_ENUMERABLES in PropertySourcesPropertyValues
      static so they only get initialized once (not a huge issue at all)
      d6165d97
  7. 18 Sep, 2014 6 commits
  8. 17 Sep, 2014 9 commits