From fcac24c02d9ef8da334c55058e7143de71a0cf1a Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Tue, 26 Jan 2021 20:33:22 -0600
Subject: [PATCH] log4j fixes

Renamed and moved the log4j xml to the proper location in gemp-lotr-server to be found on startup.  Added the log folder to gitignore.  Put references to log4j in all project pom.xml files.
---
 .gitignore                                    |  1 +
 gemp-lotr/gemp-lotr-async/pom.xml             |  5 ++
 gemp-lotr/gemp-lotr-cards/pom.xml             |  5 ++
 .../src/main/resources/log4j.xml}             | 84 +++++++++----------
 4 files changed, 53 insertions(+), 42 deletions(-)
 rename gemp-lotr/{gemp-lotr-async/src/main/resources/test-log4j.xml => gemp-lotr-server/src/main/resources/log4j.xml} (97%)

diff --git a/.gitignore b/.gitignore
index 3edffecd8..3426ba07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,6 @@ buildNumber.properties
 
 database/*
 !database/.placeholder
+logs/*
 .idea/
 *.iml
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/pom.xml b/gemp-lotr/gemp-lotr-async/pom.xml
index 81ae6ae61..3f2b06757 100644
--- a/gemp-lotr/gemp-lotr-async/pom.xml
+++ b/gemp-lotr/gemp-lotr-async/pom.xml
@@ -22,6 +22,11 @@
             <artifactId>netty-all</artifactId>
             <version>4.1.49.Final</version>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/gemp-lotr/gemp-lotr-cards/pom.xml b/gemp-lotr/gemp-lotr-cards/pom.xml
index 3e446bebf..15f199cdd 100644
--- a/gemp-lotr/gemp-lotr-cards/pom.xml
+++ b/gemp-lotr/gemp-lotr-cards/pom.xml
@@ -22,5 +22,10 @@
             <artifactId>gemp-lotr-logic</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
similarity index 97%
rename from gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml
rename to gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
index 9cd6ca66d..4c5544080 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/resources/test-log4j.xml
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/log4j.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- Pattern to output the caller's file name and line number -->
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-    <appender name="R" class="org.apache.log4j.RollingFileAppender">
-        <param name="file" value="logs/gemp-lotr.log"/>
-        <param name="MaxFileSize" value="10MB"/>
-        <param name="MaxBackupIndex" value="20"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-
-    <appender name="chat" class="org.apache.log4j.RollingFileAppender">
-        <param name="file" value="logs/chat.log"/>
-        <param name="MaxFileSize" value="10MB"/>
-        <!-- Keep one backup file -->
-        <param name="MaxBackupIndex" value="20"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
-        </layout>
-    </appender>
-
-    <logger name="com.gempukku" additivity="false">
-        <level value="debug"/>
-        <appender-ref ref="R"/>
-        <appender-ref ref="stdout"/>
-    </logger>
-    <logger name="chat">
-        <level value="ALL"/>
-        <appender-ref ref="chat"/>
-    </logger>
-    <root>
-        <level value="error"/>
-        <appender-ref ref="R"/>
-        <appender-ref ref="stdout"/>
-    </root>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+    <appender name="stdout" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- Pattern to output the caller's file name and line number -->
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+        </layout>
+    </appender>
+    <appender name="R" class="org.apache.log4j.RollingFileAppender">
+        <param name="file" value="logs/gemp-lotr.log"/>
+        <param name="MaxFileSize" value="10MB"/>
+        <param name="MaxBackupIndex" value="20"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="chat" class="org.apache.log4j.RollingFileAppender">
+        <param name="file" value="logs/chat.log"/>
+        <param name="MaxFileSize" value="10MB"/>
+        <!-- Keep one backup file -->
+        <param name="MaxBackupIndex" value="20"/>
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n"/>
+        </layout>
+    </appender>
+
+    <logger name="com.gempukku" additivity="false">
+        <level value="debug"/>
+        <appender-ref ref="R"/>
+        <appender-ref ref="stdout"/>
+    </logger>
+    <logger name="chat">
+        <level value="ALL"/>
+        <appender-ref ref="chat"/>
+    </logger>
+    <root>
+        <level value="error"/>
+        <appender-ref ref="R"/>
+        <appender-ref ref="stdout"/>
+    </root>
 </log4j:configuration>
\ No newline at end of file