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
|
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:16:05.369984495 +0100
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zip/ZipContentLocation.java 2021-04-07 11:17:30.417035353 +0100
@@ -21,8 +21,7 @@
import java.util.HashMap;
import java.util.zip.ZipEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
import org.pentaho.reporting.libraries.repository.ContentCreationException;
import org.pentaho.reporting.libraries.repository.ContentEntity;
import org.pentaho.reporting.libraries.repository.ContentIOException;
@@ -35,7 +34,7 @@
public class ZipContentLocation implements ContentLocation
{
- private static final Log logger = LogFactory.getLog(ZipContentLocation.class);
+ private static final Logger logger = Logger.getLogger(ZipContentLocation.class.getName());
private ZipRepository repository;
private ZipContentLocation parent;
private String comment;
@@ -114,7 +113,7 @@
final Object entry = entries.get(path);
if (entry instanceof ContentItem)
{
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
return;
}
final ZipContentLocation location;
@@ -164,7 +163,7 @@
{
if (entry instanceof ContentItem)
{
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
return;
}
@@ -188,12 +187,12 @@
{
if (entry instanceof ContentItem)
{
- logger.warn("Duplicate Content-Entry encountered: " + path);
+ logger.warning("Duplicate Content-Entry encountered: " + path);
return;
}
else if (entry != null)
{
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
}
final ZipContentItem contentItem = new ZipContentItem(repository, this, zipEntry, data);
entries.put(path, contentItem);
@@ -352,4 +351,4 @@
{
return (entries.remove(entity.getName()) != null);
}
-}
\ No newline at end of file
+}
diff -ru librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java
--- librepository-1.1.3.orig/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:16:05.365984446 +0100
+++ librepository-1.1.3/source/org/pentaho/reporting/libraries/repository/zipreader/ZipReadContentLocation.java 2021-04-07 11:17:22.342935587 +0100
@@ -21,8 +21,7 @@
import java.util.HashMap;
import java.util.zip.ZipEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.logging.Logger;
import org.pentaho.reporting.libraries.repository.ContentCreationException;
import org.pentaho.reporting.libraries.repository.ContentEntity;
import org.pentaho.reporting.libraries.repository.ContentIOException;
@@ -39,7 +38,7 @@
*/
public class ZipReadContentLocation implements ContentLocation
{
- private static final Log logger = LogFactory.getLog(ZipReadContentLocation.class);
+ private static final Logger logger = Logger.getLogger(ZipReadContentLocation.class.getName());
private ZipReadRepository repository;
private ZipReadContentLocation parent;
private String comment;
@@ -117,7 +116,7 @@
final Object entry = entries.get(path);
if (entry instanceof ContentItem)
{
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
return;
}
final ZipReadContentLocation location;
@@ -164,7 +163,7 @@
{
if (entry instanceof ContentItem)
{
- logger.warn("Directory-Entry with the same name as a Content-Entry encountered: " + path);
+ logger.warning("Directory-Entry with the same name as a Content-Entry encountered: " + path);
return;
}
@@ -188,12 +187,12 @@
{
if (entry instanceof ContentItem)
{
- logger.warn("Duplicate Content-Entry encountered: " + path);
+ logger.warning("Duplicate Content-Entry encountered: " + path);
return;
}
else if (entry != null)
{
- logger.warn("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
+ logger.warning("Replacing Directory-Entry with the same name as a Content-Entry: " + path);
}
final ZipReadContentItem contentItem = new ZipReadContentItem(repository, this, zipEntry, data);
entries.put(path, contentItem);
|
