From d9240931cf84bd007e1af1e8655d12ded12ca9ae Mon Sep 17 00:00:00 2001
From: oborkovskyi <oborkovskyi@playtika.com>
Date: Thu, 30 Jun 2016 13:03:50 +0300
Subject: [PATCH 1/7] Added log4j project

---
 log4j/pom.xml                                 | 61 +++++++++++++++++++
 .../java/com/baeldung/log4j/Log4jExample.java | 17 ++++++
 log4j/src/main/resources/log4j.xml            | 31 ++++++++++
 log4j/src/main/resources/log4j2.xml           | 26 ++++++++
 log4j/src/main/resources/logback.xml          | 28 +++++++++
 5 files changed, 163 insertions(+)
 create mode 100644 log4j/pom.xml
 create mode 100644 log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
 create mode 100644 log4j/src/main/resources/log4j.xml
 create mode 100644 log4j/src/main/resources/log4j2.xml
 create mode 100644 log4j/src/main/resources/logback.xml

diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 0000000000..5c73dc848d
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung</groupId>
+    <artifactId>log4j</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <!--log4j dependencies-->
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+
+
+        <!--log4j2 dependencies-->
+
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.logging.log4j</groupId>-->
+            <!--<artifactId>log4j-api</artifactId>-->
+            <!--<version>2.6</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.logging.log4j</groupId>-->
+            <!--<artifactId>log4j-core</artifactId>-->
+            <!--<version>2.6</version>-->
+        <!--</dependency>-->
+
+        <!--logback dependencies-->
+
+        <!--<dependency>-->
+            <!--<groupId>ch.qos.logback</groupId>-->
+            <!--<artifactId>logback-classic</artifactId>-->
+            <!--<version>1.1.7</version>-->
+        <!--</dependency>-->
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                    <showDeprecation>true</showDeprecation>
+                    <showWarnings>true</showWarnings>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java b/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
new file mode 100644
index 0000000000..e53fdd4881
--- /dev/null
+++ b/log4j/src/main/java/com/baeldung/log4j/Log4jExample.java
@@ -0,0 +1,17 @@
+package com.baeldung.log4j;
+
+
+import org.apache.log4j.Logger;
+
+public class Log4jExample {
+
+    private final static Logger logger = Logger.getLogger(Log4jExample.class);
+
+    public static void main(String[] args) {
+        logger.trace("Trace log message");
+        logger.debug("Debug log message");
+        logger.info("Info log message");
+        logger.error("Error log message");
+    }
+
+}
diff --git a/log4j/src/main/resources/log4j.xml b/log4j/src/main/resources/log4j.xml
new file mode 100644
index 0000000000..1de6c62caf
--- /dev/null
+++ b/log4j/src/main/resources/log4j.xml
@@ -0,0 +1,31 @@
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" >
+<log4j:configuration debug="false">
+
+    <!--Console appender-->
+    <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
+        </layout>
+    </appender>
+
+    <!-- File appender-->
+    <appender name="fout" class="org.apache.log4j.FileAppender">
+        <param name="file" value="baeldung.log" />
+        <param name="append" value="false" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
+        </layout>
+    </appender>
+
+    <!--Override log level for specified package-->
+    <category name="com.baeldung.log4j">
+        <priority value="TRACE" />
+    </category>
+
+    <root>
+        <level value="DEBUG" />
+        <appender-ref ref="stdout" />
+        <appender-ref ref="fout" />
+    </root>
+
+</log4j:configuration>
\ No newline at end of file
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
new file mode 100644
index 0000000000..0a854b25b7
--- /dev/null
+++ b/log4j/src/main/resources/log4j2.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Appenders>
+        # Console appender
+        <Console name="stdout" target="SYSTEM_OUT">
+            # Pattern of log message for console appender
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
+        </Console>
+
+        # File appender
+        <File name="fout" fileName="baeldung.log" immediateFlush="false" append="false">
+            # Pattern of log message for file appender
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
+        </File>
+    </Appenders>
+
+    <Loggers>
+        # Override log level for specified package
+        <Logger name="com.baeldung.log4j" level="TRACE"/>
+
+        <Root level="DEBUG">
+            <AppenderRef ref="stdout" />
+            <AppenderRef ref="fout"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/log4j/src/main/resources/logback.xml b/log4j/src/main/resources/logback.xml
new file mode 100644
index 0000000000..c70bceab16
--- /dev/null
+++ b/log4j/src/main/resources/logback.xml
@@ -0,0 +1,28 @@
+<configuration>
+  # Console appender
+  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      # Pattern of log message for console appender
+      <Pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</Pattern>
+    </layout>
+  </appender>
+
+  # File appender
+  <appender name="fout" class="ch.qos.logback.core.FileAppender">
+    # Name of a log file
+    <file>baeldung.log</file>
+    <append>false</append>
+    <encoder>
+      # Pattern of log message for file appender
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</pattern>
+    </encoder>
+  </appender>
+
+  # Override log level for specified package
+  <logger name="com.baeldung.log4j" level="TRACE"/>
+
+  <root level="DEBUG">
+    <appender-ref ref="stdout" />
+    <appender-ref ref="fout" />
+  </root>
+</configuration>
\ No newline at end of file

