summaryrefslogtreecommitdiffstats
path: root/external/jfreereport/patches/libloader-1.1.3-remove-commons-logging.patch.1
blob: fad07d59ded834543e2eb6ca22607a11c73f4b5f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java	2021-04-07 10:55:58.343147414 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/DefaultResourceManagerBackend.java	2021-04-07 11:08:48.389599751 +0100
@@ -22,8 +22,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
 
@@ -34,7 +34,7 @@
  */
 public class DefaultResourceManagerBackend implements ResourceManagerBackend
 {
-  private static final Log logger = LogFactory.getLog(DefaultResourceManagerBackend.class);
+  private static final Logger logger = Logger.getLogger(DefaultResourceManagerBackend.class.getName());
 
   private ArrayList resourceLoaders;
   private ArrayList resourceBundleLoaders;
@@ -280,9 +280,9 @@
         {
           // ignore it, try the next factory ...
           exception = rex;
-          if (logger.isDebugEnabled())
+          if (logger.isLoggable(Level.CONFIG))
           {
-            logger.debug("Failed at " + fact.getClass() + ": ", rex);
+            logger.config("Failed at " + fact.getClass() + ": " + rex);
           }
         }
       }
@@ -413,7 +413,7 @@
     {
       throw new UnrecognizedLoaderException("Invalid key: No resource-loader registered for schema: " + key.getSchema());
     }
-    logger.debug("Loaded " + key);
+    logger.config("Loaded " + key);
     return loader.load(key);
   }
 
@@ -451,7 +451,7 @@
           ResourceLoader.class);
       if (loader != null)
       {
-        //Log.debug("Registering loader for " + loader.getSchema());
+        //Log.config("Registering loader for " + loader.getSchema());
         registerLoader(loader);
       }
     }
@@ -465,7 +465,7 @@
           ResourceManager.class, ResourceBundleLoader.class);
       if (loader != null)
       {
-        //Log.debug("Registering loader for " + loader.getSchema());
+        //Log.config("Registering loader for " + loader.getSchema());
         registerBundleLoader(loader);
       }
     }
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java	2021-04-07 10:55:58.342147402 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/factory/drawable/DrawableWrapper.java	2021-04-07 11:05:40.206289803 +0100
@@ -27,8 +27,8 @@
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Creation-Date: 05.12.2007, 19:15:56
@@ -37,7 +37,7 @@
  */
 public class DrawableWrapper
 {
-  private static final Log logger = LogFactory.getLog(DrawableWrapper.class);
+  private static final Logger logger = Logger.getLogger(DrawableWrapper.class.getName());
   private static final Map drawables = Collections.synchronizedMap(new HashMap());
 
   private Object backend;
@@ -67,9 +67,9 @@
           Modifier.isAbstract(modifiers) ||
           Modifier.isStatic(modifiers))
       {
-        if (logger.isWarnEnabled())
+        if (logger.isLoggable(Level.WARNING))
         {
-          logger.warn("DrawMethod is not valid: " + aClass + '#' + drawMethod);
+          logger.warning("DrawMethod is not valid: " + aClass + '#' + drawMethod);
         }
         drawMethod = null;
       }
@@ -77,9 +77,9 @@
     catch (NoSuchMethodException e)
     {
       // ignore exception
-      if (logger.isWarnEnabled())
+      if (logger.isLoggable(Level.WARNING))
       {
-        logger.warn("The object is not a drawable: " + aClass);
+        logger.warning("The object is not a drawable: " + aClass);
       }
       drawMethod = null;
     }
@@ -141,9 +141,9 @@
     }
     catch (Exception e)
     {
-      if (logger.isDebugEnabled())
+      if (logger.isLoggable(Level.CONFIG))
       {
-        logger.warn("Invoking draw failed:", e);
+        logger.warning("Invoking draw failed: " + e);
       }
     }
   }
