You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/09/11 20:49:16 UTC

svn commit: r1808068 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src: main/java/org/apache/uima/util/impl/ test/java/org/apache/uima/util/impl/ test/resources/org/apache/uima/util/impl/

Author: schor
Date: Mon Sep 11 20:49:16 2017
New Revision: 1808068

URL: http://svn.apache.org/viewvc?rev=1808068&view=rev
Log:
[UIMA-5556] fix logging to accomodate differences between old style {0} and new style {}.

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java Mon Sep 11 20:49:16 2017
@@ -40,6 +40,8 @@ import org.slf4j.helpers.MessageFormatte
  */
 public class JSR47Logger_impl extends Logger_common_impl {
   
+  final static private Object[] zeroLengthArray = new Object[0];
+
   /**
    * logger object from the underlying JSR-47 logging framework
    */
@@ -95,7 +97,7 @@ public class JSR47Logger_impl extends Lo
   
   @Override
   public JSR47Logger_impl getLimitedLogger(int limit) {
-    if (limit == Integer.MAX_VALUE || limit == this.limit) {
+    if (limit == Integer.MAX_VALUE || limit == this.limit_common) {
       return this;
     }
     return new JSR47Logger_impl(this, limit);
@@ -297,6 +299,11 @@ public class JSR47Logger_impl extends Lo
   }
   
   @Override
+  public void log2(Marker m, String aFqcn, Level level, String msg, Object[] args, Throwable throwable) {
+    log(m, aFqcn, level, MessageFormatter.format(msg, args).getMessage(), zeroLengthArray, throwable);
+  }
+  
+  @Override
   public String getName() {
     return logger.getName();
   }

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java Mon Sep 11 20:49:16 2017
@@ -18,6 +18,8 @@
  */
 package org.apache.uima.util.impl;
 
+import java.text.MessageFormat;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Filter.Result;
@@ -39,6 +41,7 @@ import org.slf4j.Marker;
  */
 public class Log4jLogger_impl extends Logger_common_impl {
 
+  final static private Object[] zeroLengthArray = new Object[0];
   /**
    * <p>Markers that are for marking levels not supported by log4j.
    * <p>
@@ -183,7 +186,7 @@ public class Log4jLogger_impl extends Lo
    }
    
    public Log4jLogger_impl getLimitedLogger(int aLimit) {
-     if (aLimit == Integer.MAX_VALUE || aLimit == this.limit) {
+     if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
        return this;
      }
      return new Log4jLogger_impl(this, aLimit);
@@ -300,9 +303,13 @@ public class Log4jLogger_impl extends Lo
    }
 
    public void log(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
-     logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), message, args, thrown);
+     String substituted = MessageFormat.format(message, args);  
+     logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), substituted, zeroLengthArray, thrown);
    }  
 
+   public void log2(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
+     logger.logIfEnabled(aFqcn, getLog4jLevel(level), m(m), message, args, thrown);
+   }  
    
 
    // ---------------------- 

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_common_impl.java Mon Sep 11 20:49:16 2017
@@ -88,7 +88,7 @@ public abstract class Logger_common_impl
   private int FINER_COUNT = 0;
   private int FINEST_COUNT = 0;
   
-  protected final int limit;
+  protected final int limit_common;
   private final boolean isLimited; // master switch tested first
 
   /**
@@ -99,7 +99,7 @@ public abstract class Logger_common_impl
   private boolean isAnnotatorLogger;
     
   protected Logger_common_impl(Class<?> component) {
-    this.limit = Integer.MAX_VALUE;
+    this.limit_common = Integer.MAX_VALUE;
     this.isLimited = false;
   }
   
@@ -109,7 +109,7 @@ public abstract class Logger_common_impl
    * @param limit the limit
    */
   protected Logger_common_impl(Logger_common_impl lci, int limit) {
-    this.limit = limit;
+    this.limit_common = limit;
     this.isLimited = true;
     this.isAnnotatorLogger = true;
     this.mResourceManager = lci.mResourceManager;
@@ -135,6 +135,26 @@ public abstract class Logger_common_impl
                            String message, Object[] args, Throwable throwable);
   
   /**
+   * The version of the main log call implemented by subclasses that uses {}, not {n} as the substitutable syntax.
+   * 
+   * This syntax is used by log4j, slf4j, and others.  But not used by uimaj logger basic syntax, or 
+   * Java Util Logger.
+   *
+   * This version is called by all new logging statments that don't need to be backwards compatible.
+   * e.g. logger.info, logger.error, logger.warn, etc.
+   * 
+   * @param m the marker
+   * @param aFqcn the fully qualified class name of the top-most logging class used
+   *                   to filter the stack trace to get the caller class / method info
+   * @param level the UIMA level
+   * @param message -
+   * @param args - arguments to be substituted into the message
+   * @param throwable - can be null
+   */
+  public abstract void log2(Marker m, String aFqcn, Level level,
+                           String message, Object[] args, Throwable throwable);
+  
+  /**
    * @param level the Uima Level
    * @return the Marker to use
    */
@@ -170,13 +190,13 @@ public abstract class Logger_common_impl
       return true;
     }
     switch(level.toInteger()) {
-    case Level.SEVERE_INT: if (SEVERE_COUNT >= limit) return false; SEVERE_COUNT++; return true; 
-    case Level.WARNING_INT: if (WARNING_COUNT >= limit) return false; WARNING_COUNT++; return true; 
-    case Level.INFO_INT: if (INFO_COUNT >= limit) return false; INFO_COUNT++; return true; 
-    case Level.CONFIG_INT: if (CONFIG_COUNT >= limit) return false; CONFIG_COUNT++; return true; 
-    case Level.FINE_INT: if (FINE_COUNT >= limit) return false; FINE_COUNT++; return true; 
-    case Level.FINER_INT: if (FINER_COUNT >= limit) return false; FINER_COUNT++; return true; 
-    case Level.FINEST_INT: if (FINEST_COUNT >= limit) return false; FINEST_COUNT++; return true; 
+    case Level.SEVERE_INT: if (SEVERE_COUNT >= limit_common) return false; SEVERE_COUNT++; return true; 
+    case Level.WARNING_INT: if (WARNING_COUNT >= limit_common) return false; WARNING_COUNT++; return true; 
+    case Level.INFO_INT: if (INFO_COUNT >= limit_common) return false; INFO_COUNT++; return true; 
+    case Level.CONFIG_INT: if (CONFIG_COUNT >= limit_common) return false; CONFIG_COUNT++; return true; 
+    case Level.FINE_INT: if (FINE_COUNT >= limit_common) return false; FINE_COUNT++; return true; 
+    case Level.FINER_INT: if (FINER_COUNT >= limit_common) return false; FINER_COUNT++; return true; 
+    case Level.FINEST_INT: if (FINEST_COUNT >= limit_common) return false; FINEST_COUNT++; return true; 
     }
     Misc.internalError();
     return false;
@@ -428,70 +448,70 @@ public abstract class Logger_common_impl
   @Override
   public void debug(String arg0) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) {
-      log(null, fqcnCmn, Level.DEBUG, arg0, null, null);
+      log2(null, fqcnCmn, Level.DEBUG, arg0, null, null);
     }
   }
 
   @Override
   public void debug(String arg0, Object arg1) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) { 
-      log(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1}, null);
+      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1}, null);
     }
   }
 
   @Override
   public void debug(String arg0, Object... arg1) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) { 
-      log(null, fqcnCmn, Level.DEBUG, arg0, arg1, null);
+      log2(null, fqcnCmn, Level.DEBUG, arg0, arg1, null);
     }
   }
 
   @Override
   public void debug(String arg0, Throwable arg1) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) { 
-      log(null, fqcnCmn, Level.DEBUG, arg0, null, arg1);
+      log2(null, fqcnCmn, Level.DEBUG, arg0, null, arg1);
     }
   }
 
   @Override
   public void debug(Marker arg0, String arg1) {
     if (isLoggable(Level.DEBUG, arg0) && isOK(Level.DEBUG)) {
-      log(arg0, fqcnCmn, Level.DEBUG, arg1, null, null);
+      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, null);
     }
   }
 
   @Override
   public void debug(String arg0, Object arg1, Object arg2) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) {
-      log(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1}, null);
+      log2(null, fqcnCmn, Level.DEBUG, arg0, new Object[] {arg1}, null);
     }
   }
 
   @Override
   public void debug(Marker arg0, String arg1, Object arg2) {
     if (isLoggable(Level.DEBUG, arg0) && isOK(Level.DEBUG)) {
-      log(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2}, null);
+      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2}, null);
     }
   }
 
   @Override
   public void debug(Marker arg0, String arg1, Object... arg2) {
     if (isLoggable(Level.DEBUG, arg0) && isOK(Level.DEBUG)) {
-      log(arg0, fqcnCmn, Level.DEBUG, arg1, arg2, null);
+      log2(arg0, fqcnCmn, Level.DEBUG, arg1, arg2, null);
     }
   }
 
   @Override
   public void debug(Marker arg0, String arg1, Throwable arg2) {
     if (isLoggable(Level.DEBUG, arg0) && isOK(Level.DEBUG)) {
-      log(arg0, fqcnCmn, Level.DEBUG, arg1, null, arg2);
+      log2(arg0, fqcnCmn, Level.DEBUG, arg1, null, arg2);
     }
   }
 
   @Override
   public void debug(Marker arg0, String arg1, Object arg2, Object arg3) {
     if (isLoggable(Level.DEBUG, arg0) && isOK(Level.DEBUG)) {
-      log(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2}, null);
+      log2(arg0, fqcnCmn, Level.DEBUG, arg1, new Object[] {arg2}, null);
     }
   }
 