From acaa70c66d448af4b13b8537ca9be9c542f21afc Mon Sep 17 00:00:00 2001
From: Slavisa Baeldung <slavisa.baeldung@gmail.com>
Date: Fri, 1 Jul 2016 15:22:07 +0200
Subject: [PATCH 2/7] BAEL-65 - logging to files

---
 log4j/pom.xml                                 | 30 +++++++++----------
 .../com/baeldung/log4j2/Log4j2Example.java    | 16 ++++++++++
 .../com/baeldung/logback/LogbackExample.java  | 16 ++++++++++
 log4j/src/main/resources/log4j.xml            | 16 +++++-----
 log4j/src/main/resources/log4j2.xml           |  4 +--
 log4j/src/main/resources/logback.xml          |  4 +--
 pom.xml                                       |  1 +
 7 files changed, 60 insertions(+), 27 deletions(-)
 create mode 100644 log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
 create mode 100644 log4j/src/main/java/com/baeldung/logback/LogbackExample.java

diff --git a/log4j/pom.xml b/log4j/pom.xml
index 5c73dc848d..ed2df31b05 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -21,24 +21,24 @@
         <!--log4j2 dependencies-->
 
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-api</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-core</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.6</version>
+        </dependency>
 
         <!--logback dependencies-->
 
-        <!--<dependency>-->
-            <!--<groupId>ch.qos.logback</groupId>-->
-            <!--<artifactId>logback-classic</artifactId>-->
-            <!--<version>1.1.7</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.7</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java b/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
new file mode 100644
index 0000000000..dfcfdbf286
--- /dev/null
+++ b/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
@@ -0,0 +1,16 @@
+package com.baeldung.log4j2;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
+public class Log4j2Example {
+
+    private static final Logger logger = LogManager.getLogger(Log4j2Example.class);
+
+    public static void main(String[] args) {
+        logger.debug("Debug log message");
+        logger.info("Info log message");
+        logger.error("Error log message");
+    }
+
+}
\ No newline at end of file
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackExample.java b/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
new file mode 100644
index 0000000000..7b348d505a
--- /dev/null
+++ b/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
@@ -0,0 +1,16 @@
+package com.baeldung.logback;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LogbackExample {
+
+    private static final Logger logger = LoggerFactory.getLogger(LogbackExample.class);
+
+    public static void main(String[] args) {
+        logger.debug("Debug log message");
+        logger.info("Info log message");
+        logger.error("Error log message");
+    }
+}
\ No newline at end of file
diff --git a/log4j/src/main/resources/log4j.xml b/log4j/src/main/resources/log4j.xml
index 1de6c62caf..39c7b1f51b 100644
--- a/log4j/src/main/resources/log4j.xml
+++ b/log4j/src/main/resources/log4j.xml
@@ -4,28 +4,28 @@
     <!--Console appender-->
     <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n"/>
         </layout>
     </appender>
 
     <!-- File appender-->
     <appender name="fout" class="org.apache.log4j.FileAppender">
