Skip to content

Commit 242b823

Browse files
alaindesiletsalaindesilets
committed
[UPGRADE] Moving to log4j2.xml file instead of old style log4j.properties
1 parent c736ad5 commit 242b823

34 files changed

+142
-120
lines changed

‎java-utils-core/src/main/java/ca/nrc/config/Config.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import java.util.Properties;
1111

1212
import com.fasterxml.jackson.databind.ObjectMapper;
13-
import org.apache.log4j.LogManager;
14-
import org.apache.log4j.Logger;
13+
import org.apache.logging.log4j.LogManager;
14+
import org.apache.logging.log4j.Logger;
1515

1616
import com.fasterxml.jackson.annotation.JsonIgnore;
1717

‎java-utils-core/src/main/java/ca/nrc/file/ResourceGetter.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
import org.apache.commons.io.FileUtils;
2626
import org.apache.commons.io.FilenameUtils;
27-
import org.apache.log4j.Logger;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2829

2930
/*
3031
* A class for accessing resource files and directories.
@@ -212,7 +213,7 @@ public static void copyResourceFilesToDir(String resDirRelPath, Path targDir) th
212213

213214

214215
public static File copyResourceToTempLocation(String resRelPath) throws ResourceGetterException {
215-
Logger tLogger = Logger.getLogger("ca.nrc.file.ResourceGetter.copyResourceToTempLocation");
216+
Logger tLogger = LogManager.getLogger("ca.nrc.file.ResourceGetter.copyResourceToTempLocation");
216217

217218

218219
String resPath;
@@ -279,7 +280,7 @@ private static File makeTempLocationForCopy(String resPath) throws ResourceGette
279280

280281

281282
private static File copyJarResourceToTempFile(String resPath) throws ResourceGetterException {
282-
Logger tLogger = Logger.getLogger("ca.nrc.file.ResourceGetter.copyJarResourceToTempFile");
283+
Logger tLogger = LogManager.getLogger("ca.nrc.file.ResourceGetter.copyJarResourceToTempFile");
283284
tLogger.trace("Getting resPath="+resPath);
284285
File tempLocation = null;
285286

‎java-utils-core/src/main/java/ca/nrc/introspection/Introspection.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
import java.util.Set;
99

1010
import org.apache.commons.lang3.tuple.Pair;
11-
import org.apache.log4j.Logger;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1213

1314
import com.fasterxml.jackson.annotation.JsonIgnore;
1415

@@ -30,7 +31,7 @@ public static Set<String> fieldNames(Class clazz) throws IntrospectionException
3031
}
3132

3233
public static Set<String> fieldNames(Class clazz, Boolean publicFieldsOnly) throws IntrospectionException {
33-
Logger tLogger = Logger.getLogger("ca.nrc.introspection.Introspection.fields");
34+
Logger tLogger = LogManager.getLogger("ca.nrc.introspection.Introspection.fields");
3435
Set<String> names = uncacheFieldNames(clazz, publicFieldsOnly);
3536
if (names == null) {
3637
Object obj = prototype4class(clazz);
@@ -69,7 +70,7 @@ public static Map<String,Object> fieldValues(Class clazz, Boolean publicFieldsOn
6970
public static Map<String,Object> fieldValues(Object obj, Boolean publicFieldsOnly)
7071
throws IntrospectionException {
7172

72-
Logger tLogger = Logger.getLogger("ca.nrc.introspection.Introspection.fieldValues");
73+
Logger tLogger = LogManager.getLogger("ca.nrc.introspection.Introspection.fieldValues");
7374

7475
if (publicFieldsOnly == null) {
7576
publicFieldsOnly = true;

‎java-utils-core/src/main/java/ca/nrc/json/PrettyPrinter.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import com.fasterxml.jackson.databind.node.ObjectNode;
2020

2121
import com.fasterxml.jackson.annotation.JsonIgnore;
22-
import org.apache.log4j.Logger;
22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2324

2425
/**
2526
* Generates a DETERMISTIC Json PrettyPrint of any object.
@@ -370,7 +371,7 @@ private String prettyPrintJsonArray(ArrayNode aNode, int indentLevel) {
370371
return json; }
371372

372373
private String prettyPrintObject(Object obj, Set<String> fieldsToIgnore, int indentLevel) {
373-
Logger logger = Logger.getLogger("ca.nrc.json.PrettyPrinter.prettyPrintObject");
374+
Logger logger = LogManager.getLogger("ca.nrc.json.PrettyPrinter.prettyPrintObject");
374375
String className = null;
375376
if (logger.isTraceEnabled()) {
376377
className = (obj==null?null:obj.getClass().getSimpleName());

‎java-utils-core/src/main/java/ca/nrc/testing/outputcapture/CapturedPrintWriter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.io.UnsupportedEncodingException;
99
import java.io.Writer;
1010

11-
import org.apache.log4j.LogManager;
12-
import org.apache.log4j.Logger;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1313

1414
public class CapturedPrintWriter extends PrintWriter {
1515
private StringBuilder outputCapture = new StringBuilder();

‎java-utils-data/src/main/java/ca/nrc/data/bin/DataCLI.java

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import ca.nrc.ui.commandline.CommandLineException;
66
import ca.nrc.ui.commandline.MainCommand;
77
import ca.nrc.ui.commandline.SubCommand;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810

911
public class DataCLI {
1012

@@ -60,6 +62,8 @@ protected static MainCommand defineMainCommand() throws CommandLineException {
6062
}
6163

6264
public static void main(String[] args) throws Exception {
65+
Logger logger = LogManager.getLogger("ca.nrc.data.bin.DataCLI");
66+
logger.trace("CLI invoked with args="+String.join(", ", args));
6367
MainCommand mainCmd = defineMainCommand();
6468
mainCmd.run(args);
6569
}

‎java-utils-data/src/main/java/ca/nrc/data/file/ObjectStreamReader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.util.regex.Matcher;
2020
import java.util.regex.Pattern;
2121

22-
import org.apache.log4j.LogManager;
23-
import org.apache.log4j.Logger;
22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2424

2525
import com.fasterxml.jackson.annotation.JsonIgnore;
2626
import com.fasterxml.jackson.core.JsonParseException;

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/BingSearchEngine.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
import org.apache.http.client.utils.URLEncodedUtils;
2424
import org.apache.http.impl.client.CloseableHttpClient;
2525
import org.apache.http.impl.client.HttpClients;
26-
import org.apache.log4j.Logger;
26+
import org.apache.logging.log4j.LogManager;
27+
import org.apache.logging.log4j.Logger;
2728
import org.json.JSONArray;
2829
import org.json.JSONObject;
2930

@@ -65,7 +66,7 @@ private void init_BingSearchEngine(String _bingKey) throws SearchEngineException
6566

6667
@Override
6768
protected SearchResults searchRaw(Query seQuery) throws SearchEngineException {
68-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.BingSearchEngine.search");
69+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.BingSearchEngine.search");
6970

7071
String queryStr = seQuery.fuzzyQuery;
7172

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/PageHarvester.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import ca.nrc.data.harvesting.SearchEngine.IHitVisitor;
1313
import ca.nrc.data.harvesting.SearchEngine.Query;
1414
import ca.nrc.data.harvesting.SearchEngine.SearchEngineException;
15-
import org.apache.log4j.Logger;
15+
import org.apache.logging.log4j.LogManager;
16+
import org.apache.logging.log4j.Logger;
1617

1718
public abstract class PageHarvester {
1819

@@ -141,7 +142,7 @@ public void harvestSinglePage(String url) throws PageHarvesterException {
141142
}
142143

143144
protected void getPage(String urlStr) throws PageHarvesterException {
144-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.PageHarvester.getPage");
145+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.PageHarvester.getPage");
145146
URL url = null;
146147
try {
147148
url = new URL(urlStr);

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/PageHarvester_HtmlCleaner.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import de.l3s.boilerpipe.extractors.KeepEverythingExtractor;
2525

2626
import org.apache.commons.lang3.StringEscapeUtils;
27-
import org.apache.log4j.LogManager;
28-
import org.apache.log4j.Logger;
27+
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
2929
import org.htmlcleaner.CleanerProperties;
3030
import org.htmlcleaner.HtmlCleaner;
3131
import org.htmlcleaner.TagNode;
@@ -190,7 +190,7 @@ public void harvestHyperLinks(String url, String linkAttrName, final String page
190190

191191
@Override
192192
protected void loadPage(String url) throws PageHarvesterException {
193-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.loadPage");
193+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.loadPage");
194194
tLogger.trace("url="+url);
195195
try {
196196
this.currentURL = new URL(url);
@@ -289,7 +289,7 @@ public void harvestSingleLink(String linkText) throws PageHarvesterException {
289289
}
290290

291291
protected String getHttpPage(URL url) throws PageHarvesterException, IOException {
292-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.getHttpPage");
292+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.getHttpPage");
293293
tLogger.trace("Getting url="+url);
294294
String oldUserAgent = System.getProperty("http.agent");
295295
failureStatus = 0;
@@ -353,7 +353,7 @@ protected String getJarPage(URL url) throws IOException {
353353
}
354354

355355
private String readPage(HttpURLConnection conn) throws IOException {
356-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.readPage");
356+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.PageHarvester_HtmlCleaner.readPage");
357357
String result;
358358
try {
359359
tLogger.trace("Reading from conn="+conn);

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/PageLinkVisitor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import java.util.regex.Matcher;
99
import java.util.regex.Pattern;
1010

11-
import org.apache.log4j.LogManager;
12-
import org.apache.log4j.Logger;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1313
import org.htmlcleaner.HtmlNode;
1414
import org.htmlcleaner.TagNode;
1515
import org.htmlcleaner.TagNodeVisitor;
@@ -102,7 +102,7 @@ public boolean visit(TagNode tagNode, HtmlNode htmlNode) {
102102
}
103103

104104
private void visitAnchorHref(URL curUrl, String innerlink) throws PageHarvesterException {
105-
Logger logger = Logger.getLogger("ca.nrc.data.harvesting.PageLinkVisitor.visit");
105+
Logger logger = LogManager.getLogger("ca.nrc.data.harvesting.PageLinkVisitor.visit");
106106
logger.trace("curUrl="+curUrl+", innerLink="+innerlink);
107107
Matcher mp = relatPath.matcher(innerlink);
108108

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/SearchEngine.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7-
import org.apache.log4j.Logger;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
89

910
import ca.nrc.datastructure.Pair;
1011
import ca.nrc.json.PrettyPrinter;
@@ -29,7 +30,7 @@ public SearchEngine setCheckHitSummary(boolean flag) {
2930
}
3031

3132
public SearchResults search(Query seQuery) throws SearchEngineException {
32-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngine.search");
33+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngine.search");
3334

3435
if (tLogger.isTraceEnabled()) {
3536
tLogger.trace("Invoked with seQuery=\n"+PrettyPrinter.print(seQuery));

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/SearchEngineMultiQuery.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package ca.nrc.data.harvesting;
22

33
import java.io.IOException;
4-
import java.util.ArrayList;
5-
import java.util.HashMap;
64
import java.util.HashSet;
7-
import java.util.List;
8-
import java.util.Map;
95
import java.util.Set;
106

11-
import org.apache.log4j.Logger;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
129

1310
import ca.nrc.data.harvesting.SearchEngine.Hit;
1411
import ca.nrc.data.harvesting.SearchEngine.Query;
@@ -63,7 +60,7 @@ private void initializeSearchEngineMultiQuery(String _bingKey) throws IOExceptio
6360

6461
public SearchResults search(Query query) throws SearchEngineException, IOException {
6562

66-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.search");
63+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.search");
6764

6865
if (tLogger.isTraceEnabled()) {
6966
tLogger.trace("Invoked with query="+PrettyPrinter.print(query));
@@ -90,7 +87,7 @@ public SearchResults search(Query query) throws SearchEngineException, IOExcepti
9087
*/
9188