@@ -502,7 +522,7 @@ public abstract class Logger_common_impl
    */
   public void debug(Supplier<String> msgSupplier) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) {
-      log(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
+      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
     }   
   }
  
@@ -512,7 +532,7 @@ public abstract class Logger_common_impl
    */
   public void debug(Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.DEBUG) && isOK(Level.DEBUG)) {
-      log(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
+      log2(null, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
     }   
   }
 
@@ -523,7 +543,7 @@ public abstract class Logger_common_impl
    */
   public void debug(Marker marker, String message, Supplier<?>... paramSuppliers) {
     if (isLoggable(Level.DEBUG, marker) && isOK(Level.DEBUG)) {
-      log(marker, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
+      log2(marker, fqcnCmn, Level.DEBUG, message, suppliersToArray(paramSuppliers), null);
     }  
   }
   
@@ -533,7 +553,7 @@ public abstract class Logger_common_impl
   */
  public void debug(Marker marker, Supplier<String> msgSupplier) {
    if (isLoggable(Level.DEBUG, marker) && isOK(Level.DEBUG)) {
-     log(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
+     log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, null);
    }   
  }
  
@@ -543,7 +563,7 @@ public abstract class Logger_common_impl
   */
  public void debug(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
    if (isLoggable(Level.DEBUG, marker) && isOK(Level.DEBUG)) {
-     log(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
+     log2(marker, fqcnCmn, Level.DEBUG, msgSupplier.get(), null, throwable);
    }   
  }
       
@@ -552,70 +572,70 @@ public abstract class Logger_common_impl
   @Override
   public void error(String arg0) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) {
-      log(null, fqcnCmn, Level.ERROR, arg0, null, null);
+      log2(null, fqcnCmn, Level.ERROR, arg0, null, null);
     }
   }
 
   @Override
   public void error(String arg0, Object arg1) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) { 
-      log(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1}, null);
+      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1}, null);
     }
   }
 
   @Override
   public void error(String arg0, Object... arg1) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) { 
-      log(null, fqcnCmn, Level.ERROR, arg0, arg1, null);
+      log2(null, fqcnCmn, Level.ERROR, arg0, arg1, null);
     }
   }
 
   @Override
   public void error(String arg0, Throwable arg1) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) { 
-      log(null, fqcnCmn, Level.ERROR, arg0, null, arg1);
+      log2(null, fqcnCmn, Level.ERROR, arg0, null, arg1);
     }
   }
 
   @Override
   public void error(Marker arg0, String arg1) {
     if (isLoggable(Level.ERROR, arg0) && isOK(Level.ERROR)) {
-      log(arg0, fqcnCmn, Level.ERROR, arg1, null, null);
+      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, null);
     }
   }
 
   @Override
   public void error(String arg0, Object arg1, Object arg2) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) {
-      log(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1}, null);
+      log2(null, fqcnCmn, Level.ERROR, arg0, new Object[] {arg1}, null);
     }
   }
 
   @Override
   public void error(Marker arg0, String arg1, Object arg2) {
     if (isLoggable(Level.ERROR, arg0) && isOK(Level.ERROR)) {
-      log(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2}, null);
+      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2}, null);
     }
   }
 
   @Override
   public void error(Marker arg0, String arg1, Object... arg2) {
     if (isLoggable(Level.ERROR, arg0) && isOK(Level.ERROR)) {
-      log(arg0, fqcnCmn, Level.ERROR, arg1, arg2, null);
+      log2(arg0, fqcnCmn, Level.ERROR, arg1, arg2, null);
     }
   }
 
   @Override
   public void error(Marker arg0, String arg1, Throwable arg2) {
     if (isLoggable(Level.ERROR, arg0) && isOK(Level.ERROR)) {
-      log(arg0, fqcnCmn, Level.ERROR, arg1, null, arg2);
+      log2(arg0, fqcnCmn, Level.ERROR, arg1, null, arg2);
     }
   }
 
   @Override
   public void error(Marker arg0, String arg1, Object arg2, Object arg3) {
     if (isLoggable(Level.ERROR, arg0) && isOK(Level.ERROR)) {
-      log(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2}, null);
+      log2(arg0, fqcnCmn, Level.ERROR, arg1, new Object[] {arg2}, null);
     }
   }
 
