5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java	2021-04-07 10:55:58.343147414 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java	2021-04-07 11:08:48.389599751 +0100
5d58cf
@@ -22,8 +22,8 @@
5d58cf
 import java.util.Iterator;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Level;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.base.config.Configuration;
5d58cf
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
5d58cf
 
5d58cf
@@ -34,7 +34,7 @@
5d58cf
  */
5d58cf
 public class DefaultResourceManagerBackend implements ResourceManagerBackend
5d58cf
 {
5d58cf
-  private static final Log logger = LogFactory.getLog(DefaultResourceManagerBackend.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(DefaultResourceManagerBackend.class.getName());
5d58cf
 
5d58cf
   private ArrayList resourceLoaders;
5d58cf
   private ArrayList resourceBundleLoaders;
5d58cf
@@ -280,9 +280,9 @@
5d58cf
         {
5d58cf
           // ignore it, try the next factory ...
5d58cf
           exception = rex;
5d58cf
-          if (logger.isDebugEnabled())
5d58cf
+          if (logger.isLoggable(Level.CONFIG))
5d58cf
           {
5d58cf
-            logger.debug("Failed at " + fact.getClass() + ": ", rex);
5d58cf
+            logger.config("Failed at " + fact.getClass() + ": " + rex);
5d58cf
           }
5d58cf
         }
5d58cf
       }
5d58cf
@@ -413,7 +413,7 @@
5d58cf
     {
5d58cf
       throw new UnrecognizedLoaderException("Invalid key: No resource-loader registered for schema: " + key.getSchema());
5d58cf
     }
5d58cf
-    logger.debug("Loaded " + key);
5d58cf
+    logger.config("Loaded " + key);
5d58cf
     return loader.load(key);
5d58cf
   }
5d58cf
 
5d58cf
@@ -451,7 +451,7 @@
5d58cf
           ResourceLoader.class);
5d58cf
       if (loader != null)
5d58cf
       {
5d58cf
-        //Log.debug("Registering loader for " + loader.getSchema());
5d58cf
+        //Log.config("Registering loader for " + loader.getSchema());
5d58cf
         registerLoader(loader);
5d58cf
       }
5d58cf
     }
5d58cf
@@ -465,7 +465,7 @@
5d58cf
           ResourceManager.class, ResourceBundleLoader.class);
5d58cf
       if (loader != null)
5d58cf
       {
5d58cf
-        //Log.debug("Registering loader for " + loader.getSchema());
5d58cf
+        //Log.config("Registering loader for " + loader.getSchema());
5d58cf
         registerBundleLoader(loader);
5d58cf
       }
5d58cf
     }
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java	2021-04-07 10:55:58.342147402 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java	2021-04-07 11:05:40.206289803 +0100
5d58cf
@@ -27,8 +27,8 @@
5d58cf
 import java.util.Collections;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Level;
5d58cf
+import java.util.logging.Logger;
5d58cf
 
5d58cf
 /**
5d58cf
  * Creation-Date: 05.12.2007, 19:15:56
5d58cf
@@ -37,7 +37,7 @@
5d58cf
  */
5d58cf
 public class DrawableWrapper
5d58cf
 {
5d58cf
-  private static final Log logger = LogFactory.getLog(DrawableWrapper.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(DrawableWrapper.class.getName());
5d58cf
   private static final Map drawables = Collections.synchronizedMap(new HashMap());
5d58cf
 
5d58cf
   private Object backend;
5d58cf
@@ -67,9 +67,9 @@
5d58cf
           Modifier.isAbstract(modifiers) ||
5d58cf
           Modifier.isStatic(modifiers))
5d58cf
       {
5d58cf
-        if (logger.isWarnEnabled())
5d58cf
+        if (logger.isLoggable(Level.WARNING))
5d58cf
         {
5d58cf
-          logger.warn("DrawMethod is not valid: " + aClass + '#' + drawMethod);
5d58cf
+          logger.warning("DrawMethod is not valid: " + aClass + '#' + drawMethod);
5d58cf
         }
5d58cf
         drawMethod = null;
5d58cf
       }
5d58cf
@@ -77,9 +77,9 @@
5d58cf
     catch (NoSuchMethodException e)
5d58cf
     {
5d58cf
       // ignore exception
5d58cf
-      if (logger.isWarnEnabled())
5d58cf
+      if (logger.isLoggable(Level.WARNING))
5d58cf
       {
5d58cf
-        logger.warn("The object is not a drawable: " + aClass);
5d58cf
+        logger.warning("The object is not a drawable: " + aClass);
5d58cf
       }
5d58cf
       drawMethod = null;
5d58cf
     }
5d58cf
@@ -141,9 +141,9 @@
5d58cf
     }
