Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hpsf; import java.math.BigInteger; -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.LittleEndianByteArrayInputStream; import org.apache.poi.util.LittleEndianConsts; @@ -30,7 +30,7 @@ import static org.apache.logging.log4j.u @Internal public class TypedPropertyValue { - private static final Logger LOG = LogManager.getLogger(TypedPropertyValue.class); + private static final Logger LOG = PoiLogManager.getLogger(TypedPropertyValue.class); private int _type; private Object _value;
Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.CodePageUtil; import org.apache.poi.util.IOUtils; import org.apache.poi.util.Internal; @@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; @Internal public class UnicodeString { - private static final Logger LOG = LogManager.getLogger(UnicodeString.class); + private static final Logger LOG = PoiLogManager.getLogger(UnicodeString.class); private byte[] _value; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantBool.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantBool.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantBool.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantBool.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.Internal; import org.apache.poi.util.LittleEndianByteArrayInputStream; @@ -25,7 +25,7 @@ import static org.apache.logging.log4j.u @Internal public class VariantBool { - private static final Logger LOG = LogManager.getLogger(VariantBool.class); + private static final Logger LOG = PoiLogManager.getLogger(VariantBool.class); static final int SIZE = 2; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java Sun Nov 24 19:48:55 2024 @@ -25,8 +25,8 @@ import java.util.Date; 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.util.IOUtils; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianByteArrayInputStream; @@ -58,7 +58,7 @@ public class VariantSupport extends Vari Variant.VT_CF, Variant.VT_BOOL }; - private static final Logger LOG = LogManager.getLogger(VariantSupport.class); + private static final Logger LOG = PoiLogManager.getLogger(VariantSupport.class); private static boolean logUnsupportedTypes; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.util.List; import java.util.Locale; 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.hssf.record.CellValueRecordInterface; import org.apache.poi.hssf.record.ExtendedFormatRecord; import org.apache.poi.hssf.record.FormatRecord; @@ -43,7 +43,7 @@ import static org.apache.logging.log4j.u * ids. */ public class FormatTrackingHSSFListener implements HSSFListener { - private static final Logger LOG = LogManager.getLogger(FormatTrackingHSSFListener.class); + private static final Logger LOG = PoiLogManager.getLogger(FormatTrackingHSSFListener.class); private final HSSFListener _childListener; private final HSSFDataFormatter _formatter; private final NumberFormat _defaultFormat; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.util.ArrayList; 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.hssf.record.*; import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.record.aggregates.ChartSubstreamRecordAggregate; @@ -68,7 +68,7 @@ public final class InternalSheet { public static final short TopMargin = 2; public static final short BottomMargin = 3; - private static final Logger LOGGER = LogManager.getLogger(InternalSheet.class); + private static final Logger LOGGER = PoiLogManager.getLogger(InternalSheet.class); private final List<RecordBase> _records; protected PrintGridlinesRecord printGridlines; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.security.AccessControlExcept import java.util.*; import java.util.Map.Entry; -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.EscherBoolProperty; import org.apache.poi.ddf.EscherContainerRecord; @@ -118,7 +118,7 @@ public final class InternalWorkbook { */ public static final String OLD_WORKBOOK_DIR_ENTRY_NAME = "Book"; - private static final Logger LOG = LogManager.getLogger(InternalWorkbook.class); + private static final Logger LOG = PoiLogManager.getLogger(InternalWorkbook.class); /** * constant used to set the "codepage" wherever "codepage" is set in records Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hssf.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.hssf.model.HSSFFormulaParser; import org.apache.poi.hssf.record.cf.BorderFormatting; import org.apache.poi.hssf.record.cf.FontFormatting; @@ -95,7 +95,7 @@ public abstract class CFRuleBase extends public static final int TEMPLATE_ABOVE_OR_EQUAL_TO_AVERAGE = 0x001D; public static final int TEMPLATE_BELOW_OR_EQUAL_TO_AVERAGE = 0x001E; - protected static final Logger LOG = LogManager.getLogger(CFRuleBase.class); + protected static final Logger LOG = PoiLogManager.getLogger(CFRuleBase.class); static final BitField modificationBits = bf(0x003FFFFF); // Bits: font,align,bord,patt,prot static final BitField alignHor = bf(0x00000001); // 0 = Horizontal alignment modified Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ package org.apache.poi.hssf.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.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; @@ -35,7 +35,7 @@ import org.apache.poi.util.LittleEndianO public final class DimensionsRecord extends StandardRecord { - private static final Logger LOG = LogManager.getLogger(DimensionsRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(DimensionsRecord.class); public static final short sid = 0x200; private int field_1_first_row; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.util.Map; import java.util.function.Supplier; 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.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.ptg.Area3DPtg; import org.apache.poi.ss.formula.ptg.AreaPtg; @@ -47,7 +47,7 @@ import static org.apache.logging.log4j.u * stored in a separate entry within the OLE2 compound file. */ public final class EmbeddedObjectRefSubRecord extends SubRecord { - private static final Logger LOG = LogManager.getLogger(EmbeddedObjectRefSubRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(EmbeddedObjectRefSubRecord.class); public static final short sid = 0x0009; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.util.Map; import java.util.function.Supplier; 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.hssf.record.common.FeatFormulaErr2; import org.apache.poi.hssf.record.common.FeatProtection; import org.apache.poi.hssf.record.common.FeatSmartTag; @@ -41,7 +41,7 @@ import static org.apache.logging.log4j.u * up with a {@link FeatHdrRecord}. */ public final class FeatRecord extends StandardRecord { - private static final Logger LOG = LogManager.getLogger(FeatRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(FeatRecord.class); public static final short sid = 0x0868; // SIDs from newer versions public static final short v11_sid = 0x0872; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.util.Arrays; 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.hssf.model.InternalWorkbook; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianConsts; @@ -36,7 +36,7 @@ import static org.apache.logging.log4j.u */ public final class FormatRecord extends StandardRecord { - private static final Logger LOG = LogManager.getLogger(FormatRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(FormatRecord.class); public static final short sid = 0x041E; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java Sun Nov 24 19:48:55 2024 @@ -27,8 +27,8 @@ import static org.apache.poi.util.HexDum 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.hpsf.ClassID; import org.apache.poi.hpsf.ClassIDPredefined; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -48,7 +48,7 @@ import org.apache.poi.util.StringUtil; */ public final class HyperlinkRecord extends StandardRecord { public static final short sid = 0x01B8; - private static final Logger LOG = LogManager.getLogger(HyperlinkRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(HyperlinkRecord.class); /* * Link flags Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hssf.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.util.GenericRecordUtil; import org.apache.poi.util.RecordFormatException; @@ -35,7 +35,7 @@ import static org.apache.poi.util.HexDum * @see LabelSSTRecord */ public final class LabelRecord extends Record implements CellValueRecordInterface { - private static final Logger LOG = LogManager.getLogger(LabelRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(LabelRecord.class); public static final short sid = 0x0204; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hssf.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.hssf.usermodel.HSSFWorkbook; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.IOUtils; @@ -36,7 +36,7 @@ import static org.apache.poi.util.HexDum * didn't use {@link LabelSSTRecord} */ public final class OldLabelRecord extends OldCellRecord { - private static final Logger LOG = LogManager.getLogger(OldLabelRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(OldLabelRecord.class); public static final short biff2_sid = 0x0004; public static final short biff345_sid = 0x0204; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hssf.record; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hssf.record.common.UnicodeString; import org.apache.poi.util.IntMapper; @@ -30,7 +30,7 @@ import static org.apache.logging.log4j.u * Handles the task of deserializing a SST string. The two main entry points are */ class SSTDeserializer { - private static final Logger LOG = LogManager.getLogger(SSTDeserializer.class); + private static final Logger LOG = PoiLogManager.getLogger(SSTDeserializer.class); private IntMapper<UnicodeString> strings; public SSTDeserializer(IntMapper<UnicodeString> strings) { Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hssf.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.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; import org.apache.poi.util.StringUtil; @@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; */ public final class SupBookRecord extends StandardRecord { - private static final Logger LOG = LogManager.getLogger(SupBookRecord.class); + private static final Logger LOG = PoiLogManager.getLogger(SupBookRecord.class); public static final short sid = 0x01AE; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,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.hssf.model.RecordStream; import org.apache.poi.hssf.record.CFHeader12Record; @@ -54,7 +54,7 @@ import static org.apache.logging.log4j.u public final class CFRecordsAggregate extends RecordAggregate implements GenericRecord { /** Excel 97-2003 allows up to 3 conditional formating rules */ private static final int MAX_97_2003_CONDTIONAL_FORMAT_RULES = 3; - private static final Logger LOG = LogManager.getLogger(CFRecordsAggregate.class); + private static final Logger LOG = PoiLogManager.getLogger(CFRecordsAggregate.class); private final CFHeaderBase header; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.util.Map; import java.util.function.Supplier; 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.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hssf.record.common.ExtendedColor; @@ -41,7 +41,7 @@ import static org.apache.logging.log4j.u * Color Scale in the UI) */ public final class ColorGradientFormatting implements Duplicatable, GenericRecord { - private static final Logger LOGGER = LogManager.getLogger(ColorGradientFormatting.class); + private static final Logger LOGGER = PoiLogManager.getLogger(ColorGradientFormatting.class); private static final BitField clamp = BitFieldFactory.getInstance(0x01); private static final BitField background = BitFieldFactory.getInstance(0x02); Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import static org.apache.poi.util.Generi 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.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hssf.record.common.ExtendedColor; @@ -39,7 +39,7 @@ import org.apache.poi.util.LittleEndianO * Data Bar Conditional Formatting Rule Record. */ public final class DataBarFormatting implements Duplicatable, GenericRecord { - private static final Logger LOG = LogManager.getLogger(DataBarFormatting.class); + private static final Logger LOG = PoiLogManager.getLogger(DataBarFormatting.class); private static final BitField ICON_ONLY = BitFieldFactory.getInstance(0x01); private static final BitField REVERSED = BitFieldFactory.getInstance(0x04); Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.util.Map; import java.util.function.Supplier; 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.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.ss.usermodel.IconMultiStateFormatting.IconSet; @@ -39,7 +39,7 @@ import static org.apache.logging.log4j.u * Icon / Multi-State Conditional Formatting Rule Record. */ public final class IconMultiStateFormatting implements Duplicatable, GenericRecord { - private static final Logger LOG = LogManager.getLogger(IconMultiStateFormatting.class); + private static final Logger LOG = PoiLogManager.getLogger(IconMultiStateFormatting.class); private static BitField ICON_ONLY = BitFieldFactory.getInstance(0x01); private static BitField REVERSED = BitFieldFactory.getInstance(0x04); Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.util.Map; import java.util.function.Supplier; 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.GenericRecord; import org.apache.poi.hssf.record.cont.ContinuableRecordOutput; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -37,7 +37,7 @@ import static org.apache.logging.log4j.u @Internal public class ExtRst implements Comparable<ExtRst>, GenericRecord { - private static final Logger LOG = LogManager.getLogger(ExtRst.class); + private static final Logger LOG = PoiLogManager.getLogger(ExtRst.class); private short reserved; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java Sun Nov 24 19:48:55 2024 @@ -27,8 +27,8 @@ import java.util.Spliterator; import java.util.function.Supplier; 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.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hssf.record.RecordInputStream; @@ -46,7 +46,7 @@ import static org.apache.logging.log4j.u * This is often called a XLUnicodeRichExtendedString in MS documentation. */ public class UnicodeString implements Comparable<UnicodeString>, Duplicatable, GenericRecord { - private static final Logger LOG = LogManager.getLogger(UnicodeString.class); + private static final Logger LOG = PoiLogManager.getLogger(UnicodeString.class); private static final BitField highByte = BitFieldFactory.getInstance(0x1); // 0x2 is reserved Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.usermodel; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.util.NotImplemented; import org.apache.poi.util.SuppressForbidden; @@ -59,7 +59,7 @@ import java.text.AttributedCharacterIter * </blockquote> */ public class EscherGraphics extends Graphics { - private static final Logger LOG = LogManager.getLogger(EscherGraphics.class); + private static final Logger LOG = PoiLogManager.getLogger(EscherGraphics.class); private final HSSFShapeGroup escherGroup; private final HSSFWorkbook workbook; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.usermodel; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import java.awt.*; import java.awt.font.FontRenderContext; @@ -70,7 +70,7 @@ import java.util.Map; * </blockquote> */ public final class EscherGraphics2d extends Graphics2D { - private static final Logger LOG = LogManager.getLogger(EscherGraphics2d.class); + private static final Logger LOG = PoiLogManager.getLogger(EscherGraphics2d.class); private final EscherGraphics _escherGraphics; private BufferedImage _img; Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.usermodel; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherBoolProperty; import org.apache.poi.ddf.EscherClientDataRecord; @@ -43,7 +43,7 @@ import org.apache.poi.util.LittleEndian; public class HSSFPolygon extends HSSFSimpleShape { public static final short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 0x1E; - private static final Logger LOG = LogManager.getLogger(HSSFPolygon.class); + private static final Logger LOG = PoiLogManager.getLogger(HSSFPolygon.class); public HSSFPolygon(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord _textObjectRecord) { super(spContainer, objRecord, _textObjectRecord); Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Sun Nov 24 19:48:55 2024 @@ -27,8 +27,8 @@ import java.util.Spliterator; import java.util.TreeMap; 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.logging.log4j.message.SimpleMessage; import org.apache.poi.ddf.EscherRecord; import org.apache.poi.hssf.model.DrawingManager2; @@ -94,7 +94,7 @@ import static org.apache.logging.log4j.u * High level representation of a worksheet. */ public final class HSSFSheet implements Sheet { - private static final Logger LOGGER = LogManager.getLogger(HSSFSheet.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSSFSheet.class); /** * width of 1px in columns with default width in units of 1/256 of a character width Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Sun Nov 24 19:48:55 2024 @@ -50,8 +50,8 @@ import java.util.regex.Pattern; import org.apache.commons.codec.digest.DigestUtils; 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.EncryptedDocumentException; import org.apache.poi.POIDocument; import org.apache.poi.ddf.EscherBSERecord; @@ -197,7 +197,7 @@ public final class HSSFWorkbook extends */ private MissingCellPolicy missingCellPolicy = MissingCellPolicy.RETURN_NULL_AND_BLANK; - private static final Logger LOGGER = LogManager.getLogger(HSSFWorkbook.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSSFWorkbook.class); /** * The locator of user-defined functions. Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; /** * Allows the user to lookup the font metrics for a particular font without @@ -37,7 +37,7 @@ import org.apache.logging.log4j.Logger; * font. Use a multiplier for other sizes. */ final class StaticFontMetrics { - private static final Logger LOGGER = LogManager.getLogger(StaticFontMetrics.class); + private static final Logger LOGGER = PoiLogManager.getLogger(StaticFontMetrics.class); /** The font metrics property file we're using */ private static Properties fontMetricsProps; /** Our cache of font details we've already looked up */ Modified: poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowColShifter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowColShifter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowColShifter.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowColShifter.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.hssf.usermodel.helpers; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.formula.*; import org.apache.poi.ss.formula.ptg.Ptg; @@ -34,7 +34,7 @@ import static org.apache.logging.log4j.u */ @Internal /*private*/ final class HSSFRowColShifter { - private static final Logger LOG = LogManager.getLogger(HSSFRowColShifter.class); + private static final Logger LOG = PoiLogManager.getLogger(HSSFRowColShifter.class); private HSSFRowColShifter() { /*no instances for static classes*/} Copied: poi/trunk/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java (from r1922052, xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/NoOpLogger.java) URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java&p1=xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/NoOpLogger.java&r1=1922052&r2=1922055&rev=1922055&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/NoOpLogger.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/logging/NoOpLogger.java Sun Nov 24 19:48:55 2024 @@ -13,7 +13,7 @@ * limitations under the License. */ -package org.apache.xmlbeans.impl.logging; +package org.apache.poi.logging; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; Copied: poi/trunk/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java (from r1922053, xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/XmlBeansLogManager.java) URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java?p2=poi/trunk/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java&p1=xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/XmlBeansLogManager.java&r1=1922053&r2=1922055&rev=1922055&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/logging/XmlBeansLogManager.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/logging/PoiLogManager.java Sun Nov 24 19:48:55 2024 @@ -13,26 +13,26 @@ * limitations under the License. */ -package org.apache.xmlbeans.impl.logging; +package org.apache.poi.logging; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.xmlbeans.impl.util.ExceptionUtil; +import org.apache.poi.util.ExceptionUtil; /** * This class is used to get a log4j logger for the XmlBeans project. * <p>Internal use only.</p> * <p>Fails over to a No-Op logger if there are problems creating log4j logger.</p> * - * @since XmlBeans 5.3.0 + * @since POI 5.4.0 */ -public final class XmlBeansLogManager { +public final class PoiLogManager { // Sleep time in milliseconds (10 minutes) private static final long SLEEP_TIME = 10 * 60 * 1000; private static long LAST_TIME = 0; - private XmlBeansLogManager() { + private PoiLogManager() { } public static Logger getLogger(Class<?> clz) { @@ -40,7 +40,7 @@ public final class XmlBeansLogManager { final Logger logger = LogManager.getLogger(clz); if (logger == null) { if (shouldLog()) { - System.err.println("[XmlBeansLogManager] Log4J returned null logger. Falling back to No-Op logger."); + System.err.println("[PoiLogManager] Log4J returned null logger. Falling back to No-Op logger."); } return NoOpLogger.INSTANCE; } @@ -48,7 +48,7 @@ public final class XmlBeansLogManager { } catch (Throwable t) { if (!ExceptionUtil.isFatal(t)) { if (shouldLog()) { - System.err.println("[XmlBeansLogManager] Issue loading Log4J. Falling back to No-Op logger."); + System.err.println("[PoiLogManager] Issue loading Log4J. Falling back to No-Op logger."); t.printStackTrace(); } } Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java Sun Nov 24 19:48:55 2024 @@ -29,8 +29,8 @@ import java.security.GeneralSecurityExce import javax.crypto.Cipher; import com.zaxxer.sparsebits.SparseBitSet; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.POIFSWriterEvent; @@ -42,7 +42,7 @@ import org.apache.poi.util.TempFile; @Internal public abstract class ChunkedCipherOutputStream extends FilterOutputStream { - private static final Logger LOG = LogManager.getLogger(ChunkedCipherOutputStream.class); + private static final Logger LOG = PoiLogManager.getLogger(ChunkedCipherOutputStream.class); private static final int STREAMING = -1; Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java Sun Nov 24 19:48:55 2024 @@ -35,8 +35,8 @@ import javax.crypto.Cipher; import javax.crypto.CipherOutputStream; import javax.crypto.SecretKey; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.poifs.crypt.CryptoFunctions; import org.apache.poi.poifs.crypt.DataSpaceMapUtils; @@ -53,7 +53,7 @@ import org.apache.poi.util.RandomSinglet import org.apache.poi.util.TempFile; public class StandardEncryptor extends Encryptor { - private static final Logger LOG = LogManager.getLogger(StandardEncryptor.class); + private static final Logger LOG = PoiLogManager.getLogger(StandardEncryptor.class); protected StandardEncryptor() {} Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java Sun Nov 24 19:48:55 2024 @@ -33,8 +33,8 @@ import java.util.Iterator; 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.EmptyFileException; import org.apache.poi.poifs.common.POIFSBigBlockSize; import org.apache.poi.poifs.common.POIFSConstants; @@ -65,7 +65,7 @@ public class POIFSFileSystem extends Blo private static final int MAX_ALLOCATION_SIZE = 250_000_000; - private static final Logger LOG = LogManager.getLogger(POIFSFileSystem.class); + private static final Logger LOG = PoiLogManager.getLogger(POIFSFileSystem.class); /** * Maximum number size (in blocks) of the allocation table as supported by Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java Sun Nov 24 19:48:55 2024 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.poifs.filesystem; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.poifs.nio.FileBackedDataSource; import org.apache.poi.util.Beta; import org.apache.poi.util.TempFile; @@ -32,7 +32,7 @@ import java.io.IOException; */ @Beta public class TempFilePOIFSFileSystem extends POIFSFileSystem { - private static final Logger LOG = LogManager.getLogger(TempFilePOIFSFileSystem.class); + private static final Logger LOG = PoiLogManager.getLogger(TempFilePOIFSFileSystem.class); File tempFile; @Override Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java Sun Nov 24 19:48:55 2024 @@ -38,8 +38,8 @@ import java.util.zip.ZipInputStream; 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.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.DocumentInputStream; import org.apache.poi.poifs.filesystem.DocumentNode; @@ -70,7 +70,7 @@ import org.apache.poi.util.StringUtil; */ @SuppressWarnings("unused") public class VBAMacroReader implements Closeable { - private static final Logger LOGGER = LogManager.getLogger(VBAMacroReader.class); + private static final Logger LOGGER = PoiLogManager.getLogger(VBAMacroReader.class); //arbitrary limit on size of strings to read, etc. private static final int MAX_STRING_LENGTH = 20000; Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java Sun Nov 24 19:48:55 2024 @@ -29,15 +29,15 @@ import java.nio.channels.FileChannel; import java.nio.channels.WritableByteChannel; import java.util.IdentityHashMap; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.IOUtils; /** * A POIFS {@link DataSource} backed by a File */ public class FileBackedDataSource extends DataSource implements Closeable { - private static final Logger LOG = LogManager.getLogger(FileBackedDataSource.class); + private static final Logger LOG = PoiLogManager.getLogger(FileBackedDataSource.class); private final FileChannel channel; private Long channelSize; Modified: poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java Sun Nov 24 19:48:55 2024 @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Stack; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.poifs.common.POIFSBigBlockSize; import org.apache.poi.poifs.common.POIFSConstants; import org.apache.poi.poifs.filesystem.BATManaged; @@ -43,7 +43,7 @@ import static org.apache.logging.log4j.u * chain of blocks. */ public final class PropertyTable implements BATManaged { - private static final Logger LOG = LogManager.getLogger(PropertyTable.class); + private static final Logger LOG = PoiLogManager.getLogger(PropertyTable.class); private final HeaderBlock _header_block; private final List<Property> _properties = new ArrayList<>(); Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java Sun Nov 24 19:48:55 2024 @@ -43,8 +43,8 @@ import javax.imageio.stream.MemoryCacheI import org.apache.commons.collections4.iterators.IteratorIterable; 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.sl.usermodel.PictureData.PictureType; import org.apache.poi.util.IOUtils; @@ -52,7 +52,7 @@ import org.apache.poi.util.IOUtils; * For now this class renders only images supported by the javax.imageio.ImageIO framework. **/ public class BitmapImageRenderer implements ImageRenderer { - private static final Logger LOG = LogManager.getLogger(BitmapImageRenderer.class); + private static final Logger LOG = PoiLogManager.getLogger(BitmapImageRenderer.class); private static final ImageLoader[] IMAGE_LOADERS = { BitmapImageRenderer::loadColored, BitmapImageRenderer::loadGrayScaled, Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java Sun Nov 24 19:48:55 2024 @@ -46,8 +46,8 @@ import java.util.TreeMap; import java.util.function.BiFunction; 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.sl.usermodel.AbstractColorStyle; import org.apache.poi.sl.usermodel.ColorStyle; import org.apache.poi.sl.usermodel.Insets2D; @@ -71,7 +71,7 @@ public class DrawPaint { // HSL code is public domain - see https://tips4java.wordpress.com/contact-us/ - private static final Logger LOG = LogManager.getLogger(DrawPaint.class); + private static final Logger LOG = PoiLogManager.getLogger(DrawPaint.class); private static final Color TRANSPARENT = new Color(1f,1f,1f,0f); Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.NoSuchElementException; import java.util.ServiceConfigurationError; 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.common.usermodel.PictureType; import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.sl.usermodel.PictureData; @@ -38,7 +38,7 @@ import org.apache.poi.sl.usermodel.RectA public class DrawPictureShape extends DrawSimpleShape { - private static final Logger LOG = LogManager.getLogger(DrawPictureShape.class); + private static final Logger LOG = PoiLogManager.getLogger(DrawPictureShape.class); public DrawPictureShape(PictureShape<?,?> shape) { super(shape); Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java Sun Nov 24 19:48:55 2024 @@ -41,8 +41,8 @@ import java.util.List; import java.util.Locale; 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.common.usermodel.fonts.FontGroup; import org.apache.poi.common.usermodel.fonts.FontGroup.FontGroupRange; import org.apache.poi.common.usermodel.fonts.FontInfo; @@ -69,7 +69,7 @@ import org.apache.poi.util.Units; import org.w3c.dom.Text; public class DrawTextParagraph implements Drawable { - private static final Logger LOG = LogManager.getLogger(DrawTextParagraph.class); + private static final Logger LOG = PoiLogManager.getLogger(DrawTextParagraph.class); /** Keys for passing hyperlinks to the graphics context */ public static final XlinkAttribute HYPERLINK_HREF = new XlinkAttribute("href"); Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java Sun Nov 24 19:48:55 2024 @@ -37,8 +37,8 @@ import java.awt.image.renderable.Rendera import java.text.AttributedCharacterIterator; 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.sl.usermodel.FreeformShape; import org.apache.poi.sl.usermodel.GroupShape; import org.apache.poi.sl.usermodel.Insets2D; @@ -55,7 +55,7 @@ import org.apache.poi.util.SuppressForbi */ public class SLGraphics extends Graphics2D implements Cloneable { - private static final Logger LOG = LogManager.getLogger(SLGraphics.class); + private static final Logger LOG = PoiLogManager.getLogger(SLGraphics.class); //The ppt object to write into. private GroupShape<?,?> _group; Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java Sun Nov 24 19:48:55 2024 @@ -27,8 +27,8 @@ import javax.xml.stream.XMLStreamConstan import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.sl.usermodel.PaintStyle.PaintModifier; import org.apache.poi.util.Internal; @@ -55,7 +55,7 @@ class PresetParser { } } - private static final Logger LOG = LogManager.getLogger(PresetParser.class); + private static final Logger LOG = PoiLogManager.getLogger(PresetParser.class); private Mode mode; Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.function.Function; import java.util.function.Predicate; import com.zaxxer.sparsebits.SparseBitSet; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.extractor.POITextExtractor; import org.apache.poi.sl.usermodel.MasterSheet; import org.apache.poi.sl.usermodel.Notes; @@ -57,7 +57,7 @@ public class SlideShowExtractor< S extends Shape<S,P>, P extends TextParagraph<S,P,? extends TextRun> > implements POITextExtractor { - private static final Logger LOG = LogManager.getLogger(SlideShowExtractor.class); + private static final Logger LOG = PoiLogManager.getLogger(SlideShowExtractor.class); // placeholder text for slide numbers private static final String SLIDE_NUMBER_PH = "â¹#âº"; Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java Sun Nov 24 19:48:55 2024 @@ -24,14 +24,14 @@ import java.io.IOException; import javax.imageio.ImageIO; 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.util.Internal; import org.apache.poi.util.Units; @Internal public class ImageHeaderBitmap { - private static final Logger LOG = LogManager.getLogger(ImageHeaderBitmap.class); + private static final Logger LOG = PoiLogManager.getLogger(ImageHeaderBitmap.class); private final Dimension size; Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java Sun Nov 24 19:48:55 2024 @@ -20,15 +20,15 @@ package org.apache.poi.sl.image; import java.awt.Dimension; import java.awt.Rectangle; -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.LocaleUtil; @Internal public class ImageHeaderEMF { - private static final Logger LOG = LogManager.getLogger(ImageHeaderEMF.class); + private static final Logger LOG = PoiLogManager.getLogger(ImageHeaderEMF.class); private static final String EMF_SIGNATURE = " EMF"; // 0x464D4520 (LE) Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.awt.Rectangle; 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.util.Internal; import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; @@ -47,7 +47,7 @@ import org.apache.poi.util.Units; public class ImageHeaderWMF { public static final int APMHEADER_KEY = 0x9AC6CDD7; - private static final Logger LOG = LogManager.getLogger(ImageHeaderWMF.class); + private static final Logger LOG = PoiLogManager.getLogger(ImageHeaderWMF.class); @SuppressWarnings("unused") private final int handle; Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; 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.poifs.filesystem.DirectoryEntry; import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.poifs.filesystem.POIFSFileSystem; @@ -68,7 +68,7 @@ public interface ObjectData { FileMagic fm = FileMagic.valueOf(is); return fm == FileMagic.OLE2; } catch (IOException e) { - Logger LOG = LogManager.getLogger(ObjectData.class); + Logger LOG = PoiLogManager.getLogger(ObjectData.class); LOG.atWarn().withThrowable(e).log("Can't determine filemagic of ole stream"); return false; } Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.Iterator; 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.ClassID; import org.apache.poi.hpsf.ClassIDPredefined; import org.apache.poi.poifs.filesystem.DirectoryNode; @@ -56,7 +56,7 @@ import org.apache.poi.util.LocaleUtil; */ @Beta public class EmbeddedExtractor implements Iterable<EmbeddedExtractor> { - private static final Logger LOG = LogManager.getLogger(EmbeddedExtractor.class); + private static final Logger LOG = PoiLogManager.getLogger(EmbeddedExtractor.class); //arbitrarily selected; may need to increase 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/src/main/java/org/apache/poi/ss/format/CellFormat.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.regex.Pattern; import javax.swing.JLabel; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.ConditionalFormatting; @@ -93,7 +93,7 @@ import org.apache.poi.util.LocaleUtil; */ public class CellFormat { /** The logger to use in the formatting code. */ - private static final Logger LOG = LogManager.getLogger(CellFormat.class); + private static final Logger LOG = PoiLogManager.getLogger(CellFormat.class); private static final Pattern ONE_PART = Pattern.compile( CellFormatPart.FORMAT_PAT.pattern() + "(;|$)", Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java Sun Nov 24 19:48:55 2024 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.ss.format; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.util.CodepointsUtil; import org.apache.poi.util.LocaleUtil; @@ -47,7 +47,7 @@ import static org.apache.poi.ss.format.C */ @SuppressWarnings("RegExpRepeatedSpace") public class CellFormatPart { - private static final Logger LOG = LogManager.getLogger(CellFormatPart.class); + private static final Logger LOG = PoiLogManager.getLogger(CellFormatPart.class); static final Map<String, Color> NAMED_COLORS; Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java Sun Nov 24 19:48:55 2024 @@ -33,15 +33,15 @@ import java.util.Set; import java.util.TreeSet; import com.zaxxer.sparsebits.SparseBitSet; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.LocaleUtil; /** * This class implements printing out a value using a number format. */ public class CellNumberFormatter extends CellFormatter { - private static final Logger LOG = LogManager.getLogger(CellNumberFormatter.class); + private static final Logger LOG = PoiLogManager.getLogger(CellNumberFormatter.class); private final String desc; private final String printfFmt; Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.util.List; import java.util.Locale; 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.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.SpreadsheetVersion; @@ -97,7 +97,7 @@ import org.apache.poi.util.StringUtil; */ @Internal public final class FormulaParser { - private static final Logger LOGGER = LogManager.getLogger(FormulaParser.class); + private static final Logger LOGGER = PoiLogManager.getLogger(FormulaParser.class); private final String _formulaString; private final int _formulaLength; Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java Sun Nov 24 19:48:55 2024 @@ -25,8 +25,8 @@ import java.util.Map; import java.util.Stack; 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.logging.log4j.message.SimpleMessage; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment.WorkbookNotFoundException; @@ -54,7 +54,7 @@ import static org.apache.logging.log4j.u @Internal public final class WorkbookEvaluator { - private static final Logger LOG = LogManager.getLogger(WorkbookEvaluator.class); + private static final Logger LOG = PoiLogManager.getLogger(WorkbookEvaluator.class); private final EvaluationWorkbook _workbook; private EvaluationCache _cache; @@ -78,7 +78,7 @@ public final class WorkbookEvaluator { private boolean dbgEvaluationOutputForNextEval; // special logger for formula evaluation output (because of possibly very large output) - private static final Logger EVAL_LOG = LogManager.getLogger("POI.FormulaEval"); + private static final Logger EVAL_LOG = PoiLogManager.getLogger("POI.FormulaEval"); // current indent level for evaluation; negative value for no output private int dbgEvaluationOutputIndent = -1; Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.constant; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.usermodel.FormulaError; import static org.apache.logging.log4j.util.Unbox.box; @@ -30,7 +30,7 @@ import static org.apache.logging.log4j.u * {@code ErrorEval}. */ public final class ErrorConstant { - private static final Logger LOG = LogManager.getLogger(ErrorConstant.class); + private static final Logger LOG = PoiLogManager.getLogger(ErrorConstant.class); private static final ErrorConstant NULL = new ErrorConstant(FormulaError.NULL.getCode()); private static final ErrorConstant DIV_0 = new ErrorConstant(FormulaError.DIV0.getCode()); private static final ErrorConstant VALUE = new ErrorConstant(FormulaError.VALUE.getCode()); Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.eval.*; import org.apache.poi.ss.util.DateParser; import org.apache.poi.ss.usermodel.DateUtil; @@ -45,7 +45,7 @@ import java.time.DateTimeException; */ public class DateValue extends Fixed1ArgFunction { - private static final Logger LOG = LogManager.getLogger(DateValue.class); + private static final Logger LOG = PoiLogManager.getLogger(DateValue.class); @Override public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval dateTextArg) { Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.FormulaParseException; import org.apache.poi.ss.formula.FormulaParser; import org.apache.poi.ss.formula.FormulaParsingWorkbook; @@ -47,7 +47,7 @@ import org.apache.poi.ss.usermodel.Table */ public final class Indirect implements FreeRefFunction { - private static final Logger LOGGER = LogManager.getLogger(Indirect.class); + private static final Logger LOGGER = PoiLogManager.getLogger(Indirect.class); public static final FreeRefFunction instance = new Indirect(); private Indirect() { Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.ss.formula.eval.NumberEval; @@ -35,7 +35,7 @@ import org.apache.poi.ss.formula.eval.Va public final class Irr implements Function { private static final int MAX_ITERATION_COUNT = 1000; private static final double ABSOLUTE_ACCURACY = 1E-7; - private static final Logger LOGGER = LogManager.getLogger(Irr.class); + private static final Logger LOGGER = PoiLogManager.getLogger(Irr.class); public ValueEval evaluate(final ValueEval[] args, final int srcRowIndex, final int srcColumnIndex) { Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.EvaluationException; import org.apache.poi.ss.formula.eval.NumberEval; @@ -29,7 +29,7 @@ import org.apache.poi.ss.formula.eval.Va * Implements the Excel Rate function */ public class Rate implements Function { - private static final Logger LOG = LogManager.getLogger(Rate.class); + private static final Logger LOG = PoiLogManager.getLogger(Rate.class); @Override public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) { Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeValue.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeValue.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeValue.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeValue.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.ss.formula.functions; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.eval.*; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.util.DateParser; @@ -45,7 +45,7 @@ import java.time.LocalDate; */ public class TimeValue extends Fixed1ArgFunction { - private static final Logger LOG = LogManager.getLogger(TimeValue.class); + private static final Logger LOG = PoiLogManager.getLogger(TimeValue.class); @Override public ValueEval evaluate(int srcRowIndex, int srcColumnIndex, ValueEval dateTimeTextArg) { Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java Sun Nov 24 19:48:55 2024 @@ -36,8 +36,8 @@ import java.util.Map; 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.ss.format.CellFormat; import org.apache.poi.ss.format.CellFormatResult; import org.apache.poi.ss.formula.ConditionalFormattingEvaluator; @@ -221,7 +221,7 @@ public class DataFormatter { private final PropertyChangeSupport pcs; /** For logging any problems we find */ - private static final Logger LOG = LogManager.getLogger(DataFormatter.class); + private static final Logger LOG = PoiLogManager.getLogger(DataFormatter.class); /** * Creates a formatter using the {@link Locale#getDefault() default locale}. Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java Sun Nov 24 19:48:55 2024 @@ -24,8 +24,8 @@ import java.text.ParsePosition; 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.ss.format.SimpleFraction; import org.apache.poi.ss.formula.eval.NotImplementedException; @@ -43,7 +43,7 @@ import org.apache.poi.ss.formula.eval.No @SuppressWarnings("serial") public class FractionFormat extends Format { - private static final Logger LOGGER = LogManager.getLogger(FractionFormat.class); + private static final Logger LOGGER = PoiLogManager.getLogger(FractionFormat.class); private static final Pattern DENOM_FORMAT_PATTERN = Pattern.compile("(#+)|(\\d+)"); //this was chosen to match the earlier limitation of max denom power Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java Sun Nov 24 19:48:55 2024 @@ -25,9 +25,9 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.poi.common.Duplicatable; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellCopyContext; @@ -57,7 +57,7 @@ import org.apache.poi.util.Removal; */ public final class CellUtil { - private static final Logger LOGGER = LogManager.getLogger(CellUtil.class); + private static final Logger LOGGER = PoiLogManager.getLogger(CellUtil.class); private static final Set<CellPropertyType> SHORT_VALUES = EnumSet.of( CellPropertyType.BOTTOM_BORDER_COLOR, Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java Sun Nov 24 19:48:55 2024 @@ -24,8 +24,8 @@ import java.util.List; import java.util.Locale; 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.LocaleID; /** @@ -49,7 +49,7 @@ import org.apache.poi.util.LocaleID; */ @SuppressWarnings("unused") public final class DateFormatConverter { - private static final Logger LOG = LogManager.getLogger(DateFormatConverter.class); + private static final Logger LOG = PoiLogManager.getLogger(DateFormatConverter.class); private DateFormatConverter() { } Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java (original) +++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import javax.imageio.ImageReader; import javax.imageio.stream.ImageInputStream; 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.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.ss.usermodel.ClientAnchor; import org.apache.poi.ss.usermodel.Picture; @@ -45,7 +45,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; public final class ImageUtils { - private static final Logger LOG = LogManager.getLogger(ImageUtils.class); + private static final Logger LOG = PoiLogManager.getLogger(ImageUtils.class); private static final int WIDTH_UNITS = 1024; private static final int HEIGHT_UNITS = 256; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
