diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..33a5a92 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/liblayout-0.2.10.zip diff --git a/.liblayout.metadata b/.liblayout.metadata new file mode 100644 index 0000000..5da5176 --- /dev/null +++ b/.liblayout.metadata @@ -0,0 +1 @@ +65dfba9970bb862d09c1f9e636b86b22f05d3936 SOURCES/liblayout-0.2.10.zip diff --git a/SOURCES/liblayout-0.2.10-remove-commons-logging.patch b/SOURCES/liblayout-0.2.10-remove-commons-logging.patch new file mode 100644 index 0000000..5c71a57 --- /dev/null +++ b/SOURCES/liblayout-0.2.10-remove-commons-logging.patch @@ -0,0 +1,860 @@ +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/input/style/parser/CSSValueFactory.java liblayout-0.2.10/source/org/jfree/layouting/input/style/parser/CSSValueFactory.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/input/style/parser/CSSValueFactory.java 2021-04-07 10:34:09.797045462 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/input/style/parser/CSSValueFactory.java 2021-04-07 10:41:20.015338056 +0100 +@@ -49,8 +49,7 @@ + import org.jfree.layouting.input.style.values.CSSStringValue; + import org.jfree.layouting.input.style.values.CSSValue; + import org.w3c.css.sac.LexicalUnit; +-import org.apache.commons.logging.LogFactory; +-import org.apache.commons.logging.Log; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.config.Configuration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; + +@@ -61,7 +60,7 @@ + */ + public class CSSValueFactory + { +- private static final Log logger = LogFactory.getLog(CSSValueFactory.class); ++ private static final Logger logger = Logger.getLogger(CSSValueFactory.class.getName()); + public static final String SIMPLE_PREFIX = "org.jfree.layouting.parser.handlers."; + public static final String COMPOUND_PREFIX = "org.jfree.layouting.parser.compoundhandlers."; + +@@ -99,7 +98,7 @@ + } + else + { +- logger.warn("Invalid module implementation: " + c); ++ logger.warning("Invalid module implementation: " + c); + } + } + +@@ -300,7 +299,7 @@ + (CSSCompoundValueReadHandler) compoundHandlers.get(name); + if (handler == null) + { +- logger.warn("Got no key for inherited value: " + name); ++ logger.warning("Got no key for inherited value: " + name); + return; + } + +@@ -324,7 +323,7 @@ + (CSSCompoundValueReadHandler) compoundHandlers.get(name); + if (handler == null) + { +- logger.warn("Got no key for compound attr function: " + name); ++ logger.warning("Got no key for compound attr function: " + name); + return; + } + +@@ -373,7 +372,7 @@ + { + if (key == null) + { +- // Log.warn("Got no key for attribute-function " + normalizedName); ++ // Log.warning("Got no key for attribute-function " + normalizedName); + setCompundAttrValue(normalizedName, attrFn, rule, important); + return; + } +@@ -387,7 +386,7 @@ + // ATTR function (extended version). + if (key == null) + { +- logger.warn("Got no key for attribute-function " + normalizedName); ++ logger.warning("Got no key for attribute-function " + normalizedName); + return; + } + final CSSAttrFunction attrFn = parseComplexAttrFn(value.getParameters()); +@@ -421,7 +420,7 @@ + return; + } + +- logger.warn("Unparsable value: Got no valid result for " + normalizedName + " (" + value + ')'); ++ logger.warning("Unparsable value: Got no valid result for " + normalizedName + " (" + value + ')'); + return; // ignore this rule .. + } + final Map map = module.createValues(value); +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/input/style/parser/StyleSheetHandler.java liblayout-0.2.10/source/org/jfree/layouting/input/style/parser/StyleSheetHandler.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/input/style/parser/StyleSheetHandler.java 2021-04-07 10:34:09.798045474 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/input/style/parser/StyleSheetHandler.java 2021-04-07 10:48:18.496489721 +0100 +@@ -60,8 +60,7 @@ + import org.pentaho.reporting.libraries.resourceloader.Resource; + import org.pentaho.reporting.libraries.resourceloader.ResourceException; + import org.pentaho.reporting.libraries.base.util.FastStack; +-import org.apache.commons.logging.LogFactory; +-import org.apache.commons.logging.Log; ++import java.util.logging.Logger; + + /** + * Creation-Date: 23.11.2005, 13:06:06 +@@ -70,7 +69,7 @@ + */ + public class StyleSheetHandler implements DocumentHandler, ErrorHandler + { +- private static final Log logger = LogFactory.getLog(StyleSheetHandler.class); ++ private static final Logger logger = Logger.getLogger(StyleSheetHandler.class.getName()); + private HashMap namespaces; + private StyleKeyRegistry registry; + private StyleSheet styleSheet; +@@ -614,7 +613,7 @@ + catch (Exception e) + { + // we catch everything. +- logger.warn("Error parsing style key: " + name, e); ++ logger.warning("Error parsing style key: " + name + " : " + e); + } + + } +@@ -639,7 +638,7 @@ + public void warning(final CSSParseException exception) + throws CSSException + { +- logger.warn("Warning: " + exception.getMessage()); ++ logger.warning("Warning: " + exception.getMessage()); + } + + /** +@@ -665,7 +664,7 @@ + public void error(final CSSParseException exception) + throws CSSException + { +- logger.warn("Error: ", exception); ++ logger.warning("Error: " + exception); + } + + /** +@@ -690,6 +689,6 @@ + public void fatalError(final CSSParseException exception) + throws CSSException + { +- logger.warn("Fatal Error: ", exception); ++ logger.warning("Fatal Error: " + exception); + } + } +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/normalizer/generator/PrintContentGenerator.java liblayout-0.2.10/source/org/jfree/layouting/normalizer/generator/PrintContentGenerator.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/normalizer/generator/PrintContentGenerator.java 2021-04-07 10:34:09.766045081 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/normalizer/generator/PrintContentGenerator.java 2021-04-07 10:47:20.093770766 +0100 +@@ -38,8 +38,7 @@ + import org.jfree.layouting.layouter.context.PageContext; + import org.jfree.layouting.normalizer.content.NormalizationException; + import org.jfree.layouting.renderer.Renderer; +-import org.apache.commons.logging.LogFactory; +-import org.apache.commons.logging.Log; ++import java.util.logging.Logger; + + /** + * Simply prints each incoming call. +@@ -48,7 +47,7 @@ + */ + public class PrintContentGenerator implements ContentGenerator + { +- private static final Log logger = LogFactory.getLog(PrintContentGenerator.class); ++ private static final Logger logger = Logger.getLogger(PrintContentGenerator.class.getName()); + + + private static class PrintContentGeneratorState implements State +@@ -96,56 +95,56 @@ + */ + public void startedDocument(final PageContext pageContext) + { +- logger.debug(""); ++ logger.config(""); + renderer.startedDocument(pageContext); + } + + public void startedFlow(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedFlow(element); + } + + public void startedTable(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config("
"); + renderer.startedTable(element); + } + + public void startedTableColumnGroup(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableColumnGroup(element); + } + + public void startedTableColumn(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableColumn(element); + } + + public void startedTableSection(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableSection(element); + } + + public void startedTableRow(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableRow(element); + } + + public void startedTableCell(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableCell(element); + } + +@@ -153,7 +152,7 @@ + throws NormalizationException + { + final String tagName = element.getTagName(); +- logger.debug(""); ++ logger.config(""); + renderer.startedBlock(element); + } + +@@ -161,14 +160,14 @@ + throws NormalizationException + { + final String tagName = element.getTagName(); +- logger.debug(""); ++ logger.config(""); + renderer.startedRootInline(element); + } + + public void startedMarker(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedMarker(element); + } + +@@ -176,80 +175,80 @@ + throws NormalizationException + { + final String tagName = element.getTagName(); +- logger.debug(""); ++ logger.config(""); + renderer.startedInline(element); + } + + public void addContent(final LayoutContext node, final ContentToken token) + throws NormalizationException + { +- logger.debug("" + token + ""); ++ logger.config("" + token + ""); + renderer.addContent(node, token); + } + + public void finishedInline() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedInline(); + } + + public void finishedMarker() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedMarker(); + } + + public void finishedRootInline() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedRootInline(); + } + + public void finishedBlock() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedBlock(); + } + + public void finishedTableCell() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableCell(); + } + + public void finishedTableRow() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableRow(); + } + + public void finishedTableSection() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableSection(); + } + + public void finishedTableColumn() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableColumn(); + } + + public void finishedTableColumnGroup() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableColumnGroup(); + } + + public void finishedTable() throws NormalizationException + { +- logger.debug("
"); ++ logger.config(""); + renderer.finishedTable(); + } + + public void finishedFlow() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedFlow(); + } + +@@ -259,7 +258,7 @@ + */ + public void finishedDocument() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedDocument(); + } + +@@ -276,7 +275,7 @@ + public void startedPassThrough(final LayoutContext element) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedPassThrough(element); + } + +@@ -284,26 +283,26 @@ + final ContentToken token) + throws NormalizationException + { +- logger.debug("" + token + ""); ++ logger.config("" + token + ""); + renderer.addPassThroughContent(node, token); + } + + public void finishedPassThrough() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedPassThrough(); + } + + public void startedTableCaption(final LayoutContext context) + throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.startedTableCaption(context); + } + + public void finishedTableCaption() throws NormalizationException + { +- logger.debug(""); ++ logger.config(""); + renderer.finishedTableCaption(); + } + +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/model/RenderBox.java liblayout-0.2.10/source/org/jfree/layouting/renderer/model/RenderBox.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/model/RenderBox.java 2021-04-07 10:34:09.779045241 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/renderer/model/RenderBox.java 2021-04-07 10:49:14.499179135 +0100 +@@ -44,8 +44,7 @@ + import org.jfree.layouting.renderer.text.ExtendedBaselineInfo; + import org.jfree.layouting.renderer.text.TextUtility; + import org.pentaho.reporting.libraries.fonts.registry.FontMetrics; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * A render-box corresponds to elements in a DOM tree. +@@ -62,7 +61,7 @@ + */ + public abstract class RenderBox extends RenderNode + { +- private static final Log logger = LogFactory.getLog(RenderBox.class); ++ private static final Logger logger = Logger.getLogger(RenderBox.class.getName()); + public static final boolean LOG_PRUNE = false; + + private RenderNode firstChild; +@@ -930,7 +929,7 @@ + { + if (LOG_PRUNE) + { +- logger.debug("Pruning: " + this); ++ logger.config("Pruning: " + this); + } + getParent().remove(this); + } +@@ -944,7 +943,7 @@ + { + if (LOG_PRUNE) + { +- logger.debug("Pruning: " + lastChild); ++ logger.config("Pruning: " + lastChild); + } + remove(lastChild); + lastChild = getLastChild(); +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/ModelPrinter.java liblayout-0.2.10/source/org/jfree/layouting/renderer/ModelPrinter.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/ModelPrinter.java 2021-04-07 10:34:09.786045327 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/renderer/ModelPrinter.java 2021-04-07 10:46:12.757941838 +0100 +@@ -41,8 +41,7 @@ + import org.jfree.layouting.renderer.model.table.cells.TableCell; + import org.jfree.layouting.renderer.model.table.cols.TableColumn; + import org.jfree.layouting.renderer.model.table.cols.TableColumnModel; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: Jan 9, 2007, 2:22:59 PM +@@ -51,7 +50,7 @@ + */ + public class ModelPrinter + { +- private static final Log logger = LogFactory.getLog (ModelPrinter.class); ++ private static final Logger logger = Logger.getLogger(ModelPrinter.class.getName()); + + private ModelPrinter() + { +@@ -66,7 +65,7 @@ + b.append('['); + b.append(Integer.toHexString(System.identityHashCode(node))); + b.append(']'); +- logger.debug (b); ++ logger.config(b.toString()); + node = node.getParent(); + } + } +@@ -96,7 +95,7 @@ + b.append(", height="); + b.append(box.getHeight()); + b.append('}'); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + + b = new StringBuffer(); + for (int i = 0; i < level; i++) +@@ -105,7 +104,7 @@ + } + b.append("- nodeLayoutProperties="); + b.append(box.getNodeLayoutProperties()); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + + b = new StringBuffer(); + for (int i = 0; i < level; i++) +@@ -114,7 +113,7 @@ + } + b.append("- boxLayoutProperties="); + b.append(box.getBoxLayoutProperties()); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + + if (box instanceof TableRowRenderBox) + { +@@ -124,7 +123,7 @@ + for (int i = 0; i < rowInfoStructure.getCellCount(); i++) + { + final TableCell cell = rowInfoStructure.getCellAt(i); +- logger.debug ("CELL: " + i + " = " + cell.getRowSpan() + ' ' + cell.getColSpan() + ' ' + cell); ++ logger.config("CELL: " + i + " = " + cell.getRowSpan() + ' ' + cell.getColSpan() + ' ' + cell); + } + } + else if (box instanceof TableRenderBox) +@@ -134,7 +133,7 @@ + for (int i = 0; i < columnModel.getColumnCount(); i++) + { + final TableColumn col = columnModel.getColumn(i); +- logger.debug ("COLUMN: EffectiveSize: " + col.getEffectiveSize() + " Computed Max Width: " + col.getComputedMaximumWidth() + " Computed ChunkSize: " + col.getComputedMinChunkSize()); ++ logger.config("COLUMN: EffectiveSize: " + col.getEffectiveSize() + " Computed Max Width: " + col.getComputedMaximumWidth() + " Computed ChunkSize: " + col.getComputedMinChunkSize()); + // for (int cs = 1; cs < 3; cs++) + // { + // Log.debug ("* COLUMN: " + i + "(" + cs + ") " + +@@ -149,14 +148,14 @@ + else if (box instanceof TableCellRenderBox) + { + final TableCellRenderBox cellBox = (TableCellRenderBox) box; +- logger.debug ("CELL: Position: " + cellBox.getColumnIndex()); ++ logger.config("CELL: Position: " + cellBox.getColumnIndex()); + } + else if (box instanceof ParagraphRenderBox) + { + final ParagraphRenderBox paraBox = (ParagraphRenderBox) box; +- logger.debug ("-----------------------------------------------------"); ++ logger.config("-----------------------------------------------------"); + printBox(paraBox.getLineboxContainer(), level + 1); +- logger.debug ("-----------------------------------------------------"); ++ logger.config("-----------------------------------------------------"); + } + + printChilds(box, level); +@@ -203,7 +202,7 @@ + b.append(", height="); + b.append(node.getHeight()); + b.append('}'); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + + + b = new StringBuffer(); +@@ -213,7 +212,7 @@ + } + b.append("- nodeLayoutProperties="); + b.append(node.getNodeLayoutProperties()); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + } + + private static void printText(final RenderableText text, final int level) +@@ -238,7 +237,7 @@ + b.append(", text='"); + b.append(text.getRawText()); + b.append("'}"); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + + b = new StringBuffer(); + for (int i = 0; i < level; i++) +@@ -247,7 +246,7 @@ + } + b.append("- nodeLayoutProperties="); + b.append(text.getNodeLayoutProperties()); +- logger.debug(b.toString()); ++ logger.config(b.toString()); + } + + } +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/PrintingRenderer.java liblayout-0.2.10/source/org/jfree/layouting/renderer/PrintingRenderer.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/renderer/PrintingRenderer.java 2021-04-07 10:34:09.786045327 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/renderer/PrintingRenderer.java 2021-04-07 10:45:03.987095239 +0100 +@@ -37,8 +37,7 @@ + import org.jfree.layouting.layouter.context.LayoutContext; + import org.jfree.layouting.layouter.context.PageContext; + import org.jfree.layouting.normalizer.content.NormalizationException; +-import org.apache.commons.logging.LogFactory; +-import org.apache.commons.logging.Log; ++import java.util.logging.Logger; + + /** + * Creation-Date: 17.07.2006, 17:43:21 +@@ -47,7 +46,7 @@ + */ + public class PrintingRenderer implements Renderer + { +- private static final Log logger = LogFactory.getLog(PrintingRenderer.class); ++ private static final Logger logger = Logger.getLogger(PrintingRenderer.class.getName()); + private static class PrintingRendererState implements State + { + private State parentState; +@@ -89,7 +88,7 @@ + */ + public void startedDocument(final PageContext pageContext) + { +- logger.debug (""); ++ logger.config(""); + parent.startedDocument(pageContext); + } + +@@ -102,7 +101,7 @@ + public void startedFlow(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedFlow(context); + } +@@ -110,7 +109,7 @@ + public void startedTable(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedTable(context); + } +@@ -118,7 +117,7 @@ + public void startedTableSection(final LayoutContext layoutContext) + throws NormalizationException + { +- logger.debug (""); + parent.startedTableSection(layoutContext); + } +@@ -126,7 +125,7 @@ + public void startedTableRow(final LayoutContext layoutContext) + throws NormalizationException + { +- logger.debug (""); + parent.startedTableRow(layoutContext); + } +@@ -134,7 +133,7 @@ + public void startedTableCell(final LayoutContext layoutContext) + throws NormalizationException + { +- logger.debug (""); + parent.startedTableCell(layoutContext); + } +@@ -142,7 +141,7 @@ + public void startedBlock(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedBlock(context); + } +@@ -150,7 +149,7 @@ + public void startedMarker(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedMarker(context); + } +@@ -158,7 +157,7 @@ + public void startedRootInline(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedRootInline(context); + } +@@ -166,7 +165,7 @@ + public void startedInline(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); + parent.startedInline(context); + } +@@ -175,93 +174,93 @@ + final ContentToken content) + throws NormalizationException + { +- logger.debug ("" + content + ""); ++ logger.config("" + content + ""); + parent.addContent(context, content); + } + + public void finishedInline() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedInline(); + } + + public void finishedRootInline() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedRootInline(); + } + + public void finishedMarker() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedMarker(); + } + + public void finishedBlock() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedBlock(); + } + + public void finishedTableCell() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableCell(); + } + + public void finishedTableRow() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableRow(); + } + + public void finishedTableSection() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableSection(); + } + + public void finishedTable() throws NormalizationException + { +- logger.debug ("
"); ++ logger.config(""); + parent.finishedTable(); + } + + public void finishedFlow() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedFlow(); + } + + public void finishedDocument() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedDocument(); + } + + public void startedTableColumnGroup(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.startedTableColumnGroup(context); + } + + public void startedTableColumn(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.startedTableColumn(context); + } + + public void finishedTableColumnGroup() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableColumnGroup(); + } + + public void finishedTableColumn() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableColumn(); + } + +@@ -274,14 +273,14 @@ + */ + public void handlePageBreak(final PageContext pageContext) + { +- logger.debug (""); ++ logger.config(""); + parent.handlePageBreak(pageContext); + } + + public void startedPassThrough(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.startedPassThrough(context); + } + +@@ -289,13 +288,13 @@ + final ContentToken content) + throws NormalizationException + { +- logger.debug ("" + content + ""); ++ logger.config("" + content + ""); + parent.addPassThroughContent(context, content); + } + + public void finishedPassThrough() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedPassThrough(); + } + +@@ -307,13 +306,13 @@ + public void startedTableCaption(final LayoutContext context) + throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.startedTableCaption(context); + } + + public void finishedTableCaption() throws NormalizationException + { +- logger.debug (""); ++ logger.config(""); + parent.finishedTableCaption(); + } + } +diff -ru liblayout-0.2.10.orig/source/org/jfree/layouting/util/AttributeMap.java liblayout-0.2.10/source/org/jfree/layouting/util/AttributeMap.java +--- liblayout-0.2.10.orig/source/org/jfree/layouting/util/AttributeMap.java 2021-04-07 10:34:09.787045339 +0100 ++++ liblayout-0.2.10/source/org/jfree/layouting/util/AttributeMap.java 2021-04-07 10:48:57.444969193 +0100 +@@ -35,8 +35,7 @@ + import java.util.Iterator; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; + + /** +@@ -46,7 +45,7 @@ + */ + public class AttributeMap implements Serializable, Cloneable + { +- private static final Log logger = LogFactory.getLog(AttributeMap.class); ++ private static final Logger logger = Logger.getLogger(AttributeMap.class.getName()); + + private static final long serialVersionUID = -7442871030874215436L; + private static final String[] EMPTY_NAMESPACES = new String[0]; +@@ -102,7 +101,7 @@ + } + catch (Exception e) + { +- logger.error("Clone failed for ReportAttributeMap.createUnmodifiableMap", e); ++ logger.severe("Clone failed for ReportAttributeMap.createUnmodifiableMap:" + e); + throw new IllegalStateException("Clone failed for ReportAttributeMap.createUnmodifiableMap"); + } + } diff --git a/SPECS/liblayout.spec b/SPECS/liblayout.spec new file mode 100644 index 0000000..eff40e5 --- /dev/null +++ b/SPECS/liblayout.spec @@ -0,0 +1,150 @@ +Name: liblayout +Version: 0.2.10 +Release: 25%{?dist} +Summary: CSS based layouting framework +License: LGPLv2+ and UCD +Source: http://downloads.sourceforge.net/jfreereport/liblayout-%{version}.zip +URL: http://reporting.pentaho.org/ +BuildRequires: ant, java-devel, jpackage-utils, flute, libloader +BuildRequires: librepository, pentaho-libxml, libfonts, sac, libbase >= 1.1.3 +Requires: java-headless, jpackage-utils, flute, libloader >= 1.1.3 +Requires: librepository >= 1.1.3, libfonts >= 1.1.3, sac +Requires: pentaho-libxml, libbase >= 1.0.0 +BuildArch: noarch + +Patch0: liblayout-0.2.10-remove-commons-logging.patch + +%description +LibLayout is a layouting framework. It is based on the Cascading StyleSheets +standard. The layouting expects to receive its content as a DOM structure +(although it does not rely on the W3C-DOM API). + +%package javadoc +Summary: Javadoc for %{name} +Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -c +%patch0 -p1 -b .no_commons_logging +find . -name "*.jar" -exec rm -f {} \; +mkdir -p lib +build-jar-repository -s -p lib flute libloader librepository libxml libfonts \ + sac libbase + +%build +ant jar javadoc +for file in README.txt licence-LGPL.txt ChangeLog.txt; do + tr -d '\r' < $file > $file.new + mv $file.new $file +done + +%install +rm -rf $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_javadir} +cp -p build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar + +mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -rp build/api $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +%files +%doc licence-LGPL.txt README.txt ChangeLog.txt +%{_javadir}/*.jar + +%files javadoc +%{_javadocdir}/%{name} + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 0.2.10-25 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 0.2.10-24 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +- Related: rhbz#1951286 replace apache-commons-logging with java.util.logging + +* Tue Jan 26 2021 Fedora Release Engineering - 0.2.10-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.2.10-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0.2.10-21 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 0.2.10-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.2.10-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.2.10-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 17 2018 Caolán McNamara - 0.2.10-17 +- Resolves: rhbz#1597605 drop xml-commons-apis require + +* Fri Jul 13 2018 Fedora Release Engineering - 0.2.10-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.2.10-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.2.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.2.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.2.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.2.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Feb 25 2014 Caolán McNamara - 0.2.10-9 +- Resolves: rhbz#1068356 Switch to java-headless (build)requires + +* Sat Aug 03 2013 Fedora Release Engineering - 0.2.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.2.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Nov 03 2012 Caolán McNamara - 0.2.10-6 +- resource/GraphemeBreakProperty.txt and liblayout-0.2.10.zip/resource/Blocks.txt are + under UCD + +* Thu Jul 19 2012 Fedora Release Engineering - 0.2.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.2.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Oct 28 2011 Caolán McNamara - 0.2.10-3 +- Related: rhbz#749103 drop gcj aot + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 03 2009 Caolan McNamara 0.2.10-1 +- latest version + +* Fri Jul 24 2009 Caolan McNamara 0.2.9-4.OOo31 +- make javadoc no-arch when building as arch-dependant aot + +* Mon Mar 16 2009 Caolan McNamara 0.2.9-3.OOo31 +- Post-release tuned for OpenOffice.org + +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed May 07 2008 Caolan McNamara 0.2.9-1 +- initial fedora import