@@ -167,9 +167,9 @@
     }
     catch (Exception e)
     {
-      if (logger.isWarnEnabled())
+      if (logger.isLoggable(Level.WARNING))
       {
-        logger.warn("Invoking getPreferredSize failed:", e);
+        logger.warning("Invoking getPreferredSize failed: " + e);
       }
       return null;
     }
@@ -193,9 +193,9 @@
     }
     catch (Exception e)
     {
-      if (logger.isWarnEnabled())
+      if (logger.isLoggable(Level.WARNING))
       {
-        logger.warn("Invoking isKeepAspectRatio failed:", e);
+        logger.warning("Invoking isKeepAspectRatio failed: " + e);
       }
       return false;
     }
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/file/FileResourceLoader.java	2021-04-07 11:03:22.711602044 +0100
@@ -24,8 +24,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
@@ -43,7 +42,7 @@
 public class FileResourceLoader implements ResourceLoader
 {
   public static final String SCHEMA_NAME = FileResourceLoader.class.getName();
-  private static final Log logger = LogFactory.getLog(FileResourceLoader.class);
+  private static final Logger logger = Logger.getLogger(FileResourceLoader.class.getName());
 
   public FileResourceLoader()
   {
@@ -210,7 +209,7 @@
     }
 
     // Log information
-    logger.debug("Serializing a File Resource Key...");
+    logger.config("Serializing a File Resource Key...");
     if (key.getParent() != null)
     {
       throw new ResourceException
@@ -224,7 +223,7 @@
       final String strIdentifier = file.getCanonicalPath();
       final String result = ResourceKeyUtils.createStringResourceKey
           (key.getSchema().toString(), strIdentifier, key.getFactoryParameters());
-      logger.debug("Serialized File Resource Key: [" + result + "]");
+      logger.config("Serialized File Resource Key: [" + result + "]");
       return result;
     }
     catch (IOException ioe)
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java	2021-04-07 10:55:58.343147414 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/raw/RawResourceLoader.java	2021-04-07 11:01:56.064538444 +0100
@@ -21,8 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java	2021-04-07 10:55:58.343147414 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/resource/ClassloaderResourceLoader.java	2021-04-07 11:03:14.370499656 +0100
@@ -21,8 +21,7 @@
 import java.util.Map;
 import java.net.URL;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
@@ -41,7 +40,7 @@
 public class ClassloaderResourceLoader implements ResourceLoader
 {
   public static final String SCHEMA_NAME = ClassloaderResourceLoader.class.getName();
-  private static final Log logger = LogFactory.getLog(ClassloaderResourceLoader.class);
+  private static final Logger logger = Logger.getLogger(ClassloaderResourceLoader.class.getName());
 
   public ClassloaderResourceLoader()
   {
@@ -197,7 +196,7 @@
     }
 
     // Log information
-    logger.debug("Serializing a Classloader Resource Key...");
+    logger.config("Serializing a Classloader Resource Key...");
     if (key.getParent() != null)
     {
       throw new ResourceException
@@ -207,7 +206,7 @@
     // Serialize the key
     final String result = ResourceKeyUtils.createStringResourceKey(key.getSchema().toString(),
         (String) key.getIdentifier(), key.getFactoryParameters());
-    logger.debug("Serialized Classloader Resource Key: [" + result + "]");
+    logger.config("Serialized Classloader Resource Key: [" + result + "]");
     return result;
   }
 
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/URLResourceLoader.java	2021-04-07 11:03:41.998838804 +0100
@@ -22,8 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
@@ -40,7 +39,7 @@
 public class URLResourceLoader implements ResourceLoader
 {
   public static final String SCHEMA_NAME = URLResourceLoader.class.getName();
-  private static final Log logger = LogFactory.getLog(URLResourceLoader.class);
+  private static final Logger logger = Logger.getLogger(URLResourceLoader.class.getName());
 
   public URLResourceLoader()
   {
@@ -188,10 +187,10 @@
     }
 
     // Log information
-    logger.debug("Serializing a Classloader Resource Key...");
+    logger.config("Serializing a Classloader Resource Key...");
     if (key.getParent() != null)
     {
-      logger.warn("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=["
+      logger.warning("Serializing a Classloader Resource Key which contains a parent: key=[" + bundleKey + "] parent=["
           + key.getParent() + "]");
     }
 
@@ -199,7 +198,7 @@
     final URL url = (URL) key.getIdentifier();
     final String result = ResourceKeyUtils.createStringResourceKey
         (key.getSchema().toString(), url.toExternalForm(), key.getFactoryParameters());
-    logger.debug("Serialized Classloader Resource Key: [" + result + "]");
+    logger.config("Serialized Classloader Resource Key: [" + result + "]");
     return result;
   }
 
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java	2021-04-07 10:55:58.344147426 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/loader/zip/ZipResourceLoader.java	2021-04-07 11:02:18.522814132 +0100
@@ -21,8 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
 import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
@@ -40,7 +39,7 @@
 public class ZipResourceLoader implements ResourceLoader
 {
   public static final String SCHEMA_NAME = ZipResourceLoader.class.getName();
-  private static final Log logger = LogFactory.getLog(ZipResourceLoader.class);
+  private static final Logger logger = Logger.getLogger(ZipResourceLoader.class.getName());
 
   public ZipResourceLoader()
   {
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java	2021-04-07 10:55:58.345147438 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHCacheModule.java	2021-04-07 10:58:52.758288370 +0100
@@ -20,8 +20,7 @@
 import org.pentaho.reporting.libraries.base.boot.AbstractModule;
 import org.pentaho.reporting.libraries.base.boot.ModuleInitializeException;
 import org.pentaho.reporting.libraries.base.boot.SubSystem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
 
 /**
  * Creation-Date: 13.04.2006, 16:29:07
@@ -30,7 +29,7 @@
  */
 public class EHCacheModule extends AbstractModule
 {
-  public static final Log CACHE_MONITOR = LogFactory.getLog(EHCacheModule.class.getName() + "#CacheLog"); 
+  public static final Logger CACHE_MONITOR = Logger.getLogger(EHCacheModule.class.getName() + "#CacheLog"); 
 
   public EHCacheModule() throws ModuleInitializeException
   {
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java	2021-04-07 10:55:58.345147438 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceFactoryCache.java	2021-04-07 10:59:17.251589016 +0100
@@ -20,8 +20,8 @@
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.resourceloader.Resource;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.cache.ResourceFactoryCache;
@@ -110,7 +109,7 @@
     }
   }
 
-  private static final Log logger = LogFactory.getLog(EHResourceFactoryCache.class);
+  private static final Logger logger = Logger.getLogger(EHResourceFactoryCache.class.getName());
   private Cache factoryCache;
 
   public EHResourceFactoryCache(final Cache factoryCache)
@@ -128,16 +128,16 @@
       final Resource res = getInternal(key, target[i]);
       if (res != null)
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Res  Cache Hit  " + key);
+          EHCacheModule.CACHE_MONITOR.config("Res  Cache Hit  " + key);
         }
         return res;
       }
     }
-    if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+    if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
     {
-      EHCacheModule.CACHE_MONITOR.debug("Res  Cache Miss  " + key);
+      EHCacheModule.CACHE_MONITOR.config("Res  Cache Miss  " + key);
     }
     return null;
   }
@@ -168,9 +168,9 @@
     }
     catch (CacheException e)
     {
-      if (logger.isDebugEnabled())
+      if (logger.isLoggable(Level.CONFIG))
       {
-        logger.debug("Failed to retrieve resource for key " + key, e);
+        logger.config("Failed to retrieve resource for key " + key + ": " + e);
       }
       return null;
     }