@@ -626,7 +646,7 @@ public abstract class Logger_common_impl
    */
   public void error(Supplier<String> msgSupplier) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) {
-      log(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
+      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
     }   
   }
  
@@ -636,7 +656,7 @@ public abstract class Logger_common_impl
    */
   public void error(Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.ERROR) && isOK(Level.ERROR)) {
-      log(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
+      log2(null, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
     }   
   }
 
@@ -647,7 +667,7 @@ public abstract class Logger_common_impl
    */
   public void error(Marker marker, String message, Supplier<?>... paramSuppliers) {
     if (isLoggable(Level.ERROR, marker) && isOK(Level.ERROR)) {
-      log(marker, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
+      log2(marker, fqcnCmn, Level.ERROR, message, suppliersToArray(paramSuppliers), null);
     }  
   }
   
@@ -657,7 +677,7 @@ public abstract class Logger_common_impl
   */
   public void error(Marker marker, Supplier<String> msgSupplier) {
     if (isLoggable(Level.ERROR, marker) && isOK(Level.ERROR)) {
-      log(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
+      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, null);
     }
   }
 
@@ -669,7 +689,7 @@ public abstract class Logger_common_impl
    */
   public void error(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.ERROR, marker) && isOK(Level.ERROR)) {
-      log(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
+      log2(marker, fqcnCmn, Level.ERROR, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -678,70 +698,70 @@ public abstract class Logger_common_impl
   @Override
   public void info(String arg0) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, arg0, null, null);
+      log2(null, fqcnCmn, Level.INFO, arg0, null, null);
     }
   }
 
   @Override
   public void info(String arg0, Object arg1) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void info(String arg0, Object... arg1) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, arg0, arg1, null);
