commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hen...@apache.org
Subject svn commit: r1718615 - in /commons/proper/jexl/trunk: ./ src/main/java/org/apache/commons/jexl3/ src/main/java/org/apache/commons/jexl3/internal/ src/main/java/org/apache/commons/jexl3/internal/introspection/ src/main/java/org/apache/commons/jexl3/scri...
Date Tue, 08 Dec 2015 14:12:00 GMT
Author: henrib
Date: Tue Dec  8 14:12:00 2015
New Revision: 1718615

URL: http://svn.apache.org/viewvc?rev=1718615&view=rev
Log:
JEXL:
Reverted to Apache commons logging (instead of log4j);

Modified:
    commons/proper/jexl/trunk/pom.xml
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
    commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java
    commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java

Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Tue Dec  8 14:12:00 2015
@@ -100,9 +100,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -189,7 +189,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <configuration>
                     <instrumentation>
                         <ignores>

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java (original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/JexlBuilder.java Tue
Dec  8 14:12:00 2015
@@ -20,11 +20,9 @@ package org.apache.commons.jexl3;
 import org.apache.commons.jexl3.internal.Engine;
 import org.apache.commons.jexl3.introspection.JexlSandbox;
 import org.apache.commons.jexl3.introspection.JexlUberspect;
-
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
 
 import java.util.Map;
-
 import java.nio.charset.Charset;
 
 /**
@@ -77,7 +75,7 @@ public class JexlBuilder {
     /**
      * The Log to which all JexlEngine messages will be logged.
      */
-    protected Logger logger = null;
+    protected Log logger = null;
     /**
      * Whether expressions evaluated by this engine will throw exceptions (false) or
      * return null (true) on errors. Default is false.
@@ -182,13 +180,13 @@ public class JexlBuilder {
      * @param l the logger
      * @return this builder
      */
-    public JexlBuilder logger(Logger l) {
+    public JexlBuilder logger(Log l) {
         this.logger = l;
         return this;
     }
 
     /** @return the logger */
-    public Logger logger() {
+    public Log logger() {
         return this.logger;
     }
 

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Engine.java
Tue Dec  8 14:12:00 2015
@@ -37,9 +37,6 @@ import org.apache.commons.jexl3.parser.A
 import org.apache.commons.jexl3.parser.JexlNode;
 import org.apache.commons.jexl3.parser.Parser;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
-
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,6 +49,9 @@ import java.util.Set;
 import java.lang.ref.SoftReference;
 import java.nio.charset.Charset;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * A JexlEngine implementation.
  * @since 2.0
@@ -68,7 +68,7 @@ public class Engine extends JexlEngine {
     private static final class UberspectHolder {
         /** The default uberspector that handles all introspection patterns. */
         private static final Uberspect UBERSPECT =
-                new Uberspect(LogManager.getLogger(JexlEngine.class), JexlUberspect.JEXL_STRATEGY);
+                new Uberspect(LogFactory.getLog(JexlEngine.class), JexlUberspect.JEXL_STRATEGY);
 
         /** Non-instantiable. */
         private UberspectHolder() {}
@@ -84,7 +84,7 @@ public class Engine extends JexlEngine {
     /**
      * The Log to which all JexlEngine messages will be logged.
      */
-    protected final Logger logger;
+    protected final Log logger;
     /**
      * The {@link Parser}; when parsing expressions, this engine synchronizes on the parser.
      */
@@ -150,7 +150,7 @@ public class Engine extends JexlEngine {
         } else {
             this.uberspect = new SandboxUberspect(uber, sandbox);
         }
-        this.logger = conf.logger() == null ? LogManager.getLogger(JexlEngine.class) : conf.logger();
+        this.logger = conf.logger() == null ? LogFactory.getLog(JexlEngine.class) : conf.logger();
         this.functions = conf.namespaces() == null ? Collections.<String, Object>emptyMap()
: conf.namespaces();
         this.silent = conf.silent() == null ? false : conf.silent();
         this.debug = conf.debug() == null ? true : conf.debug();
@@ -174,8 +174,8 @@ public class Engine extends JexlEngine {
      * @param strategy the property resolver strategy
      * @return Uberspect the default uberspector instance.
      */
-    public static Uberspect getUberspect(Logger logger, JexlUberspect.ResolverStrategy strategy)
{
-        if ((logger == null || logger.equals(LogManager.getLogger(JexlEngine.class)))
+    public static Uberspect getUberspect(Log logger, JexlUberspect.ResolverStrategy strategy)
{
+        if ((logger == null || logger.equals(LogFactory.getLog(JexlEngine.class)))
             && (strategy == null || strategy == JexlUberspect.JEXL_STRATEGY)) {
             return UberspectHolder.UBERSPECT;
         }

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/Interpreter.java
Tue Dec  8 14:12:00 2015
@@ -106,7 +106,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
 
 /**
  * An interpreter of JEXL syntax.
@@ -117,7 +117,7 @@ public class Interpreter extends ParserV
     /** The JEXL engine. */
     protected final Engine jexl;
     /** The logger. */
-    protected final Logger logger;
+    protected final Log logger;
     /** The uberspect. */
     protected final JexlUberspect uberspect;
     /** The arithmetic handler. */

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/ClassMap.java
Tue Dec  8 14:12:00 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.jexl3.internal.introspection;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -90,7 +90,7 @@ final class ClassMap {
      * @param log the logger.
      */
     @SuppressWarnings("LeakingThisInConstructor")
-    ClassMap(Class<?> aClass, Logger log) {
+    ClassMap(Class<?> aClass, Log log) {
         // eagerly cache methods
         create(this, aClass, log);
         // eagerly cache public fields
@@ -199,7 +199,7 @@ final class ClassMap {
      * @param classToReflect the class to cache
      * @param log the Log
      */
-    private static void create(ClassMap cache, Class<?> classToReflect, Logger log)
{
+    private static void create(ClassMap cache, Class<?> classToReflect, Log log) {
         //
         // Build a list of all elements in the class hierarchy. This one is bottom-first
(i.e. we start
         // with the actual declaring class and its interfaces and then move up (superclass
etc.) until we
@@ -256,7 +256,7 @@ final class ClassMap {
      * @param iface the interface to populate the cache from
      * @param log the Log
      */
-    private static void populateWithInterface(ClassMap cache, Class<?> iface, Logger
log) {
+    private static void populateWithInterface(ClassMap cache, Class<?> iface, Log log)
{
         if (Modifier.isPublic(iface.getModifiers())) {
             populateWithClass(cache, iface, log);
         }
@@ -272,7 +272,7 @@ final class ClassMap {
      * @param clazz the class to populate the cache from
      * @param log the Log
      */
-    private static void populateWithClass(ClassMap cache, Class<?> clazz, Logger log)
{
+    private static void populateWithClass(ClassMap cache, Class<?> clazz, Log log)
{
         try {
             Method[] methods = clazz.getDeclaredMethods();
             for (int i = 0; i < methods.length; i++) {

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
Tue Dec  8 14:12:00 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.jexl3.internal.introspection;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Reentr
  * This basic function of this class is to return a Method object for a
  * particular class given the name of a method and the parameters to the method
  * in the form of an Object[].
- * 
+ *
  * <p>The first time the Introspector sees a class it creates a class method map
  * for the class in question.
  * Basically the class method map is a Hashtable where Method objects are keyed by the aggregation
of
  * the method name and the array of parameters classes.
  * This mapping is performed for all the public methods of a class and stored.</p>
- * 
+ *
  * @since 1.0
  */
 public final class Introspector {
@@ -62,7 +62,7 @@ public final class Introspector {
     /**
      * the logger.
      */
-    protected final Logger rlog;
+    protected final Log rlog;
     /**
      * The class loader used to solve constructors if needed.
      */
@@ -89,7 +89,7 @@ public final class Introspector {
      * @param log     the logger to use
      * @param cloader the class loader
      */
-    public Introspector(Logger log, ClassLoader cloader) {
+    public Introspector(Log log, ClassLoader cloader) {
         this.rlog = log;
         loader = cloader;
     }

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/internal/introspection/Uberspect.java
Tue Dec  8 14:12:00 2015
@@ -24,7 +24,7 @@ import org.apache.commons.jexl3.introspe
 import org.apache.commons.jexl3.introspection.JexlPropertySet;
 import org.apache.commons.jexl3.introspection.JexlUberspect;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -53,7 +53,7 @@ public class Uberspect implements JexlUb
     /** Publicly exposed special failure object returned by tryInvoke. */
     public static final Object TRY_FAILED = JexlEngine.TRY_FAILED;
     /** The logger to use for all warnings and errors. */
-    protected final Logger rlog;
+    protected final Log rlog;
     /** The resolver strategy. */
     private final JexlUberspect.ResolverStrategy strategy;
     /** The introspector version. */
@@ -75,7 +75,7 @@ public class Uberspect implements JexlUb
      * @param runtimeLogger the logger used for all logging needs
      * @param sty the resolver strategy
      */
-    public Uberspect(Logger runtimeLogger, JexlUberspect.ResolverStrategy sty) {
+    public Uberspect(Log runtimeLogger, JexlUberspect.ResolverStrategy sty) {
         rlog = runtimeLogger;
         strategy = sty == null? JexlUberspect.JEXL_STRATEGY : sty;
         ref = new SoftReference<Introspector>(null);

Modified: commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
(original)
+++ commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl3/scripting/JexlScriptEngine.java
Tue Dec  8 14:12:00 2015
@@ -38,8 +38,8 @@ import org.apache.commons.jexl3.JexlCont
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlScript;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Implements the JEXL ScriptEngine for JSF-223.
@@ -62,7 +62,7 @@ import org.apache.log4j.LogManager;
  */
 public class JexlScriptEngine extends AbstractScriptEngine implements Compilable {
     /** The logger. */
-    private static final Logger LOG = LogManager.getLogger(JexlScriptEngine.class);
+    private static final Log LOG = LogFactory.getLog(JexlScriptEngine.class);
 
     /** The shared expression cache size. */
     private static final int CACHE_SIZE = 512;
@@ -84,7 +84,7 @@ public class JexlScriptEngine extends Ab
 
     /**
      * Default constructor.
-     * 
+     *
      * <p>Only intended for use when not using a factory.
      * Sets the factory to {@link JexlScriptEngineFactory}.</p>
      */
@@ -95,7 +95,7 @@ public class JexlScriptEngine extends Ab
     /**
      * Implements engine and engine context properties for use by JEXL scripts.
      * Those properties are allways bound to the default engine scope context.
-     * 
+     *
      * <p>The following properties are defined:</p>
      * <ul>
      * <li>in - refers to the engine scope reader that defaults to reading System.err</li>
@@ -104,7 +104,7 @@ public class JexlScriptEngine extends Ab
      * <li>logger - the JexlScriptEngine logger</li>
      * <li>System - the System.class</li>
      * </ul>
-     * 
+     *
      * @since 2.0
      */
     public class JexlScriptObject {
@@ -169,7 +169,7 @@ public class JexlScriptEngine extends Ab
          * Gives access to the engine logger.
          * @return the JexlScriptEngine logger
          */
-        public Logger getLogger() {
+        public Log getLogger() {
             return LOG;
         }
     }

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
(original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ClassCreatorTest.java
Tue Dec  8 14:12:00 2015
@@ -24,8 +24,8 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -36,7 +36,7 @@ import org.junit.Test;
  */
 @SuppressWarnings({"UnnecessaryBoxing", "AssertEqualsBetweenInconvertibleTypes"})
 public class ClassCreatorTest extends JexlTestCase {
-    static final Logger logger = LogManager.getLogger(JexlTestCase.class);
+    static final Log logger = LogFactory.getLog(JexlTestCase.class);
     static final int LOOPS = 8;
     private File base = null;
     private JexlEngine jexl = null;

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/JXLTTest.java Tue Dec
 8 14:12:00 2015
@@ -17,10 +17,9 @@
 package org.apache.commons.jexl3;
 
 import org.apache.commons.jexl3.internal.TemplateDebugger;
-import org.apache.commons.jexl3.internal.TemplateEngine;
 import org.apache.commons.jexl3.internal.TemplateScript;
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.io.PrintWriter;
 import java.io.StringReader;
@@ -42,7 +41,7 @@ import org.junit.Test;
 public class JXLTTest extends JexlTestCase {
     private static final JexlEngine ENGINE = new JexlBuilder().silent(false).cache(128).strict(true).create();
     private static final JxltEngine JXLT = ENGINE.createJxltEngine();
-    private static final Logger LOG = LogManager.getLogger(JxltEngine.class);
+    private static final Log LOG = LogFactory.getLog(JxltEngine.class);
     private final MapContext vars = new MapContext();
     private JexlEvalContext context = null;
 

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
(original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java
Tue Dec  8 14:12:00 2015
@@ -16,8 +16,8 @@
  */
 package org.apache.commons.jexl3;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -31,7 +31,7 @@ import org.junit.Test;
  */
 public class ParseFailuresTest extends JexlTestCase {
 
-    static final Logger LOGGER = LogManager.getLogger(ParseFailuresTest.class.getName());
+    static final Log LOGGER = LogFactory.getLog(ParseFailuresTest.class.getName());
 
     /**
      * Create the test.

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java (original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java Tue Dec
 8 14:12:00 2015
@@ -22,17 +22,17 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
 import org.junit.Assert;
 import org.junit.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Tests local variables.
  */
 @SuppressWarnings({"UnnecessaryBoxing", "AssertEqualsBetweenInconvertibleTypes"})
 public class VarTest extends JexlTestCase {
-    static final Logger LOGGER = LogManager.getLogger(VarTest.class.getName());
+    static final Log LOGGER = LogFactory.getLog(VarTest.class.getName());
 
     public VarTest() {
         super("VarTest");

Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java?rev=1718615&r1=1718614&r2=1718615&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
(original)
+++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/introspection/SandboxTest.java
Tue Dec  8 14:12:00 2015
@@ -25,8 +25,8 @@ import org.apache.commons.jexl3.JexlTest
 import org.apache.commons.jexl3.MapContext;
 import org.apache.commons.jexl3.annotations.NoJexl;
 
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -36,7 +36,7 @@ import org.junit.Test;
  */
 @SuppressWarnings({"UnnecessaryBoxing", "AssertEqualsBetweenInconvertibleTypes"})
 public class SandboxTest extends JexlTestCase {
-    static final Logger LOGGER = LogManager.getLogger(SandboxTest.class.getName());
+    static final Log LOGGER = LogFactory.getLog(SandboxTest.class.getName());
 
     public SandboxTest() {
         super("SandboxTest");



Mime
View raw message