@@ -185,9 +185,9 @@
     }
     catch (Exception e)
     {
-      if (logger.isDebugEnabled())
+      if (logger.isLoggable(Level.CONFIG))
       {
-        logger.debug("Failed to store resource for key " + source, e);
+        logger.config("Failed to store resource for key " + source + ": " + e);
       }
       // ignore ... the object is not serializable ..
     }
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java	2021-04-07 10:55:58.342147402 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceKeyUtils.java	2021-04-07 11:06:27.248867251 +0100
@@ -27,8 +27,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.base.util.CSVQuoter;
 import org.pentaho.reporting.libraries.base.util.CSVTokenizer;
 import org.pentaho.reporting.libraries.base.util.IOUtils;
@@ -42,7 +42,7 @@
 {
   private static final String DELIMITER = ";";
   private static final String SERIALIZATION_PREFIX = "resourcekey:";
-  private static final Log logger = LogFactory.getLog(ResourceManager.class);
+  private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
 
   /**
    * Returns a string representation of the ResourceKey based on the pieces that are passed as parameters
@@ -169,7 +169,7 @@
 
       sb.append(quoter.doQuoting(entrySb.toString()));
     }
-    logger.debug("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]");
+    logger.config("Converted ResourceKey's Factory Parameters to String: [" + sb.toString() + "]");
     return sb.toString();
   }
 
@@ -226,9 +226,9 @@
       params.put(key, value);
     }
 
-    if (logger.isDebugEnabled())
+    if (logger.isLoggable(Level.CONFIG))
     {
-      logger.debug("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters
+      logger.config("Converted ResourceKey's Factory Parameter String to a Map: [" + factoryParameters
           + "] -> map of size " + params.size());
     }
     return params;
@@ -369,7 +369,7 @@
       }
       catch (IOException e)
       {
-        logger.error("Error closing input stream", e);
+        logger.severe("Error closing input stream: " + e);
       }
     }
   }
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
--- libloader-1.1.3.orig/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java	2021-04-07 10:55:58.344147426 +0100
+++ libloader-1.1.3/source/org/pentaho/reporting/libraries/resourceloader/ResourceManager.java	2021-04-07 11:07:50.557889876 +0100
@@ -22,8 +22,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.pentaho.reporting.libraries.base.config.Configuration;
 import org.pentaho.reporting.libraries.base.util.ObjectUtilities;
 import org.pentaho.reporting.libraries.resourceloader.cache.BundleCacheResourceWrapper;
@@ -57,7 +57,7 @@
  */
 public final class ResourceManager
 {
-  private static final Log logger = LogFactory.getLog(ResourceManager.class);
+  private static final Logger logger = Logger.getLogger(ResourceManager.class.getName());
   private ResourceManagerBackend backend;
 
   public static final String BUNDLE_LOADER_PREFIX = "org.pentaho.reporting.libraries.resourceloader.bundle.loader.";
@@ -273,7 +273,7 @@
     final ResourceBundleData bundle = loadResourceBundle(key);
     if (bundle != null)
     {
-      logger.debug("Loaded bundle for key " + key);
+      logger.config("Loaded bundle for key " + key);
       return bundle;
     }
     final ResourceKey parent = key.getParent();
@@ -283,7 +283,7 @@
       final ResourceBundleData parentData = loadResourceBundle(parent);
       if (parentData != null)
       {
-        logger.debug("Loaded bundle for key (derivate) " + key);
+        logger.config("Loaded bundle for key (derivate) " + key);
         return parentData.deriveData(key);
       }
     }
@@ -400,9 +400,9 @@
       newResource = backend.create(derivedManager, resourceBundleData, context, target);
       if (isResourceCacheable(newResource))
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Storing created bundle-resource for key: " + key);
+          EHCacheModule.CACHE_MONITOR.config("Storing created bundle-resource for key: " + key);
         }
         factoryCache.put(newResource);
         if (key != newResource.getSource())