+      log2(null, fqcnCmn, Level.INFO, arg0, arg1, null);
     }
   }
 
   @Override
   public void info(String arg0, Throwable arg1) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, arg0, null, arg1);
+      log2(null, fqcnCmn, Level.INFO, arg0, null, arg1);
     }
   }
 
   @Override
   public void info(Marker arg0, String arg1) {
     if (isLoggable(Level.INFO, arg0) && isOK(Level.INFO)) {
-      log(arg0, fqcnCmn, Level.INFO, arg1, null, null);
+      log2(arg0, fqcnCmn, Level.INFO, arg1, null, null);
     }
   }
 
   @Override
   public void info(String arg0, Object arg1, Object arg2) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.INFO, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void info(Marker arg0, String arg1, Object arg2) {
     if (isLoggable(Level.INFO, arg0) && isOK(Level.INFO)) {
-      log(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
     }
   }
 
   @Override
   public void info(Marker arg0, String arg1, Object... arg2) {
     if (isLoggable(Level.INFO, arg0) && isOK(Level.INFO)) {
-      log(arg0, fqcnCmn, Level.INFO, arg1, arg2, null);
+      log2(arg0, fqcnCmn, Level.INFO, arg1, arg2, null);
     }
   }
 
   @Override
   public void info(Marker arg0, String arg1, Throwable arg2) {
     if (isLoggable(Level.INFO, arg0) && isOK(Level.INFO)) {
-      log(arg0, fqcnCmn, Level.INFO, arg1, null, arg2);
+      log2(arg0, fqcnCmn, Level.INFO, arg1, null, arg2);
     }
   }
 
   @Override
   public void info(Marker arg0, String arg1, Object arg2, Object arg3) {
     if (isLoggable(Level.INFO, arg0) && isOK(Level.INFO)) {
-      log(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.INFO, arg1, new Object[] { arg2 }, null);
     }
   }
 
@@ -753,7 +773,7 @@ public abstract class Logger_common_impl
    */
   public void info(Supplier<String> msgSupplier) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
+      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
     }
   }
 
