Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java Sun Nov 24 19:48:55 2024 @@ -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;
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java Sun Nov 24 19:48:55 2024 @@ -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 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianC * "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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java Sun Nov 24 19:48:55 2024 @@ -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.TextS */ @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java Sun Nov 24 19:48:55 2024 @@ -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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java Sun Nov 24 19:48:55 2024 @@ -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 POIRead /** * 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); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java Sun Nov 24 19:48:55 2024 @@ -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. Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java Sun Nov 24 19:48:55 2024 @@ -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 ex 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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java Sun Nov 24 19:48:55 2024 @@ -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_#"; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java Sun Nov 24 19:48:55 2024 @@ -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.P * 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() {} Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java Sun Nov 24 19:48:55 2024 @@ -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 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java Sun Nov 24 19:48:55 2024 @@ -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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java Sun Nov 24 19:48:55 2024 @@ -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.RecordFormatE */ 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 { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianI 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java Sun Nov 24 19:48:55 2024 @@ -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 Iter 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java Sun Nov 24 19:48:55 2024 @@ -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 AbstractWordConver 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 \"(.*)\".*$"); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java Sun Nov 24 19:48:55 2024 @@ -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.u 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java Sun Nov 24 19:48:55 2024 @@ -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} Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Sun Nov 24 19:48:55 2024 @@ -34,8 +34,8 @@ import javax.xml.transform.TransformerEx 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 } } - 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<>(); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java Sun Nov 24 19:48:55 2024 @@ -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.u @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 ); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java Sun Nov 24 19:48:55 2024 @@ -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.u @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<>(); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java Sun Nov 24 19:48:55 2024 @@ -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.u @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianC @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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java Sun Nov 24 19:48:55 2024 @@ -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.u @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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java Sun Nov 24 19:48:55 2024 @@ -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.toHexStr 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java Sun Nov 24 19:48:55 2024 @@ -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.u */ @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)); } } Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java Sun Nov 24 19:48:55 2024 @@ -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.u @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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianC */ @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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java Sun Nov 24 19:48:55 2024 @@ -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.u @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<>(); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java Sun Nov 24 19:48:55 2024 @@ -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}. Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java Sun Nov 24 19:48:55 2024 @@ -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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java Sun Nov 24 19:48:55 2024 @@ -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.u * 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java Sun Nov 24 19:48:55 2024 @@ -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 ext 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianC @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<>(); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java Sun Nov 24 19:48:55 2024 @@ -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." Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java Sun Nov 24 19:48:55 2024 @@ -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.u @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java Sun Nov 24 19:48:55 2024 @@ -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.LittleEndianC */ @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java Sun Nov 24 19:48:55 2024 @@ -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.u */ @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java Sun Nov 24 19:48:55 2024 @@ -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.u @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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java Sun Nov 24 19:48:55 2024 @@ -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() { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java Sun Nov 24 19:48:55 2024 @@ -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.u @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() { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java Sun Nov 24 19:48:55 2024 @@ -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.HexDum @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() { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java Sun Nov 24 19:48:55 2024 @@ -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() { } Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java Sun Nov 24 19:48:55 2024 @@ -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.StyleSh 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java Sun Nov 24 19:48:55 2024 @@ -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.EscherRecordTy 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 }; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java Sun Nov 24 19:48:55 2024 @@ -22,7 +22,6 @@ import static org.apache.logging.log4j.u 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.Subdocu 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.LittleEndianC */ 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 Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java Sun Nov 24 19:48:55 2024 @@ -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.u 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; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java Sun Nov 24 19:48:55 2024 @@ -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); Modified: poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java (original) +++ poi/trunk/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java Sun Nov 24 19:48:55 2024 @@ -29,12 +29,12 @@ import java.util.List; import java.util.Locale; import java.util.stream.Stream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.POIDataSamples; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.OldWordFileFormatException; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.util.RecordFormatException; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ import org.junit.jupiter.params.provider import org.junit.jupiter.params.provider.MethodSource; public class TestWordToTextConverter { - private static final Logger LOG = LogManager.getLogger(TestWordToTextConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(TestWordToTextConverter.class); private static final List<String> failingFiles = Arrays.asList( // Excel file Modified: poi/trunk/poi/src/main/java/org/apache/poi/POIDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/POIDocument.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/POIDocument.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/POIDocument.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.security.GeneralSecurityExce import java.util.List; 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.hpsf.DocumentSummaryInformation; import org.apache.poi.hpsf.PropertySet; import org.apache.poi.hpsf.PropertySetFactory; @@ -62,7 +62,7 @@ public abstract class POIDocument implem private DirectoryNode directory; /** For our own logging use */ - private static final Logger LOG = LogManager.getLogger(POIDocument.class); + private static final Logger LOG = PoiLogManager.getLogger(POIDocument.class); /* Have the property streams been read yet? (Only done on-demand) */ private boolean initialized; Modified: poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.common.usermodel. import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; /** * Charset represents the basic set of characters associated with a font (that it can display), and @@ -99,7 +99,7 @@ public enum FontCharset { charset = Charset.forName(javaCharsetName); return; } catch (UnsupportedCharsetException e) { - Logger logger = LogManager.getLogger(FontCharset.class); + Logger logger = PoiLogManager.getLogger(FontCharset.class); logger.atWarn().log("Unsupported charset: {}", javaCharsetName); } } Modified: poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.Map; 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.util.GenericRecordUtil; import org.apache.poi.util.HexDump; import org.apache.poi.util.LittleEndian; @@ -48,7 +48,7 @@ public final class EscherContainerRecord public static final short SP_CONTAINER = EscherRecordTypes.SP_CONTAINER.typeID; public static final short SOLVER_CONTAINER = EscherRecordTypes.SOLVER_CONTAINER.typeID; - private static final Logger LOGGER = LogManager.getLogger(EscherContainerRecord.class); + private static final Logger LOGGER = PoiLogManager.getLogger(EscherContainerRecord.class); private static final int MAX_NESTED_CHILD_NODES = 1000; Modified: poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java Sun Nov 24 19:48:55 2024 @@ -31,15 +31,15 @@ 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.hssf.usermodel.HSSFPictureData; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.Removal; public final class EscherMetafileBlip extends EscherBlipRecord { - private static final Logger LOGGER = LogManager.getLogger(EscherMetafileBlip.class); + private static final Logger LOGGER = PoiLogManager.getLogger(EscherMetafileBlip.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; Modified: poi/trunk/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java Sun Nov 24 19:48:55 2024 @@ -27,8 +27,8 @@ import java.util.List; import java.util.ServiceLoader; import java.util.stream.StreamSupport; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.EmptyFileException; import org.apache.poi.hssf.extractor.ExcelExtractor; import org.apache.poi.poifs.crypt.Decryptor; @@ -61,7 +61,7 @@ public final class ExtractorFactory { */ public static final String OOXML_PACKAGE = "Package"; - private static final Logger LOGGER = LogManager.getLogger(ExtractorFactory.class); + private static final Logger LOGGER = PoiLogManager.getLogger(ExtractorFactory.class); /** Should this thread prefer event based over usermodel based extractors? */ private static final ThreadLocal<Boolean> threadPreferEventExtractors = ThreadLocal.withInitial(() -> Boolean.FALSE); Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java Sun Nov 24 19:48:55 2024 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.hpsf; -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.Internal; import org.apache.poi.util.LittleEndian; @@ -32,7 +32,7 @@ public class ClipboardData { private static final int DEFAULT_MAX_RECORD_LENGTH = 100_000_000; private static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; - private static final Logger LOG = LogManager.getLogger(ClipboardData.class); + private static final Logger LOG = PoiLogManager.getLogger(ClipboardData.class); private int _format; private byte[] _value; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java Sun Nov 24 19:48:55 2024 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.hpsf; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.*; import java.io.IOException; @@ -32,7 +32,7 @@ public class CodePageString { private static final int DEFAULT_MAX_RECORD_LENGTH = 100_000; private static int MAX_RECORD_LENGTH = DEFAULT_MAX_RECORD_LENGTH; - private static final Logger LOG = LogManager.getLogger(CodePageString.class); + private static final Logger LOG = PoiLogManager.getLogger(CodePageString.class); private byte[] _value; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.collections4.bidimap.TreeBidiMap; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpsf.wellknown.PropertyIDMap; import org.apache.poi.util.CodePageUtil; @@ -67,7 +67,7 @@ import static org.apache.logging.log4j.u * HashMap<String,Object> mapping between Names and Custom Property Values. */ public class CustomProperties implements Map<String,Object> { - private static final Logger LOG = LogManager.getLogger(CustomProperties.class); + private static final Logger LOG = PoiLogManager.getLogger(CustomProperties.class); /** * The custom properties Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Property.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Property.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Property.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Property.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; 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.hpsf.wellknown.PropertyIDMap; import org.apache.poi.util.CodePageUtil; import org.apache.poi.util.HexDump; @@ -73,7 +73,7 @@ public class Property { */ public static final int DEFAULT_CODEPAGE = CodePageUtil.CP_WINDOWS_1252; - private static final Logger LOG = LogManager.getLogger(Property.class); + private static final Logger LOG = PoiLogManager.getLogger(Property.class); /** The property's ID. */ private long id; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Section.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Section.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Section.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/Section.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.util.TreeMap; import org.apache.commons.collections4.bidimap.TreeBidiMap; 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.hpsf.wellknown.PropertyIDMap; import org.apache.poi.util.CodePageUtil; import org.apache.poi.util.IOUtils; @@ -46,7 +46,7 @@ import org.apache.poi.util.LittleEndianO */ public class Section { - private static final Logger LOG = LogManager.getLogger(Section.class); + private static final Logger LOG = PoiLogManager.getLogger(Section.class); /** * Maps property IDs to section-private PID strings. These --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