@@ -412,9 +412,9 @@
       }
       else
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Created bundle-resource is not cacheable for " + key);
+          EHCacheModule.CACHE_MONITOR.config("Created bundle-resource is not cacheable for " + key);
         }
       }
     }
@@ -423,17 +423,17 @@
       newResource = backend.create(this, loadedData, context, target);
       if (isResourceCacheable(newResource))
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Storing created resource for key: " + key);
+          EHCacheModule.CACHE_MONITOR.config("Storing created resource for key: " + key);
         }
         factoryCache.put(newResource);
       }
       else
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Created resource is not cacheable for " + key);
+          EHCacheModule.CACHE_MONITOR.config("Created resource is not cacheable for " + key);
         }
       }
     }
@@ -556,7 +556,7 @@
       {
         if (failedModules.contains(dataCacheProviderClass) == false)
         {
-          logger.warn("Failed to create data cache: " + e.getLocalizedMessage());
+          logger.warning("Failed to create data cache: " + e.getLocalizedMessage());
           failedModules.add(dataCacheProviderClass);
         }
       }
@@ -593,7 +593,7 @@
         {
           if (failedModules.contains(dataCacheProviderClass) == false)
           {
-            logger.warn("Failed to create data cache: " + e.getLocalizedMessage());
+            logger.warning("Failed to create data cache: " + e.getLocalizedMessage());
             failedModules.add(dataCacheProviderClass);
           }
         }
