Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java Sun Nov 24 19:48:55 2024 @@ -36,8 +36,8 @@ import java.util.Set; import java.util.regex.Pattern; 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.GenericRecord; import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.sl.draw.Drawable; @@ -50,7 +50,7 @@ import org.apache.poi.util.LocaleUtil; * An utility to convert slides of a .pptx slide show to a PNG image */ public final class PPTX2PNG { - private static final Logger LOG = LogManager.getLogger(PPTX2PNG.class); + private static final Logger LOG = PoiLogManager.getLogger(PPTX2PNG.class); private static final String INPUT_PAT_REGEX = "(?<slideno>[^|]+)\\|(?<format>[^|]+)\\|(?<basename>.+)\\.(?<ext>[^.]++)";
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.List; import java.util.Set; 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.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; @@ -58,7 +58,7 @@ import org.apache.poi.xssf.usermodel.XSS */ public class XSSFBReader extends XSSFReader { - private static final Logger LOGGER = LogManager.getLogger(XSSFBReader.class); + private static final Logger LOGGER = PoiLogManager.getLogger(XSSFBReader.class); private static final Set<String> WORKSHEET_RELS = Collections.unmodifiableSet(new HashSet<>( Arrays.asList( Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.util.Set; import javax.xml.parsers.ParserConfigurationException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; @@ -70,7 +70,7 @@ public class XSSFReader { XSSFRelation.CHARTSHEET.getRelation(), XSSFRelation.MACRO_SHEET_XML.getRelation()) )); - private static final Logger LOGGER = LogManager.getLogger(XSSFReader.class); + private static final Logger LOGGER = PoiLogManager.getLogger(XSSFReader.class); protected OPCPackage pkg; protected PackagePart workbookPart; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Queue; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.RichTextString; @@ -48,7 +48,7 @@ import org.xml.sax.helpers.DefaultHandle * you need to implement for reading information from a file. */ public class XSSFSheetXMLHandler extends DefaultHandler { - private static final Logger LOG = LogManager.getLogger(XSSFSheetXMLHandler.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFSheetXMLHandler.class); /** * These are the different kinds of cells we support. Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.io.InputStream; import java.util.Collections; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.ss.usermodel.DataFormatter; @@ -46,7 +46,7 @@ import org.xml.sax.SAXException; */ public class XSSFBEventBasedExcelExtractor extends XSSFEventBasedExcelExtractor { - private static final Logger LOGGER = LogManager.getLogger(XSSFBEventBasedExcelExtractor.class); + private static final Logger LOGGER = PoiLogManager.getLogger(XSSFBEventBasedExcelExtractor.class); public static final List<XSSFRelation> SUPPORTED_TYPES = Collections.singletonList( XSSFRelation.XLSB_BINARY_WORKBOOK Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java Sun Nov 24 19:48:55 2024 @@ -25,8 +25,8 @@ import java.util.Map; import javax.xml.parsers.ParserConfigurationException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.POIXMLDocument; import org.apache.poi.ooxml.POIXMLProperties; import org.apache.poi.ooxml.POIXMLProperties.CoreProperties; @@ -63,7 +63,7 @@ import org.xml.sax.XMLReader; public class XSSFEventBasedExcelExtractor implements POIXMLTextExtractor, ExcelExtractor { - private static final Logger LOGGER = LogManager.getLogger(XSSFEventBasedExcelExtractor.class); + private static final Logger LOGGER = PoiLogManager.getLogger(XSSFEventBasedExcelExtractor.class); protected final OPCPackage container; protected final POIXMLProperties properties; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java Sun Nov 24 19:48:55 2024 @@ -38,8 +38,8 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.util.DocumentHelper; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.DateUtil; @@ -79,7 +79,7 @@ import org.xml.sax.SAXException; * </ul> */ public class XSSFExportToXml implements Comparator<String>{ - private static final Logger LOG = LogManager.getLogger(XSSFExportToXml.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFExportToXml.class); @FunctionalInterface Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java Sun Nov 24 19:48:55 2024 @@ -35,8 +35,8 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.util.DocumentHelper; import org.apache.poi.ooxml.util.XPathHelper; import org.apache.poi.ss.usermodel.DateUtil; @@ -72,7 +72,7 @@ public class XSSFImportFromXML { private final XSSFMap _map; - private static final Logger LOG = LogManager.getLogger(XSSFImportFromXML.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFImportFromXML.class); public XSSFImportFromXML(XSSFMap map) { _map = map; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Iterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.util.Beta; import org.apache.poi.util.NotImplemented; @@ -39,7 +39,7 @@ import org.apache.poi.xssf.usermodel.XSS */ @Beta public class DeferredSXSSFWorkbook extends SXSSFWorkbook { - private static final Logger LOG = LogManager.getLogger(DeferredSXSSFWorkbook.class); + private static final Logger LOG = PoiLogManager.getLogger(DeferredSXSSFWorkbook.class); public DeferredSXSSFWorkbook() { this(null); Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.xssf.streaming; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.EvaluationCell; import org.apache.poi.ss.formula.IStabilityClassifier; import org.apache.poi.ss.formula.WorkbookEvaluator; @@ -36,7 +36,7 @@ import static org.apache.logging.log4j.u * lookup cells within the current Window. */ public final class SXSSFFormulaEvaluator extends BaseXSSFFormulaEvaluator { - private static final Logger LOG = LogManager.getLogger(SXSSFFormulaEvaluator.class); + private static final Logger LOG = PoiLogManager.getLogger(SXSSFFormulaEvaluator.class); private final SXSSFWorkbook wb; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.awt.Dimension; import java.io.IOException; import java.io.InputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.ss.usermodel.Picture; import org.apache.poi.ss.usermodel.Row; @@ -51,7 +51,7 @@ import org.openxmlformats.schemas.spread * The main change is to access the rows in the SXSSF sheet, not the always empty rows in the XSSF sheet when checking the row heights. */ public final class SXSSFPicture implements Picture { - private static final Logger LOG = LogManager.getLogger(SXSSFPicture.class); + private static final Logger LOG = PoiLogManager.getLogger(SXSSFPicture.class); /** * Column width measured as the number of characters of the maximum digit width of the * numbers 0, 1, 2, ..., 9 as rendered in the normal style's font. There are 4 pixels of margin Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellAddress; @@ -43,7 +43,7 @@ import org.openxmlformats.schemas.spread * Streaming version of XSSFSheet implementing the "BigGridDemo" strategy. */ public class SXSSFSheet implements Sheet, OoxmlSheetExtensions { - private static final Logger LOG = LogManager.getLogger(SXSSFSheet.class); + private static final Logger LOG = PoiLogManager.getLogger(SXSSFSheet.class); /*package*/ final XSSFSheet _sh; protected final SXSSFWorkbook _workbook; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java Sun Nov 24 19:48:55 2024 @@ -40,8 +40,8 @@ import org.apache.commons.compress.archi import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; 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.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.util.ZipArchiveThresholdInputStream; import org.apache.poi.openxml4j.util.ZipEntrySource; @@ -113,7 +113,7 @@ public class SXSSFWorkbook implements Wo * via {@link SXSSFSheet#getRow} anymore. */ public static final int DEFAULT_WINDOW_SIZE = 100; - private static final Logger LOG = LogManager.getLogger(SXSSFWorkbook.class); + private static final Logger LOG = PoiLogManager.getLogger(SXSSFWorkbook.class); protected final XSSFWorkbook _wb; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java Sun Nov 24 19:48:55 2024 @@ -33,8 +33,8 @@ import java.nio.charset.StandardCharsets import java.util.Iterator; import java.util.PrimitiveIterator; -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.CellStyle; import org.apache.poi.ss.usermodel.CellType; @@ -54,7 +54,7 @@ import org.openxmlformats.schemas.spread * so that it was renamed to "SheetDataWriter" */ public class SheetDataWriter implements Closeable { - private static final Logger LOG = LogManager.getLogger(SheetDataWriter.class); + private static final Logger LOG = PoiLogManager.getLogger(SheetDataWriter.class); private final File _fd; protected final Writer _out; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.Beta; /** @@ -37,7 +37,7 @@ import org.apache.poi.util.Beta; */ @Beta public class StreamingSheetWriter extends SheetDataWriter { - private static final Logger LOG = LogManager.getLogger(StreamingSheetWriter.class); + private static final Logger LOG = PoiLogManager.getLogger(StreamingSheetWriter.class); private boolean closed = false; public StreamingSheetWriter() throws IOException { Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java Sun Nov 24 19:48:55 2024 @@ -29,8 +29,8 @@ import java.util.Spliterator; import javax.xml.namespace.QName; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -77,7 +77,7 @@ import org.openxmlformats.schemas.spread * Represents a SpreadsheetML drawing */ public final class XSSFDrawing extends POIXMLDocumentPart implements Drawing<XSSFShape> { - private static final Logger LOG = LogManager.getLogger(XSSFDrawing.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFDrawing.class); /** * Root element of the SpreadsheetML Drawing part Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.io.InputStream; import javax.xml.namespace.QName; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.opc.PackagePart; @@ -51,7 +51,7 @@ import org.openxmlformats.schemas.spread * Represents binary object (i.e. OLE) data stored in the file. Eg. A GIF, JPEG etc... */ public class XSSFObjectData extends XSSFSimpleShape implements ObjectData { - private static final Logger LOG = LogManager.getLogger(XSSFObjectData.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFObjectData.class); /** * A default instance of CTShape used for creating new shapes. Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.awt.Dimension; import java.io.IOException; import java.io.InputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.ss.usermodel.Picture; @@ -45,7 +45,7 @@ import org.openxmlformats.schemas.drawin * Represents a picture shape in a SpreadsheetML drawing. */ public final class XSSFPicture extends XSSFShape implements Picture { - private static final Logger LOG = LogManager.getLogger(XSSFPicture.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFPicture.class); /* * Column width measured as the number of characters of the maximum digit width of the Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Sun Nov 24 19:48:55 2024 @@ -30,8 +30,8 @@ import javax.xml.namespace.QName; 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.ooxml.POIXMLDocumentPart; import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -76,7 +76,7 @@ import org.openxmlformats.schemas.spread * </p> */ public class XSSFSheet extends POIXMLDocumentPart implements Sheet, OoxmlSheetExtensions { - private static final Logger LOG = LogManager.getLogger(XSSFSheet.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFSheet.class); private static final double DEFAULT_ROW_HEIGHT = 15.0; private static final double DEFAULT_MARGIN_HEADER = 0.3; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentSkipListMap; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.ss.SpreadsheetVersion; @@ -58,7 +58,7 @@ import org.openxmlformats.schemas.spread */ public class XSSFTable extends POIXMLDocumentPart implements Table { - private static final Logger LOG = LogManager.getLogger(XSSFTable.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFTable.class); private CTTable ctTable; private transient List<XSSFXmlColumnPr> xmlColumnPrs; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,8 @@ import java.util.EnumMap; 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.ss.usermodel.DifferentialStyleProvider; import org.apache.poi.ss.usermodel.TableStyle; import org.apache.poi.ss.usermodel.TableStyleType; @@ -41,7 +41,7 @@ import org.openxmlformats.schemas.spread * Also used for built-in styles via dummy XML generated from presetTableStyles.xml. */ public class XSSFTableStyle implements TableStyle { - private static final Logger LOG = LogManager.getLogger(XSSFTableStyle.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFTableStyle.class); private final String name; private final int index; Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java Sun Nov 24 19:48:55 2024 @@ -44,8 +44,8 @@ import javax.xml.namespace.QName; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; 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.ClassIDPredefined; import org.apache.poi.ooxml.HyperlinkRelationship; import org.apache.poi.ooxml.POIXMLDocument; @@ -194,7 +194,7 @@ public class XSSFWorkbook extends POIXML */ private List<XSSFPictureData> pictures; - private static final Logger LOG = LogManager.getLogger(XSSFWorkbook.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFWorkbook.class); /** * cached instance of XSSFCreationHelper for this workbook Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.xssf.usermodel.helpers; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ss.formula.FormulaShifter; import org.apache.poi.ss.formula.FormulaParser; import org.apache.poi.ss.formula.FormulaType; @@ -44,7 +44,7 @@ import static org.apache.logging.log4j.u */ @Internal /*private*/ final class XSSFRowColShifter { - private static final Logger LOG = LogManager.getLogger(XSSFRowColShifter.class); + private static final Logger LOG = PoiLogManager.getLogger(XSSFRowColShifter.class); private XSSFRowColShifter() { /*no instances for static classes*/} Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java (original) +++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java Sun Nov 24 19:48:55 2024 @@ -38,8 +38,8 @@ import java.util.Optional; import java.util.Spliterator; import javax.xml.namespace.QName; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.PictureType; import org.apache.poi.ooxml.POIXMLDocument; import org.apache.poi.ooxml.POIXMLDocumentPart; @@ -103,7 +103,7 @@ import org.openxmlformats.schemas.wordpr */ @SuppressWarnings("unused") public class XWPFDocument extends POIXMLDocument implements Document, IBody { - private static final Logger LOG = LogManager.getLogger(XWPFDocument.class); + private static final Logger LOG = PoiLogManager.getLogger(XWPFDocument.class); protected List<XWPFFooter> footers = new ArrayList<>(); protected List<XWPFHeader> headers = new ArrayList<>(); Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java Sun Nov 24 19:48:55 2024 @@ -24,15 +24,15 @@ import java.io.IOException; import java.io.InputStream; 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.openxml4j.OpenXML4JTestDataSamples; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public final class TestListParts { - private static final Logger LOG = LogManager.getLogger(TestListParts.class); + private static final Logger LOG = PoiLogManager.getLogger(TestListParts.class); private TreeMap<PackagePartName, String> expectedValues; Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java Sun Nov 24 19:48:55 2024 @@ -59,8 +59,8 @@ import org.apache.commons.compress.archi import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.output.CountingOutputStream; 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.POIDataSamples; import org.apache.poi.POITestCase; @@ -100,7 +100,7 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; public final class TestPackage { - private static final Logger LOG = LogManager.getLogger(TestPackage.class); + private static final Logger LOG = PoiLogManager.getLogger(TestPackage.class); private static final String CONTENT_EXT_PROPS = "application/vnd.openxmlformats-officedocument.extended-properties+xml"; private static final POIDataSamples xlsSamples = POIDataSamples.getSpreadSheetInstance(); Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java Sun Nov 24 19:48:55 2024 @@ -30,8 +30,8 @@ import java.net.URI; import java.util.regex.Pattern; 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.openxml4j.OpenXML4JTestDataSamples; import org.apache.poi.xssf.usermodel.XSSFRelation; import org.junit.jupiter.api.Test; @@ -45,7 +45,7 @@ class TestRelationships { private static final String SHEET_WITH_COMMENTS = "/xl/worksheets/sheet1.xml"; - private static final Logger LOG = LogManager.getLogger(TestRelationships.class); + private static final Logger LOG = PoiLogManager.getLogger(TestRelationships.class); /** * Test relationships are correctly loaded. This at the moment fails (as of r499) Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java Sun Nov 24 19:48:55 2024 @@ -62,8 +62,8 @@ import javax.xml.crypto.dsig.dom.DOMSign import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; import org.apache.jcp.xml.dsig.internal.dom.DOMSignedInfo; -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.POIDataSamples; import org.apache.poi.POITestCase; @@ -126,7 +126,7 @@ import org.w3.x2000.x09.xmldsig.Signatur import org.w3c.dom.Document; class TestSignatureInfo { - private static final Logger LOG = LogManager.getLogger(TestSignatureInfo.class); + private static final Logger LOG = PoiLogManager.getLogger(TestSignatureInfo.class); private static final POIDataSamples testdata = POIDataSamples.getXmlDSignInstance(); private static final String STORE_PASS = "test"; Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java Sun Nov 24 19:48:55 2024 @@ -34,8 +34,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; 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.EmptyFileException; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.POIDataSamples; @@ -62,7 +62,7 @@ public final class TestWorkbookFactory { private static final String[] xlsx_protected = new String[]{"protected_passtika.xlsx", "tika"}; private static final String txt = "SampleSS.txt"; - private static final Logger LOGGER = LogManager.getLogger(TestWorkbookFactory.class); + private static final Logger LOGGER = PoiLogManager.getLogger(TestWorkbookFactory.class); /** * Closes the sample workbook read in from filename. Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java Sun Nov 24 19:48:55 2024 @@ -29,8 +29,8 @@ 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.logging.PoiLogManager; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; @@ -59,7 +59,7 @@ import org.junit.jupiter.params.provider * */ public final class TestFormulaEvaluatorOnXSSF { - private static final Logger LOG = LogManager.getLogger(TestFormulaEvaluatorOnXSSF.class); + private static final Logger LOG = PoiLogManager.getLogger(TestFormulaEvaluatorOnXSSF.class); private static XSSFWorkbook workbook; private static Sheet sheet; Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ 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.logging.PoiLogManager; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.functions.BaseTestNumeric; import org.apache.poi.ss.usermodel.Cell; @@ -47,7 +47,7 @@ import org.junit.jupiter.params.provider public final class TestMatrixFormulasFromXMLSpreadsheet { - private static final Logger LOG = LogManager.getLogger(TestMatrixFormulasFromXMLSpreadsheet.class); + private static final Logger LOG = PoiLogManager.getLogger(TestMatrixFormulasFromXMLSpreadsheet.class); private static XSSFWorkbook workbook; private static Sheet sheet; Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ 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.logging.PoiLogManager; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; @@ -52,7 +52,7 @@ import org.junit.jupiter.params.provider * Tests formulas for multi sheet reference (i.e. SUM(Sheet1:Sheet5!A1)) */ public final class TestMultiSheetFormulaEvaluatorOnXSSF { - private static final Logger LOG = LogManager.getLogger(TestMultiSheetFormulaEvaluatorOnXSSF.class); + private static final Logger LOG = PoiLogManager.getLogger(TestMultiSheetFormulaEvaluatorOnXSSF.class); private static XSSFWorkbook workbook; private static Sheet sheet; Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Sun Nov 24 19:48:55 2024 @@ -49,8 +49,8 @@ import org.apache.commons.compress.archi import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.io.output.NullOutputStream; 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.POIDataSamples; import org.apache.poi.common.usermodel.HyperlinkType; import org.apache.poi.hssf.HSSFITestDataProvider; @@ -137,7 +137,7 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; public final class TestXSSFBugs extends BaseTestBugzillaIssues { - private static final Logger LOG = LogManager.getLogger(TestXSSFBugs.class); + private static final Logger LOG = PoiLogManager.getLogger(TestXSSFBugs.class); public TestXSSFBugs() { super(XSSFITestDataProvider.instance); Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import static org.junit.jupiter.api.Asse 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.xssf.XSSFTestDataSamples; import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCol; @@ -43,7 +43,7 @@ import org.openxmlformats.schemas.spread */ class TestXSSFColGrouping { - private static final Logger LOG = LogManager.getLogger(TestXSSFColGrouping.class); + private static final Logger LOG = PoiLogManager.getLogger(TestXSSFColGrouping.class); /** Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java (original) +++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java Sun Nov 24 19:48:55 2024 @@ -22,15 +22,15 @@ import static org.junit.jupiter.api.Asse import java.io.IOException; 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.ss.util.CellRangeAddress; import org.apache.poi.xssf.XSSFTestDataSamples; import org.junit.jupiter.api.Test; class TestXSSFSheetMergeRegions { - private static final Logger LOG = LogManager.getLogger(TestXSSFSheetMergeRegions.class); + private static final Logger LOG = PoiLogManager.getLogger(TestXSSFSheetMergeRegions.class); @Test void testMergeRegionsSpeed() throws IOException { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java Sun Nov 24 19:48:55 2024 @@ -24,8 +24,8 @@ import java.util.List; import java.util.stream.StreamSupport; import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.extractor.ExtractorFactory; import org.apache.poi.extractor.ExtractorProvider; import org.apache.poi.extractor.POIOLE2TextExtractor; @@ -58,7 +58,7 @@ import org.apache.poi.sl.usermodel.Slide */ @SuppressWarnings("WeakerAccess") public class OLE2ScratchpadExtractorFactory implements ExtractorProvider { - private static final Logger LOG = LogManager.getLogger(OLE2ScratchpadExtractorFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(OLE2ScratchpadExtractorFactory.class); private static final String[] OUTLOOK_ENTRY_NAMES = { // message bodies, saved as plain text (PtypString) Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hdgf.chunks; import java.util.ArrayList; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.ChunkFactory.CommandDefinition; import org.apache.poi.util.LittleEndian; @@ -31,7 +31,7 @@ import static org.apache.logging.log4j.u */ public final class Chunk { /** For logging warnings about the structure of the file */ - private static final Logger LOG = LogManager.getLogger(Chunk.class); + private static final Logger LOG = PoiLogManager.getLogger(Chunk.class); /** * The contents of the chunk, excluding the header, Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LocaleUtil; @@ -61,7 +61,7 @@ public final class ChunkFactory { "/org/apache/poi/hdgf/chunks_parse_cmds.tbl"; /** For logging problems we spot with the file */ - private static final Logger LOG = LogManager.getLogger(ChunkFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(ChunkFactory.class); /** * @param length the max record length allowed for ChunkFactory Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hdgf.streams; import java.util.ArrayList; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.Chunk; import org.apache.poi.hdgf.chunks.ChunkFactory; import org.apache.poi.hdgf.chunks.ChunkHeader; @@ -29,7 +29,7 @@ import org.apache.poi.hdgf.pointers.Poin import static org.apache.logging.log4j.util.Unbox.box; public final class ChunkStream extends Stream { - private static final Logger LOG = LogManager.getLogger(ChunkStream.class); + private static final Logger LOG = PoiLogManager.getLogger(ChunkStream.class); private final ChunkFactory chunkFactory; /** All the Chunks we contain */ Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java Sun Nov 24 19:48:55 2024 @@ -17,8 +17,8 @@ package org.apache.poi.hdgf.streams; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hdgf.chunks.ChunkFactory; import org.apache.poi.hdgf.pointers.Pointer; import org.apache.poi.hdgf.pointers.PointerFactory; @@ -28,7 +28,7 @@ import org.apache.poi.hdgf.pointers.Poin * other data too. */ public class PointerContainingStream extends Stream { // TODO - instantiable superclass - private static final Logger LOG = LogManager.getLogger(PointerContainingStream.class); + private static final Logger LOG = PoiLogManager.getLogger(PointerContainingStream.class); private static final int MAX_CHILDREN_NESTING = 500; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java Sun Nov 24 19:48:55 2024 @@ -31,8 +31,8 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hemf.draw.HemfGraphics; import org.apache.poi.hemf.draw.HemfGraphics.EmfRenderState; @@ -55,7 +55,7 @@ import org.apache.poi.util.RecordFormatE */ @Internal public class HemfComment { - private static final Logger LOG = LogManager.getLogger(HemfComment.class); + private static final Logger LOG = PoiLogManager.getLogger(HemfComment.class); public enum HemfCommentRecordType { emfGeneric(-1, EmfCommentDataGeneric::new, false), Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hpsf.Filetime; @@ -42,7 +42,7 @@ import org.apache.poi.util.LocaleUtil; * @see <a href="https://msdn.microsoft.com/en-us/library/cc433490(v=exchg.80).aspx">[MS-OXPROPS]: Exchange Server Protocols Master Property List</a> */ public final class MAPIDateAttribute extends MAPIAttribute { - private static final Logger LOG = LogManager.getLogger(MAPIDateAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(MAPIDateAttribute.class); private final Date data; /** Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hmef.attribute; import java.nio.charset.Charset; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hsmf.datatypes.MAPIProperty; @@ -32,7 +32,7 @@ import org.apache.poi.util.StringUtil; * to a {@link HMEFMessage} or one of its {@link Attachment}s. */ public final class MAPIStringAttribute extends MAPIAttribute { - private static final Logger LOG = LogManager.getLogger(MAPIStringAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(MAPIStringAttribute.class); private static final String CODEPAGE = "CP1252"; private final String data; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.hpsf.Filetime; @@ -39,7 +39,7 @@ import org.apache.poi.util.LocaleUtil; * or one of its {@link Attachment}s. */ public final class TNEFDateAttribute extends TNEFAttribute { - private static final Logger LOG = LogManager.getLogger(TNEFDateAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(TNEFDateAttribute.class); private final Date data; /** Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hmef.attribute; import java.io.IOException; import java.io.InputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hmef.Attachment; import org.apache.poi.hmef.HMEFMessage; import org.apache.poi.util.StringUtil; @@ -31,7 +31,7 @@ import org.apache.poi.util.StringUtil; * or one of its {@link Attachment}s. */ public final class TNEFStringAttribute extends TNEFAttribute { - private static final Logger LOG = LogManager.getLogger(TNEFStringAttribute.class); + private static final Logger LOG = PoiLogManager.getLogger(TNEFStringAttribute.class); private final String data; /** Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hpbf.model; import java.io.IOException; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hpbf.model.qcbits.QCBit; import org.apache.poi.hpbf.model.qcbits.QCPLCBit; import org.apache.poi.hpbf.model.qcbits.QCTextBit; @@ -34,7 +34,7 @@ import org.apache.poi.util.LocaleUtil; * Read Quill Contents (/Quill/QuillSub/CONTENTS) from an HPBF (Publisher .pub) document */ public final class QuillContents extends HPBFPart { - private static final Logger LOG = LogManager.getLogger(QuillContents.class); + private static final Logger LOG = PoiLogManager.getLogger(QuillContents.class); private static final String[] PATH = { "Quill", "QuillSub", "CONTENTS", }; private final QCBit[] bits; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java Sun Nov 24 19:48:55 2024 @@ -28,8 +28,8 @@ import java.util.zip.InflaterInputStream import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.hslf.exceptions.HSLFException; @@ -44,7 +44,7 @@ import org.apache.poi.util.Units; * Represents Macintosh PICT picture data. */ public final class PICT extends Metafile { - private static final Logger LOG = LogManager.getLogger(PICT.class); + private static final Logger LOG = PoiLogManager.getLogger(PICT.class); /** * @deprecated Use {@link HSLFSlideShow#addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)} or one of its overloads to create new Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hslf.model; import java.io.IOException; import java.util.ServiceLoader; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherComplexProperty; import org.apache.poi.ddf.EscherPropertyTypes; @@ -42,7 +42,7 @@ public class HSLFMetroShape< S extends Shape<S,P>, P extends TextParagraph<S,P,? extends TextRun> > { - private static final Logger LOGGER = LogManager.getLogger(HSLFMetroShape.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSLFMetroShape.class); private final HSLFShape shape; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java Sun Nov 24 19:48:55 2024 @@ -22,8 +22,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.logging.log4j.message.SimpleMessage; import org.apache.poi.util.GenericRecordUtil; @@ -35,7 +35,7 @@ import org.apache.poi.util.GenericRecord * (but related) properties */ public abstract class BitMaskTextProp extends TextProp { - protected static final Logger LOG = LogManager.getLogger(BitMaskTextProp.class); + protected static final Logger LOG = PoiLogManager.getLogger(BitMaskTextProp.class); private final String[] subPropNames; private final int[] subPropMasks; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java Sun Nov 24 19:48:55 2024 @@ -29,8 +29,8 @@ import java.util.Objects; import java.util.function.Supplier; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.Duplicatable; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hslf.exceptions.HSLFException; @@ -45,7 +45,7 @@ import org.apache.poi.util.LittleEndian; * properties, and the indent level if required. */ public class TextPropCollection implements GenericRecord, Duplicatable { - private static final Logger LOG = LogManager.getLogger(TextPropCollection.class); + private static final Logger LOG = PoiLogManager.getLogger(TextPropCollection.class); /** All the different kinds of paragraph properties we might handle */ private static final TextProp[] paragraphTextPropTypes = { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java Sun Nov 24 19:48:55 2024 @@ -29,8 +29,8 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; import org.apache.poi.hslf.exceptions.OldPowerPointFormatException; import org.apache.poi.poifs.filesystem.DirectoryNode; @@ -47,7 +47,7 @@ import org.apache.poi.util.StringUtil; * document. As such, it has to be treated specially */ public class CurrentUserAtom { - private static final Logger LOG = LogManager.getLogger(CurrentUserAtom.class); + private static final Logger LOG = PoiLogManager.getLogger(CurrentUserAtom.class); /** Standard Atom header */ private static final byte[] atomHeader = new byte[] { 0, 0, -10, 15 }; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hslf.record; import java.util.Map; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherRecord; import org.apache.poi.ddf.EscherRecordFactory; import org.apache.poi.ddf.EscherSerializationListener; @@ -34,7 +34,7 @@ import org.apache.poi.util.LittleEndian; * the slide layout as specified in the SlideAtom record. */ public class EscherPlaceholder extends EscherRecord { - private static final Logger LOG = LogManager.getLogger(EscherPlaceholder.class); + private static final Logger LOG = PoiLogManager.getLogger(EscherPlaceholder.class); public static final short RECORD_ID = RecordTypes.OEPlaceholderAtom.typeID; public static final String RECORD_DESCRIPTION = "msofbtClientTextboxPlaceholder"; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.logging.log4j.message.StringFormattedMessage; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException; @@ -43,7 +43,7 @@ import static org.apache.logging.log4j.u public abstract class Record implements GenericRecord { // For logging - protected static final Logger LOG = LogManager.getLogger(Record.class); + protected static final Logger LOG = PoiLogManager.getLogger(Record.class); /** * Is this record type an Atom record (only has data), Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.util.Map; import java.util.function.Supplier; import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.exceptions.HSLFException; import org.apache.poi.hslf.model.textproperties.TextPropCollection; import org.apache.poi.hslf.model.textproperties.TextPropCollection.TextPropType; @@ -53,7 +53,7 @@ import org.apache.poi.util.LittleEndianO * </p> */ public final class TxMasterStyleAtom extends RecordAtom { - private static final Logger LOG = LogManager.getLogger(TxMasterStyleAtom.class); + private static final Logger LOG = PoiLogManager.getLogger(TxMasterStyleAtom.class); /** * Maximum number of indentation levels allowed in PowerPoint documents Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java Sun Nov 24 19:48:55 2024 @@ -26,8 +26,8 @@ import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.util.Iterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherContainerRecord; @@ -57,7 +57,7 @@ import org.apache.poi.util.LittleEndian; * See {@link ShapeTypes} */ public class HSLFAutoShape extends HSLFTextShape implements AutoShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFAutoShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFAutoShape.class); static final byte[] SEGMENTINFO_MOVETO = new byte[]{0x00, 0x40}; static final byte[] SEGMENTINFO_LINETO = new byte[]{0x00, (byte)0xAC}; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java Sun Nov 24 19:48:55 2024 @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherBSERecord; @@ -56,7 +56,7 @@ import static org.apache.logging.log4j.u */ @SuppressWarnings("WeakerAccess") public final class HSLFFill { - private static final Logger LOG = LogManager.getLogger(HSLFFill.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFFill.class); /** * Fill with a solid color Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java Sun Nov 24 19:48:55 2024 @@ -25,8 +25,8 @@ import java.awt.geom.Rectangle2D; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherArrayProperty; import org.apache.poi.ddf.EscherContainerRecord; @@ -49,7 +49,7 @@ import static org.apache.logging.log4j.u * </p> */ public final class HSLFFreeformShape extends HSLFAutoShape implements FreeformShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFFreeformShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFFreeformShape.class); enum ShapePath { Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.util.Iterator; import java.util.List; import java.util.Spliterator; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherChildAnchorRecord; import org.apache.poi.ddf.EscherClientAnchorRecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -43,7 +43,7 @@ import org.apache.poi.util.Units; */ public class HSLFGroupShape extends HSLFShape implements HSLFShapeContainer, GroupShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFGroupShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFGroupShape.class); /** * Create a new ShapeGroup. This constructor is used when a new shape is created. Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java Sun Nov 24 19:48:55 2024 @@ -20,8 +20,8 @@ package org.apache.poi.hslf.usermodel; import java.util.ArrayList; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.hslf.model.HeadersFooters; import org.apache.poi.hslf.record.HeadersFootersContainer; import org.apache.poi.sl.usermodel.Notes; @@ -34,7 +34,7 @@ import org.apache.poi.sl.usermodel.Place */ public final class HSLFNotes extends HSLFSheet implements Notes<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFNotes.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFNotes.class); private final List<List<HSLFTextParagraph>> _paragraphs = new ArrayList<>(); Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.io.OutputStream; import org.apache.commons.io.output.AbstractByteArrayOutputStream; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.EscherContainerRecord; import org.apache.poi.ddf.EscherPropertyTypes; import org.apache.poi.ddf.EscherSpRecord; @@ -47,7 +47,7 @@ import org.apache.poi.sl.usermodel.Shape * A shape representing embedded OLE object. */ public final class HSLFObjectShape extends HSLFPictureShape implements ObjectShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFObjectShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFObjectShape.class); private ExEmbed _exEmbed; Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java Sun Nov 24 19:48:55 2024 @@ -30,8 +30,8 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.common.usermodel.GenericRecord; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -55,7 +55,7 @@ import org.apache.poi.util.Units; */ public abstract class HSLFPictureData implements PictureData, GenericRecord { - private static final Logger LOGGER = LogManager.getLogger(HSLFPictureData.class); + private static final Logger LOGGER = PoiLogManager.getLogger(HSLFPictureData.class); /** * Size of the image checksum calculated using MD5 algorithm. Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java Sun Nov 24 19:48:55 2024 @@ -21,8 +21,8 @@ import java.awt.Insets; import java.awt.geom.Rectangle2D; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherBSERecord; import org.apache.poi.ddf.EscherComplexProperty; @@ -45,7 +45,7 @@ import static org.apache.logging.log4j.u * Represents a picture in a PowerPoint document. */ public class HSLFPictureShape extends HSLFSimpleShape implements PictureShape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFPictureShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFPictureShape.class); /** * Create a new <code>Picture</code> Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java Sun Nov 24 19:48:55 2024 @@ -23,8 +23,8 @@ import java.awt.geom.Rectangle2D; import java.util.Iterator; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherChildAnchorRecord; import org.apache.poi.ddf.EscherClientAnchorRecord; @@ -66,7 +66,7 @@ import org.apache.poi.util.Units; * in points (72 points = 1 inch). */ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> { - private static final Logger LOG = LogManager.getLogger(HSLFShape.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFShape.class); /** * Either EscherSpContainer or EscheSpgrContainer record Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java?rev=1922055&r1=1922054&r2=1922055&view=diff ============================================================================== --- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java (original) +++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java Sun Nov 24 19:48:55 2024 @@ -19,8 +19,8 @@ package org.apache.poi.hslf.usermodel; import java.util.List; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.poi.logging.PoiLogManager; import org.apache.poi.ddf.AbstractEscherOptRecord; import org.apache.poi.ddf.EscherClientDataRecord; import org.apache.poi.ddf.EscherContainerRecord; @@ -49,7 +49,7 @@ import org.apache.poi.util.RecordFormatE */ public final class HSLFShapeFactory { // For logging - private static final Logger LOG = LogManager.getLogger(HSLFShapeFactory.class); + private static final Logger LOG = PoiLogManager.getLogger(HSLFShapeFactory.class); /** * Create a new shape from the data provided. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