-        <param name="file" value="baeldung.log" />
-        <param name="append" value="false" />
+        <param name="file" value="log4j/target/baeldung-log4j.log"/>
+        <param name="append" value="false"/>
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
         </layout>
     </appender>
 
     <!--Override log level for specified package-->
     <category name="com.baeldung.log4j">
-        <priority value="TRACE" />
+        <priority value="TRACE"/>
     </category>
 
     <root>
-        <level value="DEBUG" />
-        <appender-ref ref="stdout" />
-        <appender-ref ref="fout" />
+        <level value="DEBUG"/>
+        <appender-ref ref="stdout"/>
+        <appender-ref ref="fout"/>
     </root>
 
 </log4j:configuration>
\ No newline at end of file
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
index 0a854b25b7..a72b2e3314 100644
--- a/log4j/src/main/resources/log4j2.xml
+++ b/log4j/src/main/resources/log4j2.xml
@@ -8,7 +8,7 @@
         </Console>
 
         # File appender
-        <File name="fout" fileName="baeldung.log" immediateFlush="false" append="false">
+        <File name="fout" fileName="log4j/target/baeldung-log4j2.log" immediateFlush="false" append="false">
             # Pattern of log message for file appender
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
         </File>
@@ -16,7 +16,7 @@
 
     <Loggers>
         # Override log level for specified package
-        <Logger name="com.baeldung.log4j" level="TRACE"/>
+        <Logger name="com.baeldung.log4j2" level="ERROR"/>
 
         <Root level="DEBUG">
             <AppenderRef ref="stdout" />
diff --git a/log4j/src/main/resources/logback.xml b/log4j/src/main/resources/logback.xml
index c70bceab16..378ce0a751 100644
--- a/log4j/src/main/resources/logback.xml
+++ b/log4j/src/main/resources/logback.xml
@@ -10,7 +10,7 @@
   # File appender
   <appender name="fout" class="ch.qos.logback.core.FileAppender">
     # Name of a log file
-    <file>baeldung.log</file>
+    <file>log4j/target/baeldung-logback.log</file>
     <append>false</append>
     <encoder>
       # Pattern of log message for file appender
@@ -19,7 +19,7 @@
   </appender>
 
   # Override log level for specified package
-  <logger name="com.baeldung.log4j" level="TRACE"/>
+  <logger name="com.baeldung.logback" level="ERROR"/>
 
   <root level="DEBUG">
     <appender-ref ref="stdout" />
diff --git a/pom.xml b/pom.xml
index 75281ce80d..be35ddeab0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
         <!-- <module>raml</module> -->
         <module>rest-testing</module>
         <module>resteasy</module>
+        <module>log4j</module>
 
         <module>spring-all</module>
         <module>spring-apache-camel</module>

From 7704b2eb0107f24f39aba576c6651f916f1d641d Mon Sep 17 00:00:00 2001
From: oborkovskyi <oborkovskyi@playtika.com>
Date: Fri, 1 Jul 2016 17:38:30 +0300
Subject: [PATCH 3/7] Improved log4j project

---
 log4j/pom.xml                                 | 34 ++++++++-----------
 .../com/baeldung/log4j2/Log4j2Example.java    | 16 +++++++++
 .../com/baeldung/logback/LogbackExample.java  | 16 +++++++++
 log4j/src/main/resources/log4j.xml            |  2 +-
 log4j/src/main/resources/log4j2.xml           |  6 ++--
 log4j/src/main/resources/logback.xml          |  6 ++--
 6 files changed, 54 insertions(+), 26 deletions(-)
 create mode 100644 log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
 create mode 100644 log4j/src/main/java/com/baeldung/logback/LogbackExample.java

