diff options
Diffstat (limited to 'poi-scratchpad/src/main')
84 files changed, 169 insertions, 169 deletions
diff --git a/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java index 5bd8783294..28b8e0e934 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.stream.StreamSupport; import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.extractor.ExtractorFactory; import org.apache.poi.extractor.ExtractorProvider; import org.apache.poi.extractor.POIOLE2TextExtractor; @@ -58,7 +58,7 @@ import org.apache.poi.sl.usermodel.SlideShowFactory; */ @SuppressWarnings("WeakerAccess") public class OLE2ScratchpadExtractorFactory implements ExtractorProvider { - private static final Logger LOG = LogManager.getLogger(OLE2ScratchpadExtractorFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(OLE2ScratchpadExtractorFactory.class); private static final String[] OUTLOOK_ENTRY_NAMES = { // message bodies, saved as plain text (PtypString) diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java index b85592f112..edf45af7b7 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java @@ -19,8 +19,8 @@ package org.apache.poi.hdgf.chunks; import java.util.ArrayList; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.ChunkFactory.CommandDefinition; import org.apache.poi.util.LittleEndian; @@ -31,7 +31,7 @@ import static org.apache.logging.log4j.util.Unbox.box; */ public final class Chunk { /** For logging warnings about the structure of the file */ - private static final Logger LOG = LogManager.getLogger(Chunk.class); + private static final Logger LOG = PoiLogManager.getLogger(Chunk.class); /** * The contents of the chunk, excluding the header, diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java index 03f13b452f..04e67c2a20 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LocaleUtil; @@ -61,7 +61,7 @@ public final class ChunkFactory { "/org/apache/poi/hdgf/chunks_parse_cmds.tbl"; /** For logging problems we spot with the file */ - private static final Logger LOG = LogManager.getLogger(ChunkFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(ChunkFactory.class); /** * @param length the max record length allowed for ChunkFactory diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java index b1c10ae3e7..82be5c17a8 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java @@ -19,8 +19,8 @@ package org.apache.poi.hdgf.streams; import java.util.ArrayList; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.Chunk; import org.apache.poi.hdgf.chunks.ChunkFactory; import org.apache.poi.hdgf.chunks.ChunkHeader; @@ -29,7 +29,7 @@ import org.apache.poi.hdgf.pointers.Pointer; import static org.apache.logging.log4j.util.Unbox.box; public final class ChunkStream extends Stream { - private static final Logger LOG = LogManager.getLogger(ChunkStream.class); + private static final Logger LOG = PoiLogManager.getLogger(ChunkStream.class); private final ChunkFactory chunkFactory; /** All the Chunks we contain */ diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java index 62817dd2c1..d783490f1f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java @@ -17,8 +17,8 @@ package org.apache.poi.hdgf.streams; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.ChunkFactory; import org.apache.poi.hdgf.pointers.Pointer; import org.apache.poi.hdgf.pointers.PointerFactory; @@ -28,7 +28,7 @@ import org.apache.poi.hdgf.pointers.PointerFactory; * other data too. */ public class PointerContainingStream extends Stream { // TODO - instantiable superclass - private static final Logger LOG = LogManager.getLogger(PointerContainingStream.class); + private static final Logger LOG = PoiLogManager.getLogger(PointerContainingStream.class); private static final int MAX_CHILDREN_NESTING = 500; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java index 692bf4ee25..04f37e409f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java @@ -31,8 +31,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hemf.draw.HemfGraphics; import org.apache.poi.hemf.draw.HemfGraphics.EmfRenderState; @@ -55,7 +55,7 @@ import org.apache.poi.util.RecordFormatException; */ @Internal public class HemfComment { - private static final Logger LOG = LogManager.getLogger(HemfComment.class); + private static final Logger LOG = PoiLogManager.getLogger(HemfComment.class); public enum HemfCommentRecordType { emfGeneric(-1, EmfCommentDataGeneric::new, false), diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java index 59d7be584d..c267bd82ed 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java @@ -23,8 +23,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hpsf.Filetime; @@ -42,7 +42,7 @@ import org.apache.poi.util.LocaleUtil; * @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a> */ public final class MAPIDateAttribute extends MAPIAttribute { - private static final Logger LOG = LogManager.getLogger(MAPIDateAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(MAPIDateAttribute.class); private final Date data; /** diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java index 9ad7a09997..c30ec513cb 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java @@ -19,8 +19,8 @@ package org.apache.poi.hmef.attribute; import java.nio.charset.Charset; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hsmf.datatypes.MAPIProperty; @@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; * to a {@link HMEFMessage} or one of its {@link Attachment}s. */ public final class MAPIStringAttribute extends MAPIAttribute { - private static final Logger LOG = LogManager.getLogger(MAPIStringAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(MAPIStringAttribute.class); private static final String CODEPAGE = "CP1252"; private final String data; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java index 1c64dbe3c1..ea6382b461 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java @@ -26,8 +26,8 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hpsf.Filetime; @@ -39,7 +39,7 @@ import org.apache.poi.util.LocaleUtil; * or one of its {@link Attachment}s. */ public final class TNEFDateAttribute extends TNEFAttribute { - private static final Logger LOG = LogManager.getLogger(TNEFDateAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(TNEFDateAttribute.class); private final Date data; /** diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java index d42feaa51a..c403754edb 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java @@ -20,8 +20,8 @@ package org.apache.poi.hmef.attribute; import java.io.IOException; import java.io.InputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.util.StringUtil; @@ -31,7 +31,7 @@ import org.apache.poi.util.StringUtil; * or one of its {@link Attachment}s. */ public final class TNEFStringAttribute extends TNEFAttribute { - private static final Logger LOG = LogManager.getLogger(TNEFStringAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(TNEFStringAttribute.class); private final String data; /** diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java index cd571679c2..74d766fbdc 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java @@ -19,8 +19,8 @@ package org.apache.poi.hpbf.model; import java.io.IOException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpbf.model.qcbits.QCBit; import org.apache.poi.hpbf.model.qcbits.QCPLCBit; import org.apache.poi.hpbf.model.qcbits.QCTextBit; @@ -34,7 +34,7 @@ import org.apache.poi.util.LocaleUtil; * Read Quill Contents (/Quill/QuillSub/CONTENTS) from an HPBF (Publisher .pub) document */ public final class QuillContents extends HPBFPart { - private static final Logger LOG = LogManager.getLogger(QuillContents.class); + private static final Logger LOG = PoiLogManager.getLogger(QuillContents.class); private static final String[] PATH = { "Quill", "QuillSub", "CONTENTS", }; private final QCBit[] bits; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java index fdc23e9e3e..69c6b766b6 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java @@ -28,8 +28,8 @@ import java.util.zip.InflaterInputStream; import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.exceptions.HSLFException; @@ -44,7 +44,7 @@ import org.apache.poi.util.Units; * Represents Macintosh PICT picture data. */ public final class PICT extends Metafile { - private static final Logger LOG = LogManager.getLogger(PICT.class); + private static final Logger LOG = PoiLogManager.getLogger(PICT.class); /** * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java index cc64c4c82f..adeb643ae4 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java @@ -20,8 +20,8 @@ package org.apache.poi.hslf.model; import java.io.IOException; import java.util.ServiceLoader; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherComplexProperty; import org.apache.poi.ddf.EscherPropertyTypes; @@ -42,7 +42,7 @@ public class HSLFMetroShape< S extends Shape<S,P>, P extends TextParagraph<S,P,? extends TextRun> > { - private static final Logger LOGGER = LogManager.getLogger(HSLFMetroShape.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSLFMetroShape.class); private final HSLFShape shape; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java index 25418fe8e0..2e9b131850 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java @@ -22,8 +22,8 @@ import static org.apache.poi.util.GenericRecordUtil.getBitsAsString; import java.util.Map; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.poi.util.GenericRecordUtil; @@ -35,7 +35,7 @@ import org.apache.poi.util.GenericRecordUtil; * (but related) properties */ public abstract class BitMaskTextProp extends TextProp { - protected static final Logger LOG = LogManager.getLogger(BitMaskTextProp.class); + protected static final Logger LOG = PoiLogManager.getLogger(BitMaskTextProp.class); private final String[] subPropNames; private final int[] subPropMasks; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java index fa9618483f..d1f10ee72e 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java @@ -29,8 +29,8 @@ import java.util.Objects; import java.util.function.Supplier; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hslf.exceptions.HSLFException; @@ -45,7 +45,7 @@ import org.apache.poi.util.LittleEndian; * properties, and the indent level if required. */ public class TextPropCollection implements GenericRecord, Duplicatable { - private static final Logger LOG = LogManager.getLogger(TextPropCollection.class); + private static final Logger LOG = PoiLogManager.getLogger(TextPropCollection.class); /** All the different kinds of paragraph properties we might handle */ private static final TextProp[] paragraphTextPropTypes = { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java index 8f6cdd9aa2..27e79a0fd3 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java @@ -29,8 +29,8 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; import org.apache.poi.hslf.exceptions.OldPowerPointFormatException; import org.apache.poi.poifs.filesystem.DirectoryNode; @@ -47,7 +47,7 @@ import org.apache.poi.util.StringUtil; * document. As such, it has to be treated specially */ public class CurrentUserAtom { - private static final Logger LOG = LogManager.getLogger(CurrentUserAtom.class); + private static final Logger LOG = PoiLogManager.getLogger(CurrentUserAtom.class); /** Standard Atom header */ private static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 }; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java index 92088abca5..b884479dd4 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java @@ -20,8 +20,8 @@ package org.apache.poi.hslf.record; import java.util.Map; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherRecord; import org.apache.poi.ddf.EscherRecordFactory; import org.apache.poi.ddf.EscherSerializationListener; @@ -34,7 +34,7 @@ import org.apache.poi.util.LittleEndian; * the slide layout as specified in the SlideAtom record. */ public class EscherPlaceholder extends EscherRecord { - private static final Logger LOG = LogManager.getLogger(EscherPlaceholder.class); + private static final Logger LOG = PoiLogManager.getLogger(EscherPlaceholder.class); public static final short RECORD_ID = RecordTypes.OEPlaceholderAtom.typeID; public static final String RECORD_DESCRIPTION = "msofbtClientTextboxPlaceholder"; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java index f1ad6045f1..33907c3ff7 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.logging.log4j.message.StringFormattedMessage; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; @@ -43,7 +43,7 @@ import static org.apache.logging.log4j.util.Unbox.box; public abstract class Record implements GenericRecord { // For logging - protected static final Logger LOG = LogManager.getLogger(Record.class); + protected static final Logger LOG = PoiLogManager.getLogger(Record.class); /** * Is this record type an Atom record (only has data), diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java index 610ad27c39..04e8b78d1d 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java @@ -26,8 +26,8 @@ import java.util.Map; import java.util.function.Supplier; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.exceptions.HSLFException; import org.apache.poi.hslf.model.textproperties.TextPropCollection; import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType; @@ -53,7 +53,7 @@ import org.apache.poi.util.LittleEndianOutputStream; * </p> */ public final class TxMasterStyleAtom extends RecordAtom { - private static final Logger LOG = LogManager.getLogger(TxMasterStyleAtom.class); + private static final Logger LOG = PoiLogManager.getLogger(TxMasterStyleAtom.class); /** * Maximum number of indentation levels allowed in PowerPoint documents diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java index c02561d8c7..20417dd464 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java @@ -26,8 +26,8 @@ import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.Iterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherContainerRecord; @@ -57,7 +57,7 @@ import org.apache.poi.util.LittleEndian; * See {@link ShapeTypes} */ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFAutoShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFAutoShape.class); static final byte[] SEGMENTINFO_MOVETO = new byte[]{0x00, 0x40}; static final byte[] SEGMENTINFO_LINETO = new byte[]{0x00, (byte)0xAC}; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java index 14ceaa5e6a..3f9f84b6d6 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherBSERecord; @@ -56,7 +56,7 @@ import static org.apache.logging.log4j.util.Unbox.box; */ @SuppressWarnings("WeakerAccess") public final class HSLFFill { - private static final Logger LOG = LogManager.getLogger(HSLFFill.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFFill.class); /** * Fill with a solid color diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java index 0a3bcc91bb..63b27582d9 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java @@ -25,8 +25,8 @@ import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherContainerRecord; @@ -49,7 +49,7 @@ import static org.apache.logging.log4j.util.Unbox.box; * </p> */ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFFreeformShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFFreeformShape.class); enum ShapePath { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java index 49b2d4bc62..ffb1cbfe4f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Spliterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherChildAnchorRecord; import org.apache.poi.ddf.EscherClientAnchorRecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -43,7 +43,7 @@ import org.apache.poi.util.Units; */ public class HSLFGroupShape extends HSLFShape implements HSLFShapeContainer, GroupShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFGroupShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFGroupShape.class); /** * Create a new ShapeGroup. This constructor is used when a new shape is created. diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java index baca28cd5d..3d98cf70d0 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java @@ -20,8 +20,8 @@ package org.apache.poi.hslf.usermodel; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.model.HeadersFooters; import org.apache.poi.hslf.record.HeadersFootersContainer; import org.apache.poi.sl.usermodel.Notes; @@ -34,7 +34,7 @@ import org.apache.poi.sl.usermodel.Placeholder; */ public final class HSLFNotes extends HSLFSheet implements Notes<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFNotes.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFNotes.class); private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java index 4739ddb907..096e9be336 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java @@ -23,8 +23,8 @@ import java.io.OutputStream; import org.apache.commons.io.output.AbstractByteArrayOutputStream; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.ddf.EscherPropertyTypes; import org.apache.poi.ddf.EscherSpRecord; @@ -47,7 +47,7 @@ import org.apache.poi.sl.usermodel.ShapeContainer; * A shape representing embedded OLE object. */ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFObjectShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFObjectShape.class); private ExEmbed _exEmbed; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java index cfb44383b9..98cdcbad9f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -55,7 +55,7 @@ import org.apache.poi.util.Units; */ public abstract class HSLFPictureData implements PictureData, GenericRecord { - private static final Logger LOGGER = LogManager.getLogger(HSLFPictureData.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSLFPictureData.class); /** * Size of the image checksum calculated using MD5 algorithm. diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java index 416fe4147b..1340d01821 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java @@ -21,8 +21,8 @@ import java.awt.Insets; import java.awt.geom.Rectangle2D; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherComplexProperty; @@ -45,7 +45,7 @@ import static org.apache.logging.log4j.util.Unbox.box; * Represents a picture in a PowerPoint document. */ public class HSLFPictureShape extends HSLFSimpleShape implements PictureShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFPictureShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFPictureShape.class); /** * Create a new <code>Picture</code> diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java index 007259230f..dca66b799a 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java @@ -23,8 +23,8 @@ import java.awt.geom.Rectangle2D; import java.util.Iterator; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherChildAnchorRecord; import org.apache.poi.ddf.EscherClientAnchorRecord; @@ -66,7 +66,7 @@ import org.apache.poi.util.Units; * in points (72 points = 1 inch). */ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFShape.class); /** * Either EscherSpContainer or EscheSpgrContainer record diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java index 9993a9e357..c97750cdfc 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java @@ -19,8 +19,8 @@ package org.apache.poi.hslf.usermodel; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherClientDataRecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -49,7 +49,7 @@ import org.apache.poi.util.RecordFormatException; */ public final class HSLFShapeFactory { // For logging - private static final Logger LOG = LogManager.getLogger(HSLFShapeFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFShapeFactory.class); /** * Create a new shape from the data provided. diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java index cc9932a61c..da930b6899 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java @@ -19,8 +19,8 @@ package org.apache.poi.hslf.usermodel; import java.awt.Color; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherChildAnchorRecord; import org.apache.poi.ddf.EscherClientAnchorRecord; @@ -58,7 +58,7 @@ import org.apache.poi.util.Units; * This is the parent class for all primitive shapes like Line, Rectangle, etc. */ public abstract class HSLFSimpleShape extends HSLFShape implements SimpleShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFSimpleShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFSimpleShape.class); public static final double DEFAULT_LINE_WIDTH = 0.75; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java index 99888a49a2..ffea9a6f5e 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java @@ -35,8 +35,8 @@ import java.util.Map; import java.util.function.Supplier; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.POIDocument; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.common.usermodel.fonts.FontInfo; @@ -83,7 +83,7 @@ public final class HSLFSlideShow extends POIDocument implements SlideShow<HSLFSh public static final String PP95_DOCUMENT = "PP40"; // For logging - private static final Logger LOG = LogManager.getLogger(HSLFSlideShow.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFSlideShow.class); //arbitrarily selected; may need to increase private static final int DEFAULT_MAX_RECORD_LENGTH = 10_000_000; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java index 29f76442e8..0f34562aaf 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java @@ -47,8 +47,8 @@ import java.util.stream.Collectors; import org.apache.commons.collections4.IteratorUtils; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.POIDocument; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -86,7 +86,7 @@ import org.apache.poi.util.LittleEndianConsts; * "reader". It is only a very basic class for now */ public final class HSLFSlideShowImpl extends POIDocument implements Closeable { - private static final Logger LOG = LogManager.getLogger(HSLFSlideShowImpl.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFSlideShowImpl.class); static final int UNSET_OFFSET = -1; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java index 4e9c89dd37..f010e3d331 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java @@ -30,8 +30,8 @@ import java.util.Spliterator; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.fonts.FontGroup; import org.apache.poi.common.usermodel.fonts.FontInfo; import org.apache.poi.hslf.exceptions.HSLFException; @@ -85,7 +85,7 @@ import org.apache.poi.util.Units; */ public final class HSLFTextParagraph implements TextParagraph<HSLFShape,HSLFTextParagraph,HSLFTextRun> { - private static final Logger LOG = LogManager.getLogger(HSLFTextParagraph.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFTextParagraph.class); private static final int MAX_NUMBER_OF_STYLES = 20_000; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java index 5947765e3c..eb437bbdd2 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java @@ -21,8 +21,8 @@ import java.awt.Color; import java.util.List; import java.util.stream.Stream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.fonts.FontGroup; import org.apache.poi.common.usermodel.fonts.FontInfo; import org.apache.poi.hslf.exceptions.HSLFException; @@ -48,7 +48,7 @@ import org.apache.poi.sl.usermodel.TextShape; */ @SuppressWarnings({"WeakerAccess", "Duplicates", "unused"}) public final class HSLFTextRun implements TextRun { - private static final Logger LOG = LogManager.getLogger(HSLFTextRun.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFTextRun.class); /** The TextRun we belong to */ private HSLFTextParagraph parentParagraph; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java index 8d99617e7b..348907dd86 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java @@ -30,8 +30,8 @@ import java.util.Iterator; import java.util.List; import java.util.Spliterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.ddf.EscherPropertyTypes; @@ -65,7 +65,7 @@ import org.apache.poi.util.Units; */ public abstract class HSLFTextShape extends HSLFSimpleShape implements TextShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFTextShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFTextShape.class); /** * How to anchor the text diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java index 2c0d96303a..c568a66d52 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java @@ -28,8 +28,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.POIReadOnlyDocument; import org.apache.poi.hmef.attribute.MAPIRtfAttribute; import org.apache.poi.hsmf.datatypes.AttachmentChunks; @@ -84,7 +84,7 @@ public class MAPIMessage extends POIReadOnlyDocument { /** * For logging problems we spot with the file */ - private static final Logger LOG = LogManager.getLogger(MAPIMessage.class); + private static final Logger LOG = PoiLogManager.getLogger(MAPIMessage.class); private static final Pattern GUESS_7_BIT_ENCODING_PATTERN = Pattern.compile("content-type:.*?charset=[\"']?([^;'\"]+)[\"']?", Pattern.CASE_INSENSITIVE); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java index cabd8003c8..9261804bee 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java @@ -35,8 +35,8 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hsmf.MAPIMessage; /** @@ -44,7 +44,7 @@ import org.apache.poi.hsmf.MAPIMessage; * attachment. */ public class AttachmentChunks implements ChunkGroup { - private static final Logger LOG = LogManager.getLogger(AttachmentChunks.class); + private static final Logger LOG = PoiLogManager.getLogger(AttachmentChunks.class); public static final String PREFIX = "__attach_version1.0_#"; private ByteChunk attachData; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java index 37105fc8d0..bc7f7acca1 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; /** * Collection of convenience chunks for standard parts of the MSG file. @@ -37,7 +37,7 @@ import org.apache.logging.log4j.Logger; * TODO Deprecate the public Chunks in favour of Property Lookups */ public final class Chunks implements ChunkGroupWithProperties { - private static final Logger LOG = LogManager.getLogger(Chunks.class); + private static final Logger LOG = PoiLogManager.getLogger(Chunks.class); /** * Holds all the chunks that were found, indexed by their MAPIProperty. diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java index 482f8a941b..86edba47bd 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java @@ -25,8 +25,8 @@ import java.util.Calendar; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hsmf.datatypes.Types.MAPIType; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LocaleUtil; @@ -37,7 +37,7 @@ import org.apache.poi.util.LocaleUtil; * used if you want to cancel a message or similar */ public class MessageSubmissionChunk extends Chunk { - private static final Logger LOG = LogManager.getLogger(MessageSubmissionChunk.class); + private static final Logger LOG = PoiLogManager.getLogger(MessageSubmissionChunk.class); private String rawId; private Calendar date; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java index b409748504..91692e3897 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hsmf.datatypes.PropertyValue.BooleanPropertyValue; import org.apache.poi.hsmf.datatypes.PropertyValue.CurrencyPropertyValue; import org.apache.poi.hsmf.datatypes.PropertyValue.DoublePropertyValue; @@ -72,7 +72,7 @@ public abstract class PropertiesChunk extends Chunk { public static final int PROPERTIES_FLAG_WRITEABLE = 4; /** For logging problems we spot with the file */ - private static final Logger LOG = LogManager.getLogger(PropertiesChunk.class); + private static final Logger LOG = PoiLogManager.getLogger(PropertiesChunk.class); /** * Holds properties, indexed by type. If a property is multi-valued, or diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java index d333a7b55d..8eeb7bfc23 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java @@ -24,8 +24,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; /** * Collection of convenience chunks for the Recip(ient) part of an outlook file. @@ -33,7 +33,7 @@ import org.apache.logging.log4j.Logger; * If a message has multiple recipients, there will be several of these. */ public final class RecipientChunks implements ChunkGroupWithProperties { - private static final Logger LOG = LogManager.getLogger(RecipientChunks.class); + private static final Logger LOG = PoiLogManager.getLogger(RecipientChunks.class); public static final String PREFIX = "__recip_version1.0_#"; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java index 086a653086..9140957cd7 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hsmf.datatypes.AttachmentChunks; import org.apache.poi.hsmf.datatypes.ByteChunk; import org.apache.poi.hsmf.datatypes.ByteChunkDeferred; @@ -55,7 +55,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem; * data and so on. */ public final class POIFSChunkParser { - private static final Logger LOG = LogManager.getLogger(POIFSChunkParser.class); + private static final Logger LOG = PoiLogManager.getLogger(POIFSChunkParser.class); private POIFSChunkParser() {} diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java index 5724e024b0..3f31249da5 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java @@ -34,8 +34,8 @@ import javax.xml.transform.Transformer; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; @@ -67,7 +67,7 @@ public class ExcelToFoConverter extends AbstractExcelConverter { private static final float DPI = 72; - private static final Logger LOG = LogManager.getLogger(ExcelToFoConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(ExcelToFoConverter.class); private static final float PAPER_A4_HEIGHT_INCHES = 29.4f / CM_PER_INCH; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java index e483bd8c96..08a5a71d2a 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java @@ -40,8 +40,8 @@ import javax.xml.transform.Transformer; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; @@ -66,7 +66,7 @@ import org.w3c.dom.Text; */ @Beta public class ExcelToHtmlConverter extends AbstractExcelConverter { - private static final Logger LOG = LogManager.getLogger(ExcelToHtmlConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(ExcelToHtmlConverter.class); /** * Java main() interface to interact with ExcelToHtmlConverter diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java index 437d8cddc0..b6c59a2dfe 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java @@ -36,8 +36,8 @@ import java.util.function.Supplier; import javax.imageio.ImageIO; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hwmf.usermodel.HwmfPicture; import org.apache.poi.util.GenericRecordJsonWriter; @@ -52,7 +52,7 @@ import org.apache.poi.util.RecordFormatException; */ public class HwmfBitmapDib implements GenericRecord { - private static final Logger LOG = LogManager.getLogger(HwmfBitmapDib.class); + private static final Logger LOG = PoiLogManager.getLogger(HwmfBitmapDib.class); private static final int BMP_HEADER_SIZE = 14; public enum BitCount { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java index f81c7dd49c..7710afddba 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hwmf.draw.HwmfDrawProperties; import org.apache.poi.hwmf.draw.HwmfGraphics; @@ -48,7 +48,7 @@ import org.apache.poi.util.LittleEndianInputStream; import org.apache.poi.util.LocaleUtil; public class HwmfText { - private static final Logger LOG = LogManager.getLogger(HwmfText.class); + private static final Logger LOG = PoiLogManager.getLogger(HwmfText.class); private static final int DEFAULT_MAX_RECORD_LENGTH = 1_000_000; private static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java index da220c941e..1ab6965db2 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java @@ -34,8 +34,8 @@ import java.util.Objects; import java.util.Spliterator; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hwmf.draw.HwmfDrawProperties; import org.apache.poi.hwmf.draw.HwmfGraphics; @@ -58,7 +58,7 @@ public class HwmfPicture implements Iterable<HwmfRecord>, GenericRecord { public static final int DEFAULT_MAX_RECORD_LENGTH = 100_000_000; public static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; - private static final Logger LOG = LogManager.getLogger(HwmfPicture.class); + private static final Logger LOG = PoiLogManager.getLogger(HwmfPicture.class); final List<HwmfRecord> records = new ArrayList<>(); final HwmfPlaceableHeader placeableHeader; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java index fa2310b7ef..85a17202bf 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.charset.Charset; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.hwpf.model.ComplexFileTable; import org.apache.poi.hwpf.model.FontTable; @@ -50,7 +50,7 @@ import org.apache.poi.util.StringUtil; */ public class HWPFOldDocument extends HWPFDocumentCore { - private static final Logger LOG = LogManager.getLogger(HWPFOldDocument.class); + private static final Logger LOG = PoiLogManager.getLogger(HWPFOldDocument.class); //arbitrarily selected; may need to increase private static final int DEFAULT_MAX_RECORD_LENGTH = 10_000_000; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java index 186feb2118..aefe15d9da 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -119,7 +119,7 @@ public abstract class AbstractWordConverter { private static final int FIELD_HYPERLINK = 88; - private static final Logger LOG = LogManager.getLogger(AbstractWordConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(AbstractWordConverter.class); private static final Pattern PATTERN_HYPERLINK_EXTERNAL = Pattern .compile("^[ \\t\\r\\n]*HYPERLINK \"(.*)\".*$"); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java index 6668382682..dc996af43d 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java @@ -26,8 +26,8 @@ import java.util.Objects; import java.util.Set; import java.util.TreeSet; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; import org.apache.poi.hwpf.HWPFOldDocument; @@ -53,7 +53,7 @@ import static org.apache.logging.log4j.util.Unbox.box; public class AbstractWordUtils { static final String EMPTY = ""; - private static final Logger LOG = LogManager.getLogger(AbstractWordUtils.class); + private static final Logger LOG = PoiLogManager.getLogger(AbstractWordUtils.class); public static final float TWIPS_PER_INCH = 1440.0f; public static final int TWIPS_PER_PT = 20; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java index fb96e1eb36..2fe7e5c354 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java @@ -31,8 +31,8 @@ import javax.xml.transform.Transformer; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -60,7 +60,7 @@ import org.w3c.dom.Text; public class WordToFoConverter extends AbstractWordConverter { - private static final Logger LOG = LogManager.getLogger(WordToFoConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(WordToFoConverter.class); /** * Java main() interface to interact with {@link WordToFoConverter} diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java index e829a997ec..6d7c1750da 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java @@ -34,8 +34,8 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -82,7 +82,7 @@ public class WordToHtmlConverter extends AbstractWordConverter } } - private static final Logger LOG = LogManager.getLogger(WordToHtmlConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(WordToHtmlConverter.class); private final Deque<BlockProperies> blocksProperies = new LinkedList<>(); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java index 58f529a3c9..57a1850269 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java @@ -28,8 +28,8 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.apache.commons.io.output.StringBuilderWriter; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.SummaryInformation; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -52,7 +52,7 @@ import org.w3c.dom.Element; @Beta public class WordToTextConverter extends AbstractWordConverter { - private static final Logger LOG = LogManager.getLogger(WordToTextConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(WordToTextConverter.class); private static final int MAX_NESTED_CHILD_NODES = 300; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java index 1ffdbc635d..db47d85fee 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java @@ -22,8 +22,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.types.BKFAbstractType; import org.apache.poi.util.Internal; @@ -32,7 +32,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public class BookmarksTables { - private static final Logger LOG = LogManager.getLogger(BookmarksTables.class); + private static final Logger LOG = PoiLogManager.getLogger(BookmarksTables.class); private PlexOfCps descriptorsFirst = new PlexOfCps( 4 ); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java index 42b28dd500..b16426b011 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.SprmIterator; @@ -50,7 +50,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public class CHPBinTable { - private static final Logger LOG = LogManager.getLogger(CHPBinTable.class); + private static final Logger LOG = PoiLogManager.getLogger(CHPBinTable.class); /** List of character properties.*/ protected List<CHPX> _textRuns = new ArrayList<>(); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java index 227df337c0..7c1036c255 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -147,7 +147,7 @@ public final class FIBFieldHandler public static final int STTBLISTNAMES = 91; public static final int STTBFUSSR = 92; - private static final Logger LOGGER = LogManager.getLogger(FIBFieldHandler.class); + private static final Logger LOGGER = PoiLogManager.getLogger(FIBFieldHandler.class); private static final int FIELD_SIZE = LittleEndianConsts.INT_SIZE * 2; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java index a3b7086580..c4886c397b 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java @@ -24,8 +24,8 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Locale; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.model.types.FibBaseAbstractType; import org.apache.poi.hwpf.model.types.FibRgLw97AbstractType; @@ -51,7 +51,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class FileInformationBlock { - private static final Logger LOG = LogManager.getLogger(FileInformationBlock.class); + private static final Logger LOG = PoiLogManager.getLogger(FileInformationBlock.class); private final FibBase _fibBase; private final int _csw; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java index 947f8e1009..e204dc1c8f 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java @@ -20,8 +20,8 @@ package org.apache.poi.hwpf.model; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; @@ -36,7 +36,7 @@ import org.apache.poi.util.LittleEndianConsts; @Internal public final class FontTable { - private static final Logger LOG = LogManager.getLogger(FontTable.class); + private static final Logger LOG = PoiLogManager.getLogger(FontTable.class); private short _stringCount;// how many strings are included in the string table private short _extraDataSz;// size in bytes of the extra data diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java index ca8e1bb9df..769cdd7b79 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java @@ -19,8 +19,8 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.types.LVLFAbstractType; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; @@ -45,7 +45,7 @@ public final class ListLevel //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 10_485_760; - private static final Logger LOG = LogManager.getLogger(ListLevel.class); + private static final Logger LOG = PoiLogManager.getLogger(ListLevel.class); private byte[] _grpprlChpx; private byte[] _grpprlPapx; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java index 1ae1679046..46b0df755e 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java @@ -23,8 +23,8 @@ import java.util.LinkedHashMap; import java.util.NoSuchElementException; import java.util.Objects; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.types.LSTFAbstractType; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; @@ -35,7 +35,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class ListTables { - private static final Logger LOGGER = LogManager.getLogger(ListTables.class); + private static final Logger LOGGER = PoiLogManager.getLogger(ListTables.class); /** * Both PlfLst and the following LVLs diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java index c20d39ff66..90388c3830 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java @@ -18,8 +18,8 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -28,7 +28,7 @@ import static java.lang.Integer.toHexString; import static org.apache.logging.log4j.util.Unbox.box; public class NilPICFAndBinData { - private static final Logger LOGGER = LogManager.getLogger(NilPICFAndBinData.class); + private static final Logger LOGGER = PoiLogManager.getLogger(NilPICFAndBinData.class); // limit the default maximum length of the allocated fields private static final int MAX_SIZE = 100_000; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java index 5912dd23cc..3b4e547780 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java @@ -20,8 +20,8 @@ package org.apache.poi.hwpf.model; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.ddf.EscherRecord; @@ -38,7 +38,7 @@ import static org.apache.logging.log4j.util.Unbox.box; */ @Internal public final class OfficeArtContent { - protected static final Logger LOG = LogManager.getLogger(OfficeArtContent.class); + protected static final Logger LOG = PoiLogManager.getLogger(OfficeArtContent.class); /** * {@link EscherRecordTypes#DGG_CONTAINER} containing drawing group information for the document. @@ -117,7 +117,7 @@ public final class OfficeArtContent { headerDocumentDgContainer = dgContainer; break; default: - LogManager.getLogger(OfficeArtContent.class).atWarn() + PoiLogManager.getLogger(OfficeArtContent.class).atWarn() .log("dgglbl {} for OfficeArtWordDrawing is out of bounds [0, 1]", box(dgglbl)); } } diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java index 38c0d53cab..e0b9b59007 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java @@ -19,8 +19,8 @@ package org.apache.poi.hwpf.model; import java.nio.charset.Charset; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndianConsts; @@ -34,7 +34,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class OldFfn { - private static final Logger LOG = LogManager.getLogger(OldFfn.class); + private static final Logger LOG = PoiLogManager.getLogger(OldFfn.class); private final byte _chs;// character set identifier diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java index d4935a1ba6..41216b8ae4 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -32,7 +32,7 @@ import org.apache.poi.util.LittleEndianConsts; */ @Internal public final class OldFontTable { - private static final Logger LOG = LogManager.getLogger(OldFontTable.class); + private static final Logger LOG = PoiLogManager.getLogger(OldFontTable.class); // added extra facilitator members // FFN structure containing strings of font names diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java index 03b231a9e5..32e9ca9a36 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java @@ -26,8 +26,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.SprmIterator; import org.apache.poi.hwpf.sprm.SprmOperation; @@ -46,7 +46,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public class PAPBinTable { - private static final Logger LOG = LogManager.getLogger(PAPBinTable.class); + private static final Logger LOG = PoiLogManager.getLogger(PAPBinTable.class); protected final ArrayList<PAPX> _paragraphs = new ArrayList<>(); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java index 5885cff08f..e994b7f8e6 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java @@ -19,8 +19,8 @@ package org.apache.poi.hwpf.model; import java.util.LinkedList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; @@ -35,7 +35,7 @@ import org.apache.poi.util.LittleEndian; @Internal public class PICFAndOfficeArtData { - private static final Logger LOG = LogManager.getLogger(PicturesTable.class); + private static final Logger LOG = PoiLogManager.getLogger(PicturesTable.class); /** * Can contain either a {@link EscherBlipRecord} or a {@link EscherBSERecord}. diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java index 45e726e564..5c1528c56b 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java @@ -23,8 +23,8 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.DefaultEscherRecordFactory; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; @@ -55,7 +55,7 @@ import org.apache.poi.util.LittleEndian; */ @Internal public final class PicturesTable { - private static final Logger LOG = LogManager.getLogger(PicturesTable.class); + private static final Logger LOG = PoiLogManager.getLogger(PicturesTable.class); static final int TYPE_IMAGE = 0x08; static final int TYPE_IMAGE_WORD2000 = 0x00; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java index a9f54d32c9..ba8e39b26c 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.NoSuchElementException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.types.LFOAbstractType; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; @@ -39,7 +39,7 @@ import static org.apache.logging.log4j.util.Unbox.box; * Binary File Format */ public class PlfLfo { - private static final Logger LOGGER = LogManager.getLogger(PlfLfo.class); + private static final Logger LOGGER = PoiLogManager.getLogger(PlfLfo.class); private static final int MAX_NUMBER_OF_LFO = 100_000; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java index 7784e41255..ceb771ed39 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java @@ -21,8 +21,8 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Objects; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.Duplicatable; import org.apache.poi.util.Internal; @@ -42,7 +42,7 @@ public abstract class PropertyNode<T extends PropertyNode<T>> implements Compara public static final Comparator<PropertyNode<?>> StartComparator = Comparator.comparingInt(PropertyNode::getStart); - private static final Logger LOG = LogManager.getLogger(PropertyNode.class); + private static final Logger LOG = PoiLogManager.getLogger(PropertyNode.class); protected Object _buf; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java index 35e74bf10d..efdfeb26cb 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.model.io.HWPFFileSystem; import org.apache.poi.util.IOUtils; @@ -34,7 +34,7 @@ import org.apache.poi.util.LittleEndianConsts; @Internal public class SectionTable { - private static final Logger LOG = LogManager.getLogger(SectionTable.class); + private static final Logger LOG = PoiLogManager.getLogger(SectionTable.class); private static final int SED_SIZE = 12; protected List<SEPX> _sections = new ArrayList<>(); diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java index 2a0861f922..fc6763ddef 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java @@ -18,7 +18,7 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; -import org.apache.logging.log4j.LogManager; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -71,7 +71,7 @@ public class Sttb if ( ffff != (short) 0xffff ) { - LogManager.getLogger(Sttb.class).atWarn().log( + PoiLogManager.getLogger(Sttb.class).atWarn().log( "Non-extended character Pascal strings are not supported right now. " + "Creating empty values in the RevisionMarkAuthorTable for now. " + "Please, contact POI developers for update." diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java index 976ab1ed82..92e3bb1d94 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java @@ -20,8 +20,8 @@ package org.apache.poi.hwpf.model; import java.util.Arrays; import java.util.Objects; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.types.StdfBaseAbstractType; import org.apache.poi.hwpf.usermodel.CharacterProperties; import org.apache.poi.hwpf.usermodel.ParagraphProperties; @@ -36,7 +36,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class StyleDescription { - private static final Logger LOG = LogManager.getLogger(StyleDescription.class); + private static final Logger LOG = PoiLogManager.getLogger(StyleDescription.class); private static final int PARAGRAPH_STYLE = 1; private static final int CHARACTER_STYLE = 2; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java index 72d414ac26..50205ae033 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java @@ -20,8 +20,8 @@ package org.apache.poi.hwpf.model; import java.io.IOException; import java.io.OutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.sprm.CharacterSprmUncompressor; import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor; import org.apache.poi.hwpf.usermodel.CharacterProperties; @@ -41,7 +41,7 @@ import org.apache.poi.util.LittleEndianConsts; */ @Internal public final class StyleSheet { - private static final Logger LOG = LogManager.getLogger(StyleSheet.class); + private static final Logger LOG = PoiLogManager.getLogger(StyleSheet.class); public static final int NIL_STYLE = 4095; // private static final int PAP_TYPE = 1; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java index ded50c1357..e011f7f819 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java @@ -24,8 +24,8 @@ import java.util.Comparator; import java.util.LinkedList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; @@ -40,7 +40,7 @@ import static org.apache.logging.log4j.util.Unbox.box; */ @Internal public class TextPieceTable implements CharIndexTranslator { - private static final Logger LOG = LogManager.getLogger(TextPieceTable.class); + private static final Logger LOG = PoiLogManager.getLogger(TextPieceTable.class); //arbitrarily selected; may need to increase private static final int DEFAULT_MAX_RECORD_LENGTH = 100_000_000; private static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java index 34acfb99dc..4ee0d75eee 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.hwpf.model; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -27,7 +27,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public class Xstz { - private static final Logger LOGGER = LogManager.getLogger(Xstz.class); + private static final Logger LOGGER = PoiLogManager.getLogger(Xstz.class); private final short _chTerm = 0; private Xst _xst; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java index 372393945e..7565b1aedb 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java @@ -17,8 +17,8 @@ package org.apache.poi.hwpf.sprm; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.usermodel.ShadingDescriptor80; import org.apache.poi.hwpf.model.Colorref; @@ -34,7 +34,7 @@ import org.apache.poi.util.LittleEndian; @Internal public final class CharacterSprmUncompressor extends SprmUncompressor { - private static final Logger LOG = LogManager.getLogger(CharacterSprmUncompressor.class); + private static final Logger LOG = PoiLogManager.getLogger(CharacterSprmUncompressor.class); public CharacterSprmUncompressor() { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java index d1d41919fc..9ee25a7fb0 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.model.TabDescriptor; import org.apache.poi.hwpf.model.types.TBDAbstractType; import org.apache.poi.hwpf.usermodel.BorderCode; @@ -44,7 +44,7 @@ import static org.apache.logging.log4j.util.Unbox.box; @Internal public final class ParagraphSprmUncompressor extends SprmUncompressor { - private static final Logger LOG = LogManager.getLogger(ParagraphSprmUncompressor.class); + private static final Logger LOG = PoiLogManager.getLogger(ParagraphSprmUncompressor.class); public ParagraphSprmUncompressor() { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java index eee1943227..10ed6ffbc2 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java @@ -19,10 +19,10 @@ package org.apache.poi.hwpf.sprm; import java.util.Arrays; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.SectionProperties; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import static org.apache.logging.log4j.util.Unbox.box; @@ -32,7 +32,7 @@ import static org.apache.poi.util.HexDump.byteToHex; @Internal public final class SectionSprmUncompressor extends SprmUncompressor { - private static final Logger LOG = LogManager.getLogger(SectionSprmUncompressor.class); + private static final Logger LOG = PoiLogManager.getLogger(SectionSprmUncompressor.class); public SectionSprmUncompressor() { diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java index e227403227..5cf224f059 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java @@ -17,18 +17,18 @@ package org.apache.poi.hwpf.sprm; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.usermodel.BorderCode; import org.apache.poi.hwpf.usermodel.TableCellDescriptor; import org.apache.poi.hwpf.usermodel.TableProperties; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; @Internal public final class TableSprmUncompressor extends SprmUncompressor { - private static final Logger LOG = LogManager.getLogger(TableSprmUncompressor.class); + private static final Logger LOG = PoiLogManager.getLogger(TableSprmUncompressor.class); public TableSprmUncompressor() { } diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java index d328baccea..285d73402c 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java @@ -19,7 +19,6 @@ package org.apache.poi.hwpf.usermodel; import java.util.NoSuchElementException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.common.Duplicatable; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -31,12 +30,13 @@ import org.apache.poi.hwpf.model.StyleSheet; import org.apache.poi.hwpf.sprm.ParagraphSprmUncompressor; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.TableSprmCompressor; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; import static org.apache.logging.log4j.util.Unbox.box; public class Paragraph extends Range implements Duplicatable { - private static final Logger LOGGER = LogManager.getLogger(Paragraph.class); + private static final Logger LOGGER = PoiLogManager.getLogger(Paragraph.class); public static final short SPRM_JC = 0x2403; public static final short SPRM_FSIDEBYSIDE = 0x2404; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java index 7ba7892b28..77c695c3d0 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java @@ -25,7 +25,6 @@ import java.util.zip.InflaterInputStream; import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherBlipRecord; @@ -39,6 +38,7 @@ import org.apache.poi.ddf.EscherRecordTypes; import org.apache.poi.ddf.EscherSimpleProperty; import org.apache.poi.hwpf.model.PICF; import org.apache.poi.hwpf.model.PICFAndOfficeArtData; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.sl.image.ImageHeaderPNG; import org.apache.poi.util.IOUtils; import org.apache.poi.util.StringUtil; @@ -48,7 +48,7 @@ import org.apache.poi.util.Units; * Represents embedded picture extracted from Word Document */ public final class Picture { - private static final Logger LOGGER = LogManager.getLogger(Picture.class); + private static final Logger LOGGER = PoiLogManager.getLogger(Picture.class); private static final byte[] COMPRESSED1 = { (byte) 0xFE, 0x78, (byte) 0xDA }; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java index 08d3840e56..6567af6b93 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java @@ -22,7 +22,6 @@ import static org.apache.logging.log4j.util.Unbox.box; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFDocumentCore; @@ -36,6 +35,7 @@ import org.apache.poi.hwpf.model.SubdocumentType; import org.apache.poi.hwpf.sprm.CharacterSprmCompressor; import org.apache.poi.hwpf.sprm.ParagraphSprmCompressor; import org.apache.poi.hwpf.sprm.SprmBuffer; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.DocumentFormatException; import org.apache.poi.util.Internal; import org.apache.poi.util.LittleEndian; @@ -54,7 +54,7 @@ import org.apache.poi.util.LittleEndianConsts; */ public class Range { - private static final Logger LOG = LogManager.getLogger(Range.class); + private static final Logger LOG = PoiLogManager.getLogger(Range.class); /** * @deprecated POI 3.8 beta 5 diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java index 684984ff3c..68b6e74476 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java @@ -20,8 +20,8 @@ package org.apache.poi.hwpf.usermodel; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hwpf.sprm.SprmBuffer; import org.apache.poi.hwpf.sprm.TableSprmUncompressor; @@ -29,7 +29,7 @@ import static org.apache.logging.log4j.util.Unbox.box; public final class TableRow extends Range { - private static final Logger LOG = LogManager.getLogger(TableRow.class); + private static final Logger LOG = PoiLogManager.getLogger(TableRow.class); private static final short SPRM_DXAGAPHALF = (short) 0x9602; private static final short SPRM_DYAROWHEIGHT = (short) 0x9407; diff --git a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java index 27f796c11e..6c3774de47 100644 --- a/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java +++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java @@ -23,9 +23,9 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.CharsetDecoder; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.SimpleMessage; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Internal; /** @@ -35,7 +35,7 @@ import org.apache.poi.util.Internal; @Internal public class LittleEndianCP950Reader extends Reader { - private static final Logger LOGGER = LogManager.getLogger(LittleEndianCP950Reader.class); + private static final Logger LOGGER = PoiLogManager.getLogger(LittleEndianCP950Reader.class); private static final char UNMAPPABLE = '?'; private final ByteBuffer doubleByteBuffer = ByteBuffer.allocate(2); |