5d58cf
     catch (Exception e)
5d58cf
     {
5d58cf
-      if (logger.isDebugEnabled())
5d58cf
+      if (logger.isLoggable(Level.CONFIG))
5d58cf
       {
5d58cf
-        logger.warn("Invoking draw failed:", e);
5d58cf
+        logger.warning("Invoking draw failed: " + e);
5d58cf
       }
5d58cf
     }
5d58cf
   }
5d58cf
@@ -167,9 +167,9 @@
5d58cf
     }
5d58cf
     catch (Exception e)
5d58cf
     {
5d58cf
-      if (logger.isWarnEnabled())
5d58cf
+      if (logger.isLoggable(Level.WARNING))
5d58cf
       {
5d58cf
-        logger.warn("Invoking getPreferredSize failed:", e);
5d58cf
+        logger.warning("Invoking getPreferredSize failed: " + e);
5d58cf
       }
5d58cf
       return null;
5d58cf
     }
5d58cf
@@ -193,9 +193,9 @@
5d58cf
     }
5d58cf
     catch (Exception e)
5d58cf
     {
5d58cf
-      if (logger.isWarnEnabled())
5d58cf
+      if (logger.isLoggable(Level.WARNING))
5d58cf
       {
5d58cf
-        logger.warn("Invoking isKeepAspectRatio failed:", e);
5d58cf
+        logger.warning("Invoking isKeepAspectRatio failed: " + e);
5d58cf
       }
5d58cf
       return false;
5d58cf
     }
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2021-04-07 11:03:22.711602044 +0100
5d58cf
@@ -24,8 +24,7 @@
5d58cf
 import java.util.HashMap;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
5d58cf
@@ -43,7 +42,7 @@
5d58cf
 public class FileResourceLoader implements ResourceLoader