diff --git a/log4j/pom.xml b/log4j/pom.xml
index 5c73dc848d..a70dab9d22 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -10,7 +10,6 @@
 
     <dependencies>
         <!--log4j dependencies-->
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -19,26 +18,23 @@
 
 
         <!--log4j2 dependencies-->
-
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-api</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-core</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.6</version>
+        </dependency>
 
         <!--logback dependencies-->
-
-        <!--<dependency>-->
-            <!--<groupId>ch.qos.logback</groupId>-->
-            <!--<artifactId>logback-classic</artifactId>-->
-            <!--<version>1.1.7</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.7</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java b/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
new file mode 100644
index 0000000000..60acc3a774
--- /dev/null
+++ b/log4j/src/main/java/com/baeldung/log4j2/Log4j2Example.java
@@ -0,0 +1,16 @@
+package com.baeldung.log4j2;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
+public class Log4j2Example {
+
+    private static final Logger logger = LogManager.getLogger(Log4j2Example.class);
+
+    public static void main(String[] args) {
+        logger.debug("Debug log message");
+        logger.info("Info log message");
+        logger.error("Error log message");
+    }
+
+}
diff --git a/log4j/src/main/java/com/baeldung/logback/LogbackExample.java b/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
new file mode 100644
index 0000000000..536aa78ec9
--- /dev/null
+++ b/log4j/src/main/java/com/baeldung/logback/LogbackExample.java
@@ -0,0 +1,16 @@
+package com.baeldung.logback;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LogbackExample {
+
+    private static final Logger logger = LoggerFactory.getLogger(LogbackExample.class);
+
+    public static void main(String[] args) {
+        logger.debug("Debug log message");
+        logger.info("Info log message");
+        logger.error("Error log message");
+    }
+
+}
diff --git a/log4j/src/main/resources/log4j.xml b/log4j/src/main/resources/log4j.xml
index 1de6c62caf..6f64c63572 100644
--- a/log4j/src/main/resources/log4j.xml
+++ b/log4j/src/main/resources/log4j.xml
@@ -13,7 +13,7 @@
         <param name="file" value="baeldung.log" />
         <param name="append" value="false" />
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
         </layout>
     </appender>
 
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
index 0a854b25b7..56c6706e91 100644
--- a/log4j/src/main/resources/log4j2.xml
+++ b/log4j/src/main/resources/log4j2.xml
@@ -4,19 +4,19 @@
         # Console appender
         <Console name="stdout" target="SYSTEM_OUT">
             # Pattern of log message for console appender
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n" />
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
         </Console>
 
         # File appender
         <File name="fout" fileName="baeldung.log" immediateFlush="false" append="false">
             # Pattern of log message for file appender
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n"/>
         </File>
     </Appenders>
 
     <Loggers>
         # Override log level for specified package
-        <Logger name="com.baeldung.log4j" level="TRACE"/>
+        <Logger name="com.baeldung.log4j2" level="TRACE"/>
 
         <Root level="DEBUG">
             <AppenderRef ref="stdout" />
diff --git a/log4j/src/main/resources/logback.xml b/log4j/src/main/resources/logback.xml
index c70bceab16..c1fd0aee59 100644
--- a/log4j/src/main/resources/logback.xml
+++ b/log4j/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
   <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
     <layout class="ch.qos.logback.classic.PatternLayout">
       # Pattern of log message for console appender
-      <Pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</Pattern>
+      <Pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</Pattern>
     </layout>
   </appender>
 
@@ -14,12 +14,12 @@
     <append>false</append>
     <encoder>
       # Pattern of log message for file appender
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n</pattern>
+      <pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</pattern>
     </encoder>
   </appender>
 
   # Override log level for specified package