9289
private void createAndStartWorkers(Query query) throws SearchEngineException {
93-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.createAndStartWorkers");
90+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.createAndStartWorkers");
9491
tLogger.trace("invoked");
9592

9693
// System.out.println("** createAndStartWorkers: shouldCheckHitSummary()="+shouldCheckHitSummary());
@@ -118,7 +115,7 @@ private void createAndStartWorkers(Query query) throws SearchEngineException {
118115
}
119116

120117
private SearchResults mergeTermResults(Integer maxHits) throws SearchEngineException {
121-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.mergeTermResults");
118+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.mergeTermResults");
122119

123120
tLogger.trace("invoked with maxHits="+maxHits);
124121

@@ -142,7 +139,7 @@ private SearchResults mergeTermResults(Integer maxHits) throws SearchEngineExcep
142139
}
143140

144141
private void addHitsFromSingleTermWorkers(Integer maxHits) throws SearchEngineException {
145-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.addHitsFromSingleTermWorkers");
142+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngineMultQuery.addHitsFromSingleTermWorkers");
146143

147144
tLogger.trace("Adding hits for search for each of the workers");
148145

‎java-utils-data/src/main/java/ca/nrc/data/harvesting/SearchEngineWorker.java

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
package ca.nrc.data.harvesting;
22

3-
import java.io.IOException;
4-
import java.lang.reflect.InvocationTargetException;
53
import java.net.URL;
64
import java.util.ArrayList;
7-
import java.util.HashMap;
85
import java.util.HashSet;
9-
import java.util.Iterator;
10-
import java.util.List;
11-
import java.util.Map;
126
import java.util.Set;
137

14-
import org.apache.log4j.Logger;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
1510

1611
import ca.nrc.data.harvesting.SearchEngine.Hit;
1712
import ca.nrc.data.harvesting.SearchEngine.Query;
1813
import ca.nrc.data.harvesting.SearchEngine.SearchEngineException;
19-
import ca.nrc.data.harvesting.SearchEngine.Type;
2014
import ca.nrc.datastructure.Cloner;
2115
import ca.nrc.datastructure.Cloner.ClonerException;
2216
import ca.nrc.json.PrettyPrinter;
@@ -86,7 +80,7 @@ public SearchEngineWorker setCheckHitSummary(boolean flag) {
8680

8781
@Override
8882
public void run() {
89-
Logger tLogger = Logger.getLogger("ca.nrc.data.harvesting.SearchEngineWorker.run");
83+
Logger tLogger = LogManager.getLogger("ca.nrc.data.harvesting.SearchEngineWorker.run");
9084
try {
9185

9286
// Keep fetching new batches of results until someone tells the thread

‎java-utils-elasticsearch/src/main/java/ca/nrc/dtrc/elasticsearch/DocIDIterator.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package ca.nrc.dtrc.elasticsearch;
22

33
import ca.nrc.json.PrettyPrinter;
4-
import org.apache.log4j.Logger;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
56

67
import java.util.Iterator;
78

@@ -20,7 +21,7 @@ public DocIDIterator(Iterator<Hit<T>> _hitsIter, Boolean withoutType) {
2021
}
2122

2223
private void init__DocIDIterator(Iterator<Hit<T>> _hitsIter, Boolean _withoutType) {
23-
Logger tLogger = Logger.getLogger("ca.nrc.dtrc.elasticsearch.init__DocIDIterator");
24+
Logger tLogger = LogManager.getLogger("ca.nrc.dtrc.elasticsearch.init__DocIDIterator");
2425
if (_withoutType != null) {
2526
this.withoutType = _withoutType;
2627
}

‎java-utils-elasticsearch/src/main/java/ca/nrc/dtrc/elasticsearch/ESConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ca.nrc.dtrc.elasticsearch;
22

3-
import org.apache.log4j.LogManager;
4-
import org.apache.log4j.Logger;
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
55

66
import ca.nrc.config.Config;
77
import ca.nrc.config.ConfigException;

‎java-utils-elasticsearch/src/main/java/ca/nrc/dtrc/elasticsearch/HitFilter.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import java.util.regex.Matcher;
66
import java.util.regex.Pattern;
77

8-
import org.apache.log4j.Logger;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
910

1011
import ca.nrc.datastructure.Pair;
1112

@@ -55,7 +56,7 @@ private void initialize(String filterSpecs) {
5556
}
5657

5758
public boolean keep(Hit<T> aHit) throws HitFilterException {
58-
Logger tLogger = Logger.getLogger("ca.nrc.dtrc.elasticsearch.HitFilter.keep");
59+
Logger tLogger = LogManager.getLogger("ca.nrc.dtrc.elasticsearch.HitFilter.keep");
5960

6061
Document doc = aHit.getDocument();
6162
int totalTermsMatched = 0;

0 commit comments

Comments
 (0)