@@ -765,7 +785,7 @@ public abstract class Logger_common_impl
    */
   public void info(Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.INFO) && isOK(Level.INFO)) {
-      log(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
+      log2(null, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -780,7 +800,7 @@ public abstract class Logger_common_impl
    */
   public void info(Marker marker, String message, Supplier<?>... paramSuppliers) {
     if (isLoggable(Level.INFO, marker) && isOK(Level.INFO)) {
-      log(marker, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
+      log2(marker, fqcnCmn, Level.INFO, message, suppliersToArray(paramSuppliers), null);
     }
   }
 
@@ -792,7 +812,7 @@ public abstract class Logger_common_impl
    */
   public void info(Marker marker, Supplier<String> msgSupplier) {
     if (isLoggable(Level.INFO, marker) && isOK(Level.INFO)) {
-      log(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
+      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, null);
     }
   }
 
@@ -804,7 +824,7 @@ public abstract class Logger_common_impl
    */
   public void info(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.INFO, marker) && isOK(Level.INFO)) {
-      log(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
+      log2(marker, fqcnCmn, Level.INFO, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -813,70 +833,70 @@ public abstract class Logger_common_impl
   @Override
   public void trace(String arg0) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, arg0, null, null);
+      log2(null, fqcnCmn, Level.TRACE, arg0, null, null);
     }
   }
 
   @Override
   public void trace(String arg0, Object arg1) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void trace(String arg0, Object... arg1) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, arg0, arg1, null);
+      log2(null, fqcnCmn, Level.TRACE, arg0, arg1, null);
     }
   }
 
   @Override
   public void trace(String arg0, Throwable arg1) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, arg0, null, arg1);
+      log2(null, fqcnCmn, Level.TRACE, arg0, null, arg1);
     }
   }
 
   @Override
   public void trace(Marker arg0, String arg1) {
     if (isLoggable(Level.TRACE, arg0) && isOK(Level.TRACE)) {
-      log(arg0, fqcnCmn, Level.TRACE, arg1, null, null);
+      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, null);
     }
   }
 
   @Override
   public void trace(String arg0, Object arg1, Object arg2) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.TRACE, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void trace(Marker arg0, String arg1, Object arg2) {
     if (isLoggable(Level.TRACE, arg0) && isOK(Level.TRACE)) {
-      log(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
     }
   }
 
   @Override
   public void trace(Marker arg0, String arg1, Object... arg2) {
     if (isLoggable(Level.TRACE, arg0) && isOK(Level.TRACE)) {
-      log(arg0, fqcnCmn, Level.TRACE, arg1, arg2, null);
+      log2(arg0, fqcnCmn, Level.TRACE, arg1, arg2, null);
     }
   }
 
   @Override
   public void trace(Marker arg0, String arg1, Throwable arg2) {
     if (isLoggable(Level.TRACE, arg0) && isOK(Level.TRACE)) {
-      log(arg0, fqcnCmn, Level.TRACE, arg1, null, arg2);
+      log2(arg0, fqcnCmn, Level.TRACE, arg1, null, arg2);
     }
   }
 
   @Override
   public void trace(Marker arg0, String arg1, Object arg2, Object arg3) {
     if (isLoggable(Level.TRACE, arg0) && isOK(Level.TRACE)) {
-      log(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.TRACE, arg1, new Object[] { arg2 }, null);
     }
   }
 
@@ -888,7 +908,7 @@ public abstract class Logger_common_impl
    */
   public void trace(Supplier<String> msgSupplier) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
+      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
     }
   }
 