-  <logger name="com.baeldung.log4j" level="TRACE"/>
+  <logger name="com.baeldung.logback" level="TRACE"/>
 
   <root level="DEBUG">
     <appender-ref ref="stdout" />

From 29978cc4db79d90be9f3b9d92de71e4fb5cee094 Mon Sep 17 00:00:00 2001
From: oborkovskyi <oborkovskyi@playtika.com>
Date: Fri, 1 Jul 2016 18:52:08 +0300
Subject: [PATCH 4/7] Added log4j to pom

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 75281ce80d..4bef2ceb45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
         <!-- <module>raml</module> -->
         <module>rest-testing</module>
         <module>resteasy</module>
+		<module>log4j</module>
 
         <module>spring-all</module>
         <module>spring-apache-camel</module>

From 980a3bdd333b6170946933149731f0c5fcdc7364 Mon Sep 17 00:00:00 2001
From: oborkovskyi <oborkovskyi@playtika.com>
Date: Mon, 4 Jul 2016 15:12:25 +0300
Subject: [PATCH 5/7] Added async

---
 log4j/pom.xml                       | 7 +++++++
 log4j/src/main/resources/log4j2.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/log4j/pom.xml b/log4j/pom.xml
index a70dab9d22..78596a60d9 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -28,6 +28,13 @@
             <artifactId>log4j-core</artifactId>
             <version>2.6</version>
         </dependency>
+		
+		<!--disruptor for log4j2 async logging-->
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <version>3.3.4</version>
+        </dependency>
 
         <!--logback dependencies-->
         <dependency>
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
index 56c6706e91..6f627e97f8 100644
--- a/log4j/src/main/resources/log4j2.xml
+++ b/log4j/src/main/resources/log4j2.xml
@@ -18,9 +18,9 @@
         # Override log level for specified package
         <Logger name="com.baeldung.log4j2" level="TRACE"/>
 
-        <Root level="DEBUG">
+        <AsyncRoot level="DEBUG">
             <AppenderRef ref="stdout" />
             <AppenderRef ref="fout"/>
-        </Root>
+        </AsyncRoot>
     </Loggers>
 </Configuration>
\ No newline at end of file

From 9257da4b4480bb07c1ec5919093cdbca2c263259 Mon Sep 17 00:00:00 2001
From: Grzegorz Piwowarek <gpw@touk.pl>
Date: Thu, 7 Jul 2016 22:45:27 +0200
Subject: [PATCH 6/7] Use interface instead of the implementation

---
 .../com/baeldung/assertj/introduction/AssertJGuavaTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java b/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java
index 9c51af3ee9..558ce87d70 100644
--- a/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java
+++ b/assertj/src/test/java/com/baeldung/assertj/introduction/AssertJGuavaTest.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Range;
 import com.google.common.collect.Sets;
+import com.google.common.collect.Table;
 import com.google.common.collect.TreeRangeMap;
 import com.google.common.io.Files;
 import org.assertj.guava.data.MapEntry;