@@ -630,7 +630,7 @@
         {
           if (failedModules.contains(cacheProviderClass) == false)
           {
-            logger.warn("Failed to create factory cache: " + e.getLocalizedMessage());
+            logger.warning("Failed to create factory cache: " + e.getLocalizedMessage());
             failedModules.add(cacheProviderClass);
           }
         }
--- a/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceBundleDataCache.java
+++ b/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceBundleDataCache.java
@@ -17,6 +17,7 @@
 
 package org.pentaho.reporting.libraries.resourceloader.modules.cache.ehcache;
 
+import java.util.logging.Level;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
@@ -64,17 +65,17 @@
       final Element element = dataCache.get((Object) key);
       if (element != null)
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Bund Cache Hit  " + key);
+          EHCacheModule.CACHE_MONITOR.config("Bund Cache Hit  " + key);
         }
         return (ResourceBundleDataCacheEntry) element.getObjectValue();
       }
       else
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Bund Cache Miss " + key);
+          EHCacheModule.CACHE_MONITOR.config("Bund Cache Miss " + key);
         }
         return null;
       }
@@ -101,9 +102,9 @@
     final Object keyObject = data.getBundleKey();
     final Object valueObject = new DefaultResourceBundleDataCacheEntry(cdata, caller);
     final Element element = new Element(keyObject, valueObject);
-    if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+    if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
     {
-      EHCacheModule.CACHE_MONITOR.debug("Storing Bundle " + keyObject);
+      EHCacheModule.CACHE_MONITOR.config("Storing Bundle " + keyObject);
     }
     dataCache.put(element);
     return cdata;
--- a/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceDataCache.java
+++ b/source/org/pentaho/reporting/libraries/resourceloader/modules/cache/ehcache/EHResourceDataCache.java
@@ -17,6 +17,7 @@
 
 package org.pentaho.reporting.libraries.resourceloader.modules.cache.ehcache;
 
+import java.util.logging.Level;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheException;
 import net.sf.ehcache.Element;
@@ -64,15 +65,15 @@
       final Element element = dataCache.get((Object) key);
       if (element != null)
       {
-        if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+        if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
         {
-          EHCacheModule.CACHE_MONITOR.debug("Data Cache Hit  " + key);
+          EHCacheModule.CACHE_MONITOR.config("Data Cache Hit  " + key);
         }
         return (ResourceDataCacheEntry) element.getObjectValue();
       }
-      if (EHCacheModule.CACHE_MONITOR.isDebugEnabled())
+      if (EHCacheModule.CACHE_MONITOR.isLoggable(Level.CONFIG))
       {
-        EHCacheModule.CACHE_MONITOR.debug("Data Cache Miss " + key);
+        EHCacheModule.CACHE_MONITOR.config("Data Cache Miss " + key);
       }
       return null;
     }