@@ -900,7 +920,7 @@ public abstract class Logger_common_impl
    */
   public void trace(Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.TRACE) && isOK(Level.TRACE)) {
-      log(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
+      log2(null, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -915,7 +935,7 @@ public abstract class Logger_common_impl
    */
   public void trace(Marker marker, String message, Supplier<?>... paramSuppliers) {
     if (isLoggable(Level.TRACE, marker) && isOK(Level.TRACE)) {
-      log(marker, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
+      log2(marker, fqcnCmn, Level.TRACE, message, suppliersToArray(paramSuppliers), null);
     }
   }
 
@@ -927,7 +947,7 @@ public abstract class Logger_common_impl
    */
   public void trace(Marker marker, Supplier<String> msgSupplier) {
     if (isLoggable(Level.TRACE, marker) && isOK(Level.TRACE)) {
-      log(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
+      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, null);
     }
   }
 
@@ -939,7 +959,7 @@ public abstract class Logger_common_impl
    */
   public void trace(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.TRACE, marker) && isOK(Level.TRACE)) {
-      log(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
+      log2(marker, fqcnCmn, Level.TRACE, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -947,70 +967,70 @@ public abstract class Logger_common_impl
   @Override
   public void warn(String arg0) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, arg0, null, null);
+      log2(null, fqcnCmn, Level.WARNING, arg0, null, null);
     }
   }
 
   @Override
   public void warn(String arg0, Object arg1) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void warn(String arg0, Object... arg1) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, arg0, arg1, null);
+      log2(null, fqcnCmn, Level.WARNING, arg0, arg1, null);
     }
   }
 
   @Override
   public void warn(String arg0, Throwable arg1) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, arg0, null, arg1);
+      log2(null, fqcnCmn, Level.WARNING, arg0, null, arg1);
     }
   }
 
   @Override
   public void warn(Marker arg0, String arg1) {
     if (isLoggable(Level.WARNING, arg0) && isOK(Level.WARNING)) {
-      log(arg0, fqcnCmn, Level.WARNING, arg1, null, null);
+      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, null);
     }
   }
 
   @Override
   public void warn(String arg0, Object arg1, Object arg2) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
+      log2(null, fqcnCmn, Level.WARNING, arg0, new Object[] { arg1 }, null);
     }
   }
 
   @Override
   public void warn(Marker arg0, String arg1, Object arg2) {
     if (isLoggable(Level.WARNING, arg0) && isOK(Level.WARNING)) {
-      log(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
     }
   }
 
   @Override
   public void warn(Marker arg0, String arg1, Object... arg2) {
     if (isLoggable(Level.WARNING, arg0) && isOK(Level.WARNING)) {
-      log(arg0, fqcnCmn, Level.WARNING, arg1, arg2, null);
+      log2(arg0, fqcnCmn, Level.WARNING, arg1, arg2, null);
     }
   }
 
   @Override
   public void warn(Marker arg0, String arg1, Throwable arg2) {
     if (isLoggable(Level.WARNING, arg0) && isOK(Level.WARNING)) {
-      log(arg0, fqcnCmn, Level.WARNING, arg1, null, arg2);
+      log2(arg0, fqcnCmn, Level.WARNING, arg1, null, arg2);
     }
   }
 
   @Override
   public void warn(Marker arg0, String arg1, Object arg2, Object arg3) {
     if (isLoggable(Level.WARNING, arg0) && isOK(Level.WARNING)) {
-      log(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
+      log2(arg0, fqcnCmn, Level.WARNING, arg1, new Object[] { arg2 }, null);
     }
   }
 
@@ -1022,7 +1042,7 @@ public abstract class Logger_common_impl
    */
   public void warn(Supplier<String> msgSupplier) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
+      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
     }
   }
 
