Merge pull request #21 from ljo/develop

Updating to support log4j2 in develop branch
eXist-db · Mar 20, 2015 · 6246561 · 6246561
2 parents e761e73 + 75beed0
commit 6246561
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/java/src/org/exist/xquery/modules/jfreechart/Configuration.java b/java/src/org/exist/xquery/modules/jfreechart/Configuration.java
@@ -22,7 +22,8 @@
 
 import java.awt.Color;
 import java.text.MessageFormat;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.exist.xquery.XPathException;
 import org.jfree.chart.axis.CategoryLabelPositions;
 import org.jfree.chart.plot.PlotOrientation;
@@ -38,7 +39,7 @@
  */
 public class Configuration {
 
-    private final static Logger logger = Logger.getLogger(Configuration.class);
+    private final static Logger logger = LogManager.getLogger(Configuration.class);
 
     // Default dimension of image
     private int imageHeight = 300;

diff --git a/java/src/org/exist/xquery/modules/jfreechart/JFreeChartFactory.java b/java/src/org/exist/xquery/modules/jfreechart/JFreeChartFactory.java
@@ -29,7 +29,8 @@
 import java.text.MessageFormat;
 import java.text.NumberFormat;
 import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.exist.xquery.XPathException;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
@@ -70,7 +71,7 @@
  */
 public class JFreeChartFactory {
 
-    private final static Logger logger = Logger.getLogger(JFreeChartFactory.class);
+    private final static Logger logger = LogManager.getLogger(JFreeChartFactory.class);
 
     /**
      *  Create JFreeChart graph using the supplied parameters.

diff --git a/java/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java b/java/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java
@@ -25,7 +25,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.exist.dom.QName;
 import org.exist.http.servlets.ResponseWrapper;
 import org.exist.storage.serializers.Serializer;
@@ -62,7 +63,7 @@
  */
 public class JFreeCharting extends BasicFunction {
 
-	protected static final Logger logger = Logger.getLogger(JFreeCharting.class);
+	protected static final Logger logger = LogManager.getLogger(JFreeCharting.class);
 
     private static final String function1Txt =
             "Render chart using JFreechart. Check documentation on " +

diff --git a/java/src/org/exist/xquery/modules/jfreechart/PiePlotDrawingSupplier.java b/java/src/org/exist/xquery/modules/jfreechart/PiePlotDrawingSupplier.java
@@ -1,6 +1,6 @@
 /*
  *  eXist Open Source Native XML Database
- *  Copyright (C) 2014 The eXist-db Project
+ *  Copyright (C) 2014-2015 The eXist-db Project
  *  http://exist-db.org
  *
  *  This program is free software; you can redistribute it and/or
@@ -26,7 +26,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.exist.xquery.XPathException;
 import org.jfree.chart.plot.DefaultDrawingSupplier;
 
@@ -39,7 +40,7 @@
  */
 public class PiePlotDrawingSupplier extends DefaultDrawingSupplier {
 
-    private final static Logger logger = Logger.getLogger(PiePlotDrawingSupplier.class);
+    private final static Logger logger = LogManager.getLogger(PiePlotDrawingSupplier.class);
     private final Paint[] paints;
     private int index;
 

diff --git a/java/src/org/exist/xquery/modules/jfreechart/render/RendererFactory.java b/java/src/org/exist/xquery/modules/jfreechart/render/RendererFactory.java
@@ -1,6 +1,6 @@
 /*
  *  eXist Open Source Native XML Database
- *  Copyright (C) 2011 The eXist Project
+ *  Copyright (C) 2011-2015 The eXist-db Project
  *  http://exist-db.org
  *
  *  This program is free software; you can redistribute it and/or
@@ -17,11 +17,11 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- *  $Id$
  */
 package org.exist.xquery.modules.jfreechart.render;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 /**
  *   Renderer factory, defaults to PNG is anything fails.
@@ -30,7 +30,7 @@
  */
 public class RendererFactory {
 
-    private final static Logger LOG = Logger.getLogger(RendererFactory.class);
+    private final static Logger LOG = LogManager.getLogger(RendererFactory.class);
 
     public static Renderer getRenderer(String type) {