@@ -78,7 +79,7 @@ public class AssertJGuavaTest {
 
     @Test
     public void givenTable_whenVerifying_thenShouldBeCorrect() throws Exception {
-        final HashBasedTable<Integer, String, String> table = HashBasedTable.create(2, 2);
+        final Table<Integer, String, String> table = HashBasedTable.create(2, 2);
 
         table.put(1, "A", "PRESENT");
         table.put(1, "B", "ABSENT");

From 1a11364e575a7726af848605b45ad3540e95fc09 Mon Sep 17 00:00:00 2001
From: Slavisa Baeldung <slavisa.baeldung@gmail.com>
Date: Fri, 8 Jul 2016 09:57:47 +0200
Subject: [PATCH 7/7] BAEL-38 - Minor changes

---
 log4j/pom.xml                        | 22 ++++---------
 log4j/src/main/resources/log4j.xml   |  2 +-
 log4j/src/main/resources/log4j2.xml  |  4 +--
 log4j/src/main/resources/logback.xml | 46 ++++++++++++++--------------
 4 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/log4j/pom.xml b/log4j/pom.xml
index dd5fc4021b..76c05b36c1 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -29,31 +29,21 @@
             <version>2.6</version>
         </dependency>
 
-		<!--disruptor for log4j2 async logging-->
+        <!--disruptor for log4j2 async logging-->
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
             <version>3.3.4</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-api</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.logging.log4j</groupId>-->
-            <!--<artifactId>log4j-core</artifactId>-->
-            <!--<version>2.6</version>-->
-        <!--</dependency>-->
 
         <!--logback dependencies-->
 
-        <!--<dependency>-->
-            <!--<groupId>ch.qos.logback</groupId>-->
-            <!--<artifactId>logback-classic</artifactId>-->
-            <!--<version>1.1.7</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.7</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/log4j/src/main/resources/log4j.xml b/log4j/src/main/resources/log4j.xml
index 05105cce8a..58a924f970 100644
--- a/log4j/src/main/resources/log4j.xml
+++ b/log4j/src/main/resources/log4j.xml
@@ -14,7 +14,7 @@
         <param name="append" value="false"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %p %m%n"/>
         </layout>
     </appender>
 
diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
index 42f4e8d259..76a20bcd61 100644
--- a/log4j/src/main/resources/log4j2.xml
+++ b/log4j/src/main/resources/log4j2.xml
@@ -4,7 +4,7 @@
         # Console appender
         <Console name="stdout" target="SYSTEM_OUT">
             # Pattern of log message for console appender
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n" />
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %p %m%n"/>
         </Console>
 
         # File appender
@@ -19,7 +19,7 @@
         <Logger name="com.baeldung.log4j2" level="TRACE"/>
 
         <AsyncRoot level="DEBUG">
-            <AppenderRef ref="stdout" />
+            <AppenderRef ref="stdout"/>
             <AppenderRef ref="fout"/>
         </AsyncRoot>
     </Loggers>
diff --git a/log4j/src/main/resources/logback.xml b/log4j/src/main/resources/logback.xml
index 0c50001890..fc66d560aa 100644
--- a/log4j/src/main/resources/logback.xml
+++ b/log4j/src/main/resources/logback.xml
@@ -1,28 +1,28 @@
 <configuration>
-  # Console appender
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <layout class="ch.qos.logback.classic.PatternLayout">
-      # Pattern of log message for console appender
-      <Pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</Pattern>
-    </layout>
-  </appender>
+    # Console appender
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            # Pattern of log message for console appender
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</Pattern>
+        </layout>
+    </appender>
 
-  # File appender
-  <appender name="fout" class="ch.qos.logback.core.FileAppender">
-    # Name of a log file
-    <file>log4j/target/baeldung-logback.log</file>
-    <append>false</append>
-    <encoder>
-      # Pattern of log message for file appender
-      <pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</pattern>
-    </encoder>
-  </appender>
+    # File appender
+    <appender name="fout" class="ch.qos.logback.core.FileAppender">
+        # Name of a log file
+        <file>log4j/target/baeldung-logback.log</file>
+        <append>false</append>
+        <encoder>
+            # Pattern of log message for file appender
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} %p %m%n</pattern>
+        </encoder>
+    </appender>
 
-  # Override log level for specified package
-  <logger name="com.baeldung.logback" level="TRACE"/>
+    # Override log level for specified package
+    <logger name="com.baeldung.logback" level="TRACE"/>
 
-  <root level="DEBUG">
-    <appender-ref ref="stdout" />
-    <appender-ref ref="fout" />
-  </root>
+    <root level="DEBUG">
+        <appender-ref ref="stdout"/>
+        <appender-ref ref="fout"/>
+    </root>
 </configuration>
\ No newline at end of file