Commit Graph

9233 Commits (f2c7e2273158113d24e1e7ff9d3e8b1d35e5fad2)
 

Author SHA1 Message Date
Andy Wilkinson f2c7e22731 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 6b3eede59f Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6a68c8f7e0 Restore Handler logic that was changed during its merge
This commit restores the logic in Handler that was changed when
d20ac56a was merged, while leaving the structural improvements intact.

In addition to a couple of changes where a typo meant the wrong
variable was being referenced, some logic branches now return false
rather than called super. This realigns our Handler's behaviour with
that of the JDK's.

Some more tests have also been added to try to catch the problems that
were introduced during the merge.

Closes gh-7021
8 years ago
Stephane Nicoll bbea134e1c Merge branch '1.5.x' 8 years ago
Stephane Nicoll 97b68b3f84 Merge pull request #7225 from mouminoux:1.5.x
* pr/7225:
  Polish contribution
  Allow to configure Tomcat's rotatable property
8 years ago
Stephane Nicoll ed7de8eb60 Polish contribution
Also add rotate attribute to Undertow

Closes gh-7225
8 years ago
Matthieu Mouminoux 1d95219c4b Allow to configure Tomcat's rotatable property
See gh-7225
8 years ago
Stephane Nicoll 547a3554dd Merge branch '1.5.x' 8 years ago
Stephane Nicoll b37b3f7c59 Merge pull request #7224 from ajayk:adoc-indentation
* pr/7224:
  Fix indentation for spring.jms.template.* keys
8 years ago
ajk 548190673c Fix indentation for spring.jms.template.* keys
Closes gh-7224
8 years ago
Phillip Webb 57fb3888ac Merge branch '1.5.x' 8 years ago
Phillip Webb 3c5328924c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson d20ac56afd Align our jar URL stream handler with the JDK's
Previously our handler didn't override parseURL or sameFile which
resulted in behaviour that differed from that of the JDK's handler.
Crucially, this would result in our JarURLConnection being passed
a spec that didn't contain a "!/". A knock-on effect of this was
that the connection would point to the root of the jar rather than
the intended entry.

Closes gh-7021
8 years ago
Andy Wilkinson f0798253a3 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5b9eaab6c0 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson ee7141cf63 Allow PropertyLauncher loader.path to be configured using manifest
Closes gh-7178
8 years ago
Madhura Bhave 08229899b1 Merge branch '1.5.x' 8 years ago
Madhura Bhave 9bde1e89cb Move some tests to AbstractEndpointHandlerMapping
See gh-7108
8 years ago
Phillip Webb 2e4edf1804 Merge branch '1.5.x' 8 years ago
Phillip Webb 5fc58b45ff Merge pull request #7086 from nebhale/logger-actuator
* pr/7086:
  Polish `/loggers` actuator endpoint
  Add `/loggers` actuator endpoint
8 years ago
Phillip Webb a448183681 Polish `/loggers` actuator endpoint
See gh-7086
8 years ago
Ben Hale 06cb4fcca5 Add `/loggers` actuator endpoint
Add `LoggersEndpoint` that can enables listing and configuration of log
levels. This actuator builds on top of the `LoggingSystem` abstraction
and implements support for Logback, Log4J2, and JUL.  The LoggingSystem
interface is modified to require each implementation to list the
configuration of all loggers as well as an individual logger by name.

The MVC endpoint exposes these behaviors at `GET /loggers` and
`GET /loggers/{name}` (much like the metrics actuator).

In addition `POST /loggers/{name}` allows users to modify the level for a given
logger. This modification is passed to the logging implementation, which
then decides, as an internal implementation detail, what the final outcome
of the modification is (e.g. changing all unconfigured children). Users
are then expected to request the listing of all loggers to see what has
changed internally to the logging system.

Closes gh-7086
8 years ago
Stephane Nicoll 73b5afa56e Merge branch '1.5.x' 8 years ago
Stephane Nicoll ae4dd0d17e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a638dcd51b Remove unnecessary use of System.out.println 8 years ago
Andy Wilkinson 7be16c7b54 Merge branch '1.5.x' 8 years ago
Andy Wilkinson a56bf44b39 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
8 years ago
Andy Wilkinson 475c5f1ae5 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 92462a06ad Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2b46a4876f Start building against Spring Framework 4.3.4 snapshots
Closes gh-7174
See gh-7213
8 years ago
Andy Wilkinson 3f655d998d Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9abafb839b Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson be597d7ce9 Fix handling of cyrillic characters in AsciiBytes hashCode method
Closes gh-7202
8 years ago
Stephane Nicoll e509278580 Merge branch '1.5.x' 8 years ago
Stephane Nicoll eddb10e4c9 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 713fd51f9c Merge pull request #6954 from vpavic:update-docs
* pr/6954:
  Improve systemd service documentation
8 years ago
Vedran Pavic 469a4e3444 Improve systemd service documentation
Closes gh-6954
8 years ago
Stephane Nicoll 4603d8259a Make MockitoTestExecutionListener public
Closes gh-7016
8 years ago
Stephane Nicoll 1cb389bb0a Merge branch '1.5.x' 8 years ago
Stephane Nicoll beb3074998 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 2ad3a7f8a3 Merge pull request #7043 from kazuki43zoo:standard-travis-ci
* pr/7043:
  Speed up Travis build
8 years ago
Kazuki Shimizu 7c1f9eb1b9 Speed up Travis build
Modify to use standard mode and directory cache for Travis CI build.

Closes gh-7043
8 years ago
Stephane Nicoll 0234191b0a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4855bfb152 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4ec77d4420 Merge pull request #7193 from izeye:patch-22
* pr/7193:
  Polish contribution
  Add a missing return
8 years ago
Stephane Nicoll a03ce0a9d1 Polish contribution
Add missing test

Closes gh-7193
8 years ago
Johnny Lim 0b5fbbedf4 Add a missing return
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.

See gh-7193
8 years ago
Stephane Nicoll 74d3a6616b Upgrade to liquibase 3.5.3
Closes gh-7208
8 years ago
Stephane Nicoll 0541c14684 Merge branch '1.5.x' 8 years ago