Skip to content

Commit 7525544

Browse files
Doha2012pivovarit
authored andcommitted
use standard logback.xml (eugenp#1666)
* upgrade to spring boot 1.5.2 * add full update to REST API * modify ratings controller * upgrade herold * fix integration test * fix integration test * minor fix * fix integration test * fix integration test * minor cleanup * minor cleanup * remove log4j properties * use standard logbook.xml
1 parent cdab6ac commit 7525544

File tree

61 files changed

+698
-593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+698
-593
lines changed
+6-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
66
</pattern>
77
</encoder>
88
</appender>
99

10-
<!-- <logger name="org.springframework" level="WARN" /> -->
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1115

1216
<root level="INFO">
1317
<appender-ref ref="STDOUT" />
1418
</root>
15-
1619
</configuration>
+13-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3-
4-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5-
<layout class="ch.qos.logback.classic.PatternLayout">
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
69

7-
<Pattern>
8-
%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
9-
</Pattern>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
1012

11-
</layout>
12-
</appender>
13-
14-
<logger name="com.baeldung.apache.velocity.service" level="debug"
15-
additivity="false">
16-
<appender-ref ref="STDOUT" />
17-
</logger>
18-
19-
<root level="error">
20-
<appender-ref ref="STDOUT" />
21-
</root>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
2215

16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
2319
</configuration>
+13-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
39

4-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5-
<layout class="ch.qos.logback.classic.PatternLayout">
6-
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg %n</pattern>
7-
</layout>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="com.baeldung.hazelcast" level="INFO" additivity="false">
11-
<appender-ref ref="STDOUT" />
12-
</logger>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1315

14-
<root level="DEBUG">
15-
<appender-ref ref="STDOUT" />
16-
</root>
17-
16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
1819
</configuration>
+7-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
66
</pattern>
77
</encoder>
88
</appender>
99

10-
<!-- <logger name="org.springframework" level="WARN" /> -->
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1115

1216
<root level="INFO">
13-
<appender-ref ref="STDOUT"/>
17+
<appender-ref ref="STDOUT" />
1418
</root>
15-
1619
</configuration>
+6-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
66
</pattern>
77
</encoder>
88
</appender>
99

10-
<!-- <logger name="org.springframework" level="WARN" /> -->
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1115

1216
<root level="INFO">
1317
<appender-ref ref="STDOUT" />
1418
</root>
15-
1619
</configuration>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
@@ -8,10 +8,12 @@
88
</appender>
99

1010
<logger name="org.springframework" level="WARN" />
11-
<logger name="com.baeldung" level="DEBUG" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1215

1316
<root level="INFO">
1417
<appender-ref ref="STDOUT" />
1518
</root>
16-
1719
</configuration>
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
@@ -8,10 +8,12 @@
88
</appender>
99

1010
<logger name="org.springframework" level="WARN" />
11-
<logger name="com.baeldung" level="DEBUG" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1215

1316
<root level="INFO">
1417
<appender-ref ref="STDOUT" />
1518
</root>
16-
1719
</configuration>

gson/src/main/resources/logback.xml

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
29

3-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4-
<encoder>
5-
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6-
</pattern>
7-
</encoder>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="org.springframework" level="WARN" />
11-
<logger name="org.springframework.transaction" level="WARN" />
12-
13-
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14-
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
15-
16-
<root level="INFO">
17-
<appender-ref ref="STDOUT" />
18-
</root>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1915

16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
2019
</configuration>

guava/src/main/resources/logback.xml

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
29

3-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4-
<encoder>
5-
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6-
</pattern>
7-
</encoder>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="org.springframework" level="WARN" />
11-
<logger name="org.springframework.transaction" level="WARN" />
12-
13-
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14-
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
15-
16-
<root level="INFO">
17-
<appender-ref ref="STDOUT" />
18-
</root>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1915

16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
2019
</configuration>
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
29

3-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4-
<encoder>
5-
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6-
</pattern>
7-
</encoder>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="org.springframework" level="WARN" />
11-
<logger name="org.springframework.transaction" level="WARN" />
12-
13-
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14-
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
15-
16-
<root level="INFO">
17-
<appender-ref ref="STDOUT" />
18-
</root>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1915

16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
2019
</configuration>
+13-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
39

4-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5-
<layout class="ch.qos.logback.classic.PatternLayout">
6-
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg %n</pattern>
7-
</layout>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="com.baeldung.hazelcast" level="INFO" additivity="false">
11-
<appender-ref ref="STDOUT" />
12-
</logger>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1315

14-
<root level="DEBUG">
15-
<appender-ref ref="STDOUT" />
16-
</root>
17-
16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
1819
</configuration>
+6-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
2-
33
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
44
<encoder>
55
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
66
</pattern>
77
</encoder>
88
</appender>
99

10-
<logger name="org.apache.http" level="DEBUG" />
11-
<logger name="org.apache.http.wire" level="INFO" />
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
12+
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1215

1316
<root level="INFO">
1417
<appender-ref ref="STDOUT" />
1518
</root>
16-
1719
</configuration>
+14-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<configuration>
3+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4+
<encoder>
5+
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6+
</pattern>
7+
</encoder>
8+
</appender>
29

3-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
4-
<encoder>
5-
<pattern>web - %date [%thread] %-5level %logger{36} - %message%n
6-
</pattern>
7-
</encoder>
8-
</appender>
10+
<logger name="org.springframework" level="WARN" />
11+
<logger name="org.springframework.transaction" level="WARN" />
912

10-
<logger name="org.springframework" level="WARN" />
11-
<logger name="org.springframework.transaction" level="WARN" />
12-
13-
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14-
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
15-
16-
<root level="INFO">
17-
<appender-ref ref="STDOUT" />
18-
</root>
13+
<!-- in order to debug some marshalling issues, this needs to be TRACE -->
14+
<logger name="org.springframework.web.servlet.mvc" level="WARN" />
1915

16+
<root level="INFO">
17+
<appender-ref ref="STDOUT" />
18+
</root>
2019
</configuration>

0 commit comments

Comments
 (0)