From 4603d8259ace62ba8b5e5a5f1e70334a9827654b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 24 Oct 2016 11:37:20 +0200 Subject: [PATCH 1/2] Make MockitoTestExecutionListener public Closes gh-7016 --- .../boot/test/mock/mockito/MockitoTestExecutionListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java index 956bfd99aa..0521c27f4b 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java @@ -37,8 +37,9 @@ import org.springframework.util.ReflectionUtils.FieldCallback; * annotations. * * @author Phillip Webb + * @since 1.4.2 */ -class MockitoTestExecutionListener extends AbstractTestExecutionListener { +public class MockitoTestExecutionListener extends AbstractTestExecutionListener { @Override public void prepareTestInstance(TestContext testContext) throws Exception { From 469a4e34445545917c5cdb8eab2aff8c2c2dec2e Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Tue, 20 Sep 2016 07:58:46 +0200 Subject: [PATCH 2/2] Improve systemd service documentation Closes gh-6954 --- spring-boot-docs/src/main/asciidoc/deployment.adoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/deployment.adoc b/spring-boot-docs/src/main/asciidoc/deployment.adoc index 834147ef3f..2c2f060d4e 100644 --- a/spring-boot-docs/src/main/asciidoc/deployment.adoc +++ b/spring-boot-docs/src/main/asciidoc/deployment.adoc @@ -548,9 +548,12 @@ the following example and place it in `/etc/systemd/system` directory: TIP: Remember to change the `Description`, `User` and `ExecStart` fields for your application. +TIP: Note that `ExecStart` field does not declare the script action command, which means +that `run` command is used by default. + Note that unlike when running as an `init.d` service, user that runs the application, PID -file and console log file behave differently under `systemd` and must be configured using -appropriate fields in '`service`' script. Consult the +file and console log file are managed by `systemd` itself and therefore must be configured +using appropriate fields in '`service`' script. Consult the http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit configuration man page] for more details.