5d58cf
 {
5d58cf
   public static final String SCHEMA_NAME = FileResourceLoader.class.getName();
5d58cf
-  private static final Log logger = LogFactory.getLog(FileResourceLoader.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(FileResourceLoader.class.getName());
5d58cf
 
5d58cf
   public FileResourceLoader()
5d58cf
   {
5d58cf
@@ -210,7 +209,7 @@
5d58cf
     }
5d58cf
 
5d58cf
     // Log information
5d58cf
-    logger.debug("Serializing a File Resource Key...");
5d58cf
+    logger.config("Serializing a File Resource Key...");
5d58cf
     if (key.getParent() != null)
5d58cf
     {
5d58cf
       throw new ResourceException
5d58cf
@@ -224,7 +223,7 @@
5d58cf
       final String strIdentifier = file.getCanonicalPath();
5d58cf
       final String result = ResourceKeyUtils.createStringResourceKey
5d58cf
           (key.getSchema().toString(), strIdentifier, key.getFactoryParameters());
5d58cf
-      logger.debug("Serialized File Resource Key: [" + result + "]");
5d58cf
+      logger.config("Serialized File Resource Key: [" + result + "]");
5d58cf
       return result;
5d58cf
     }
5d58cf
     catch (IOException ioe)
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java	2021-04-07 10:55:58.343147414 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java	2021-04-07 11:01:56.064538444 +0100
5d58cf
@@ -21,8 +21,7 @@
5d58cf
 import java.util.HashMap;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java	2021-04-07 10:55:58.343147414 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java	2021-04-07 11:03:14.370499656 +0100
5d58cf
@@ -21,8 +21,7 @@
5d58cf
 import java.util.Map;
5d58cf
 import java.net.URL;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
5d58cf
@@ -41,7 +40,7 @@
5d58cf
 public class ClassloaderResourceLoader implements ResourceLoader
5d58cf
 {
5d58cf
   public static final String SCHEMA_NAME = ClassloaderResourceLoader.class.getName();
5d58cf
-  private static final Log logger = LogFactory.getLog(ClassloaderResourceLoader.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(ClassloaderResourceLoader.class.getName());
5d58cf
 
5d58cf
   public ClassloaderResourceLoader()
5d58cf
   {
5d58cf
@@ -197,7 +196,7 @@
5d58cf
     }
5d58cf
 
5d58cf
     // Log information
5d58cf
-    logger.debug("Serializing a Classloader Resource Key...");
5d58cf
+    logger.config("Serializing a Classloader Resource Key...");
5d58cf
     if (key.getParent() != null)
5d58cf
     {
5d58cf
       throw new ResourceException
5d58cf
@@ -207,7 +206,7 @@
5d58cf
     // Serialize the key
5d58cf
     final String result = ResourceKeyUtils.createStringResourceKey(key.getSchema().toString(),
5d58cf
         (String) key.getIdentifier(), key.getFactoryParameters());
5d58cf
-    logger.debug("Serialized Classloader Resource Key: [" + result + "]");
5d58cf
+    logger.config("Serialized Classloader Resource Key: [" + result + "]");
5d58cf
     return result;
5d58cf
   }
5d58cf
 
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java	2021-04-07 11:03:41.998838804 +0100
5d58cf
@@ -22,8 +22,7 @@
5d58cf
 import java.util.HashMap;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
5d58cf
@@ -40,7 +39,7 @@
5d58cf
 public class URLResourceLoader implements ResourceLoader
5d58cf
 {
5d58cf
   public static final String SCHEMA_NAME = URLResourceLoader.class.getName();
5d58cf
-  private static final Log logger = LogFactory.getLog(URLResourceLoader.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(URLResourceLoader.class.getName());
5d58cf
 
5d58cf
   public URLResourceLoader()
5d58cf
   {
5d58cf
@@ -188,10 +187,10 @@
5d58cf
     }
5d58cf
 
5d58cf
     // Log information
5d58cf
-    logger.debug("Serializing a Classloader Resource Key...");
5d58cf
+    logger.config("Serializing a Classloader Resource Key...");
5d58cf
     if (key.getParent() != null)
5d58cf
     {
5d58cf
-      logger.warn("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=["
5d58cf
+      logger.warning("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=["
5d58cf
           + key.getParent() + "]");
5d58cf
     }
5d58cf
 
5d58cf
@@ -199,7 +198,7 @@
5d58cf
     final URL url = (URL) key.getIdentifier();
5d58cf
     final String result = ResourceKeyUtils.createStringResourceKey
5d58cf
         (key.getSchema().toString(), url.toExternalForm(), key.getFactoryParameters());
5d58cf
-    logger.debug("Serialized Classloader Resource Key: [" + result + "]");
5d58cf
+    logger.config("Serialized Classloader Resource Key: [" + result + "]");
5d58cf
     return result;
5d58cf
   }
5d58cf
 
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java	2021-04-07 11:02:18.522814132 +0100
5d58cf
@@ -21,8 +21,7 @@
5d58cf
 import java.util.HashMap;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
@@ -40,7 +39,7 @@
5d58cf
 public class ZipResourceLoader implements ResourceLoader
5d58cf
 {
5d58cf
   public static final String SCHEMA_NAME = ZipResourceLoader.class.getName();
5d58cf
-  private static final Log logger = LogFactory.getLog(ZipResourceLoader.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(ZipResourceLoader.class.getName());
5d58cf
 
5d58cf
   public ZipResourceLoader()
5d58cf
   {
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java	2021-04-07 10:55:58.345147438 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java	2021-04-07 10:58:52.758288370 +0100
5d58cf
@@ -20,8 +20,7 @@
5d58cf
 import org.pentaho.reporting.libraries.base.boot.AbstractModule;
5d58cf
 import org.pentaho.reporting.libraries.base.boot.ModuleInitializeException;
5d58cf
 import org.pentaho.reporting.libraries.base.boot.SubSystem;
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 
5d58cf
 /**
5d58cf
  * Creation-Date: 13.04.2006, 16:29:07
5d58cf
@@ -30,7 +29,7 @@
5d58cf
  */
5d58cf
 public class EHCacheModule extends AbstractModule
5d58cf
 {
5d58cf
-  public static final Log CACHE_MONITOR = LogFactory.getLog(EHCacheModule.class.getName() + "#CacheLog"); 
5d58cf
+  public static final Logger CACHE_MONITOR = Logger.getLogger(EHCacheModule.class.getName() + "#CacheLog"); 
5d58cf
 
5d58cf
   public EHCacheModule() throws ModuleInitializeException
5d58cf
   {
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java	2021-04-07 10:55:58.345147438 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java	2021-04-07 10:59:17.251589016 +0100
5d58cf
@@ -20,8 +20,7 @@
5d58cf
 import net.sf.ehcache.Cache;
5d58cf
 import net.sf.ehcache.CacheException;
5d58cf
 import net.sf.ehcache.Element;
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.Resource;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.cache.ResourceFactoryCache;
5d58cf
@@ -110,7 +109,7 @@
5d58cf
     }
5d58cf
   }
5d58cf
 
5d58cf
-  private static final Log logger = LogFactory.getLog(EHResourceFactoryCache.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(EHResourceFactoryCache.class.getName());
5d58cf
   private Cache factoryCache;
5d58cf
 
5d58cf
   public EHResourceFactoryCache(final Cache factoryCache)
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java	2021-04-07 10:55:58.342147402 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java	2021-04-07 11:06:27.248867251 +0100
5d58cf
@@ -27,8 +27,8 @@
5d58cf
 import java.util.Iterator;
5d58cf
 import java.util.Map;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Level;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.base.util.CSVQuoter;
5d58cf
 import org.pentaho.reporting.libraries.base.util.CSVTokenizer;
5d58cf
 import org.pentaho.reporting.libraries.base.util.IOUtils;
5d58cf
@@ -42,7 +42,7 @@
5d58cf
 {
5d58cf
   private static final String DELIMITER = ";";
5d58cf
   private static final String SERIALIZATION_PREFIX = "resourcekey:";
5d58cf
-  private static final Log logger = LogFactory.getLog(ResourceManager.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
5d58cf
 
5d58cf
   /**
5d58cf
    * Returns a string representation of the ResourceKey based on the pieces that are passed as parameters
5d58cf
@@ -169,7 +169,7 @@
5d58cf
 
5d58cf
       sb.append(quoter.doQuoting(entrySb.toString()));
5d58cf
     }
5d58cf
-    logger.debug("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]");
5d58cf
+    logger.config("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]");
5d58cf
     return sb.toString();
5d58cf
   }
5d58cf
 
5d58cf
@@ -226,9 +226,9 @@
5d58cf
       params.put(key, value);
5d58cf
     }
5d58cf
 
5d58cf
-    if (logger.isDebugEnabled())
5d58cf
+    if (logger.isLoggable(Level.CONFIG))
5d58cf
     {
5d58cf
-      logger.debug("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters
5d58cf
+      logger.config("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters
5d58cf
           + "] -> map of size " + params.size());
5d58cf
     }
5d58cf
     return params;
5d58cf
@@ -369,7 +369,7 @@
5d58cf
       }
5d58cf
       catch (IOException e)
5d58cf
       {
5d58cf
-        logger.error("Error closing input stream", e);
5d58cf
+        logger.severe("Error closing input stream: " + e);
5d58cf
       }
5d58cf
     }
5d58cf
   }
5d58cf
diff -ru libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java
5d58cf
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java	2021-04-07 10:55:58.344147426 +0100
5d58cf
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java	2021-04-07 11:07:50.557889876 +0100
5d58cf
@@ -22,8 +22,8 @@
5d58cf
 import java.util.Map;
5d58cf
 import java.util.Set;
5d58cf
 
5d58cf
-import org.apache.commons.logging.Log;
5d58cf
-import org.apache.commons.logging.LogFactory;
5d58cf
+import java.util.logging.Level;
5d58cf
+import java.util.logging.Logger;
5d58cf
 import org.pentaho.reporting.libraries.base.config.Configuration;
5d58cf
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
5d58cf
 import org.pentaho.reporting.libraries.resourceloader.cache.BundleCacheResourceWrapper;
5d58cf
@@ -57,7 +57,7 @@
5d58cf
  */
5d58cf
 public final class ResourceManager
5d58cf
 {
5d58cf
-  private static final Log logger = LogFactory.getLog(ResourceManager.class);
5d58cf
+  private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
5d58cf
   private ResourceManagerBackend backend;
5d58cf
 
5d58cf
   public static final String BUNDLE_LOADER_PREFIX = "org.pentaho.reporting.libraries.resourceloader.bundle.loader.";
5d58cf
@@ -273,7 +273,7 @@
5d58cf
     final ResourceBundleData bundle = loadResourceBundle(key);
5d58cf
     if (bundle != null)
5d58cf
     {
5d58cf
-      logger.debug("Loaded bundle for key " + key);
5d58cf
+      logger.config("Loaded bundle for key " + key);
5d58cf
       return bundle;
5d58cf
     }
5d58cf
     final ResourceKey parent = key.getParent();
5d58cf
@@ -283,7 +283,7 @@
5d58cf
       final ResourceBundleData parentData = loadResourceBundle(parent);
5d58cf
       if (parentData != null)
5d58cf
       {
5d58cf
-        logger.debug("Loaded bundle for key (derivate) " + key);
5d58cf
+        logger.config("Loaded bundle for key (derivate) " + key);
5d58cf
         return parentData.deriveData(key);
5d58cf
       }
5d58cf
     }
5d58cf
@@ -400,9 +400,9 @@
5d58cf
       newResource = backend.create(derivedManager, resourceBundleData, context, target);
5d58cf
       if (isResourceCacheable(newResource))
5d58cf
       {
5d58cf
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
5d58cf
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
5d58cf
         {
5d58cf
-          EHCacheModule.CACHE_MONITOR.debug("Storing created bundle-resource for key: " + key);
5d58cf
+          EHCacheModule.CACHE_MONITOR.config("Storing created bundle-resource for key: " + key);
5d58cf
         }
5d58cf
         factoryCache.put(newResource);
5d58cf
         if (key != newResource.getSource())
5d58cf
@@ -412,9 +412,9 @@
5d58cf
       }
5d58cf
       else
5d58cf
       {
5d58cf
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
5d58cf
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
5d58cf
         {
5d58cf
-          EHCacheModule.CACHE_MONITOR.debug("Created bundle-resource is not cacheable for " + key);
5d58cf
+          EHCacheModule.CACHE_MONITOR.config("Created bundle-resource is not cacheable for " + key);
5d58cf
         }
5d58cf
       }
5d58cf
     }
5d58cf
@@ -423,17 +423,17 @@
5d58cf
       newResource = backend.create(this, loadedData, context, target);
5d58cf
       if (isResourceCacheable(newResource))
5d58cf
       {
5d58cf
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
5d58cf
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
5d58cf
         {
5d58cf
-          EHCacheModule.CACHE_MONITOR.debug("Storing created resource for key: " + key);
5d58cf
+          EHCacheModule.CACHE_MONITOR.config("Storing created resource for key: " + key);
5d58cf
         }
5d58cf
         factoryCache.put(newResource);
5d58cf
       }
5d58cf
       else
5d58cf
       {
5d58cf
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
5d58cf
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
5d58cf
         {
5d58cf
-          EHCacheModule.CACHE_MONITOR.debug("Created resource is not cacheable for " + key);
5d58cf
+          EHCacheModule.CACHE_MONITOR.config("Created resource is not cacheable for " + key);
5d58cf
         }
5d58cf
       }
5d58cf
     }
5d58cf
@@ -556,7 +556,7 @@
5d58cf
       {
5d58cf
         if (failedModules.contains(dataCacheProviderClass) == false)
5d58cf
         {
5d58cf
-          logger.warn("Failed to create data cache: " + e.getLocalizedMessage());
5d58cf
+          logger.warning("Failed to create data cache: " + e.getLocalizedMessage());
5d58cf
           failedModules.add(dataCacheProviderClass);
5d58cf
         }
5d58cf
       }
5d58cf
@@ -593,7 +593,7 @@
5d58cf
         {
5d58cf
           if (failedModules.contains(dataCacheProviderClass) == false)
5d58cf
           {
5d58cf
-            logger.warn("Failed to create data cache: " + e.getLocalizedMessage());
5d58cf
+            logger.warning("Failed to create data cache: " + e.getLocalizedMessage());
5d58cf
             failedModules.add(dataCacheProviderClass);
5d58cf
           }
5d58cf
         }
5d58cf
@@ -630,7 +630,7 @@
5d58cf
         {
5d58cf
           if (failedModules.contains(cacheProviderClass) == false)
5d58cf
           {
5d58cf
-            logger.warn("Failed to create factory cache: " + e.getLocalizedMessage());
5d58cf
+            logger.warning("Failed to create factory cache: " + e.getLocalizedMessage());
5d58cf
             failedModules.add(cacheProviderClass);
5d58cf
           }
5d58cf
         }