From a5877ec31a14a4737ef6601ebf0ee032d9f8836b Mon Sep 17 00:00:00 2001
From: "giuseppe.corti" <giuseppe.corti@lightstreamer.com>
Date: Fri, 17 Jul 2020 12:41:23 +0200
Subject: [PATCH] Upgrade to log4j 2

---
 .gitignore                                               | 1 +
 README.md                                                | 1 -
 pom.xml                                                  | 9 ++++-----
 .../stocklist_demo/adapters/StockQuotesDataAdapter.java  | 9 +++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9d6bd9..ff018c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 ## Eclipse
 #################
 
+target/
 *.pydevproject
 .project
 .metadata
diff --git a/README.md b/README.md
index c87cd3d..4d290c6 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,6 @@ The `adapters.xml` file for the Stock-List Demo, should look like:
         <!-- Optional for StockQuotesDataAdapter.
              Configuration file for the Adapter's own logging.
              Logging is managed through log4j. -->
-        <param name="log_config">adapters_log_conf.xml</param>
         <param name="log_config_refresh_seconds">10</param>
 
     </data_provider>
diff --git a/pom.xml b/pom.xml
index 356d98e..4b972c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,11 +64,10 @@
       <version>7.3.0</version>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-</dependency>
-
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.13.3</version>
+    </dependency>
   </dependencies>
   
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/lightstreamer/src_adapter/stocklist_demo/adapters/StockQuotesDataAdapter.java b/src/main/java/com/lightstreamer/src_adapter/stocklist_demo/adapters/StockQuotesDataAdapter.java
index 000c5bc..56ade5f 100644
--- a/src/main/java/com/lightstreamer/src_adapter/stocklist_demo/adapters/StockQuotesDataAdapter.java
+++ b/src/main/java/com/lightstreamer/src_adapter/stocklist_demo/adapters/StockQuotesDataAdapter.java
@@ -24,8 +24,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import stocklist_demo.feed_simulator.ExternalFeedListener;
 import stocklist_demo.feed_simulator.ExternalFeedSimulator;
@@ -102,6 +102,7 @@ public StockQuotesDataAdapter() {
      * feed, for a real feed).
      */
     public void init(Map params, File configDir) {
+        /*
         String logConfig = (String) params.get("log_config");
         if (logConfig != null) {
             File logConfigFile = new File(configDir, logConfig);
@@ -111,8 +112,8 @@ public void init(Map params, File configDir) {
             } else {
                 DOMConfigurator.configure(logConfigFile.getAbsolutePath());
             }
-        }
-        logger = Logger.getLogger("LS_demos_Logger.StockQuotes");
+        }*/
+        logger = LogManager.getLogger("LS_demos_Logger.StockQuotes");
         
         //The feedMap of this adapter is never used
         // Read the Adapter Set name, which is supplied by the Server as a parameter