summaryrefslogtreecommitdiffstats
path: root/server/sonar-server
diff options
context:
space:
mode:
Diffstat (limited to 'server/sonar-server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java2
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java5
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java3
3 files changed, 3 insertions, 7 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
index a656f9a56d5..a3de4ace39a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
@@ -60,7 +60,7 @@ class EmbeddedTomcat {
webappContext = new TomcatContexts().configure(tomcat, props);
try {
tomcat.start();
- new TomcatStartupLogs(props, Loggers.get(getClass())).log(tomcat);
+ new TomcatStartupLogs(Loggers.get(getClass())).log(tomcat);
} catch (LifecycleException e) {
Throwables.propagate(e);
}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java
index cba0409fc00..321fd727a27 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatStartupLogs.java
@@ -23,15 +23,12 @@ import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.utils.log.Logger;
-import org.sonar.process.Props;
class TomcatStartupLogs {
private final Logger log;
- private final Props props;
- TomcatStartupLogs(Props props, Logger log) {
- this.props = props;
+ TomcatStartupLogs(Logger log) {
this.log = log;
}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java b/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java
index bb856924dda..d4fe8613db1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/app/StartupLogsTest.java
@@ -37,8 +37,7 @@ public class StartupLogsTest {
Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS);
Logger logger = mock(Logger.class);
- Props props = new Props(new Properties());
- TomcatStartupLogs underTest = new TomcatStartupLogs(props, logger);
+ TomcatStartupLogs underTest = new TomcatStartupLogs(logger);
@Test
public void logAjp() {