@@ -1034,7 +1054,7 @@ public abstract class Logger_common_impl
    */
   public void warn(Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.WARNING) && isOK(Level.WARNING)) {
-      log(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
+      log2(null, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
     }
   }
 
@@ -1049,7 +1069,7 @@ public abstract class Logger_common_impl
    */
   public void warn(Marker marker, String message, Supplier<?>... paramSuppliers) {
     if (isLoggable(Level.WARNING, marker) && isOK(Level.WARNING)) {
-      log(marker, fqcnCmn, Level.WARNING, message, suppliersToArray(paramSuppliers), null);
+      log2(marker, fqcnCmn, Level.WARNING, message, suppliersToArray(paramSuppliers), null);
     }
   }
 
@@ -1061,7 +1081,7 @@ public abstract class Logger_common_impl
    */
   public void warn(Marker marker, Supplier<String> msgSupplier) {
     if (isLoggable(Level.WARNING, marker) && isOK(Level.WARNING)) {
-      log(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
+      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, null);
     }
   }
 
@@ -1073,7 +1093,7 @@ public abstract class Logger_common_impl
    */
   public void warn(Marker marker, Supplier<String> msgSupplier, Throwable throwable) {
     if (isLoggable(Level.WARNING, marker) && isOK(Level.WARNING)) {
-      log(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
+      log2(marker, fqcnCmn, Level.WARNING, msgSupplier.get(), null, throwable);
     }
   }
  

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java Mon Sep 11 20:49:16 2017
@@ -21,11 +21,13 @@ package org.apache.uima.util.impl;
 
 import java.io.OutputStream;
 import java.io.PrintStream;
+import java.text.MessageFormat;
 import java.util.Date;
 
 import org.apache.uima.util.Level;
 import org.apache.uima.util.Logger;
 import org.slf4j.Marker;
+import org.slf4j.helpers.MessageFormatter;
 
 /**
  * UIMA Logging interface implementation without using an logging toolkit
@@ -103,7 +105,7 @@ public class Logger_impl extends Logger_
   }
 
   public Logger_impl getLimitedLogger(int aLimit) {
-    if (aLimit == Integer.MAX_VALUE || aLimit == this.limit) {
+    if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
       return this;
     }
     return new Logger_impl(this, aLimit);
@@ -150,12 +152,24 @@ public class Logger_impl extends Logger_
     if (mOut != null) {
       mOut.print(new Date());
       mOut.print(": " + level.toString() + ": ");
-      mOut.println(message);
+      mOut.println(MessageFormat.format(message, args));
       if (null != thrown) {
         thrown.printStackTrace(mOut);
       }
     }
   }
+  
+  public void log2(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
+    if (mOut != null) {
+      mOut.print(new Date());
+      mOut.print(": " + level.toString() + ": ");
+      mOut.println(MessageFormatter.format(message, args).getMessage());
+      if (null != thrown) {
+        thrown.printStackTrace(mOut);
+      }
+    }
+  }
+
 
   /*
    * (non-Javadoc)

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java Mon Sep 11 20:49:16 2017
@@ -142,7 +142,7 @@ public class Slf4jLogger_impl extends Lo
   }
   
   public Slf4jLogger_impl getLimitedLogger(int aLimit) {
-    if (aLimit == Integer.MAX_VALUE || aLimit == this.limit) {
+    if (aLimit == Integer.MAX_VALUE || aLimit == this.limit_common) {
       return this;
     }
     return new Slf4jLogger_impl(this, aLimit);
@@ -257,6 +257,10 @@ public class Slf4jLogger_impl extends Lo
     }
   }
   
+  public void log2(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
+    log(m, aFqcn, level, message, args, thrown); 
+  }
+  
   /**
    * @return the logger name
    * @see org.slf4j.Logger#getName()

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java Mon Sep 11 20:49:16 2017
@@ -420,8 +420,7 @@ public class TestLog4jLogger_impl extend
       logger.log(Level.INFO,
             "------------------------------------------------------------");
       logger.log(Level.INFO, "My first test message");
-      logger.log(Level.INFO, "");
-      logger.log(Level.INFO, null);
-
+      logger.log(Level.INFO, "message with \"{0}\"", "substitute");
+      logger.info("message with \"{0}\"", "substitute");
    }
 }

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties?rev=1808068&r1=1808067&r2=1808068&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/resources/org/apache/uima/util/impl/logger_test_messages.properties Mon Sep 11 20:49:16 2017
@@ -17,4 +17,4 @@
 #	 * under the License.
 #	 ***************************************************************
 
-UIMA_logger_test = Exception test message
\ No newline at end of file
+UIMA_logger_test = Exception test message substitute part {0}
\ No newline at end of file