You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2019/02/18 20:42:56 UTC
svn commit: r1853823 - in /cocoon/branches/BRANCH_2_1_X: ./ lib/ lib/core/
lib/optional/
src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/
src/blocks/poi/java/org/apache/cocoon/generation/
Author: anathaniel
Date: Mon Feb 18 20:42:55 2019
New Revision: 1853823
URL: http://svn.apache.org/viewvc?rev=1853823&view=rev
Log:
Update to poi-3.14
Added:
cocoon/branches/BRANCH_2_1_X/lib/core/commons-logging-1.2.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.17.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.10.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/curvesapi-1.06.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/poi-3.14.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-3.14.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-schemas-3.14.jar (with props)
cocoon/branches/BRANCH_2_1_X/lib/optional/xmlbeans-3.0.2.jar (with props)
Removed:
cocoon/branches/BRANCH_2_1_X/lib/core/commons-logging-1.0.4.jar
cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.14.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.5.jar
cocoon/branches/BRANCH_2_1_X/lib/optional/poi-3.10-FINAL.jar
Modified:
cocoon/branches/BRANCH_2_1_X/lib/jars.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/generation/HSSFGenerator.java
cocoon/branches/BRANCH_2_1_X/status.xml
Added: cocoon/branches/BRANCH_2_1_X/lib/core/commons-logging-1.2.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/core/commons-logging-1.2.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/commons-logging-1.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.17.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.17.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/core/log4j-1.2.17.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=1853823&r1=1853822&r2=1853823&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Mon Feb 18 20:42:55 2019
@@ -439,7 +439,7 @@
The Logging package is an ultra-thin bridge between different logging libraries.
</description>
<used-by>Jakarta Commons HttpClient, Chaperon</used-by>
- <lib>core/commons-logging-1.0.4.jar</lib>
+ <lib>core/commons-logging-1.2.jar</lib>
<homepage>http://commons.apache.org/logging/</homepage>
</file>
@@ -498,20 +498,65 @@
</file>
<file>
- <title>Create proprietary file formats</title>
+ <title>Apache POI - the Java API for Microsoft Documents</title>
<description>
- The POI project is the master project for developing pure Java ports
- of file formats based on Microsoft's OLE 2 Compound Document Format.
- OLE 2 Compound Document Format is used by Microsoft Office Documents,
- as well as by programs using MFC property sets to serialize their
- document objects.
+ The Apache POI Project's mission is to create and maintain Java APIs
+ for manipulating various file formats based upon the Office Open XML
+ standards (OOXML).
</description>
<used-by>MS Excel serializer (poi block)</used-by>
- <lib>optional/poi-3.10-FINAL.jar</lib>
+ <lib>optional/poi-3.14.jar</lib>
<homepage>http://jakarta.apache.org/poi/</homepage>
</file>
<file>
+ <title>Apache POI - the Java API for Microsoft Documents</title>
+ <description>
+ The Apache POI Project's mission is to create and maintain Java APIs
+ for manipulating various file formats based upon the Office Open XML
+ standards (OOXML).
+ </description>
+ <used-by>MS Excel serializer (poi block)</used-by>
+ <lib>optional/poi-ooxml-3.14.jar</lib>
+ <homepage>http://jakarta.apache.org/poi/</homepage>
+ </file>
+
+ <file>
+ <title>Apache POI - the Java API for Microsoft Documents</title>
+ <description>
+ The Apache POI Project's mission is to create and maintain Java APIs
+ for manipulating various file formats based upon the Office Open XML
+ standards (OOXML).
+ </description>
+ <used-by>MS Excel serializer (poi block)</used-by>
+ <lib>optional/poi-ooxml-schemas-3.14.jar</lib>
+ <homepage>http://jakarta.apache.org/poi/</homepage>
+ </file>
+
+ <file>
+ <title>Apache POI - the Java API for Microsoft Documents</title>
+ <description>
+ The Apache POI Project's mission is to create and maintain Java APIs
+ for manipulating various file formats based upon the Office Open XML
+ standards (OOXML).
+ </description>
+ <used-by>MS Excel serializer (poi block)</used-by>
+ <lib>optional/xmlbeans-3.0.2.jar</lib>
+ <homepage>http://jakarta.apache.org/poi/</homepage>
+ </file>
+
+ <file>
+ <title>Java implementation of various mathematical curve</title>
+ <description>
+ Java implementation of various mathematical curves that define
+ themselves over a set of control points.
+ </description>
+ <used-by>MS Excel serializer (poi block)</used-by>
+ <lib>optional/curvesapi-1.06.jar</lib>
+ <homepage>https://github.com/virtuald/curvesapi</homepage>
+ </file>
+
+ <file>
<title>Jena RDF framework</title>
<description>Jena is a java API for manipulating RDF models.</description>
<used-by>DELI (deli block)</used-by>
@@ -614,7 +659,7 @@
<title>Log4j</title>
<description>Logging for java</description>
<used-by>Core and DELI (deli block)</used-by>
- <lib>core/log4j-1.2.14.jar</lib>
+ <lib>core/log4j-1.2.17.jar</lib>
<homepage>http://logging.apache.org/log4j/</homepage>
</file>
@@ -840,7 +885,7 @@
<title>Jakarta Commons Codec</title>
<description>Implementations of common encoders and decoders</description>
<used-by>WebDAV block</used-by>
- <lib>optional/commons-codec-1.5.jar</lib>
+ <lib>optional/commons-codec-1.10.jar</lib>
<homepage>http://commons.apache.org/codec/</homepage>
</file>
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.10.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.10.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.10.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/curvesapi-1.06.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/curvesapi-1.06.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/curvesapi-1.06.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-3.14.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/poi-3.14.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-3.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-3.14.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-3.14.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-3.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-schemas-3.14.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-schemas-3.14.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/poi-ooxml-schemas-3.14.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: cocoon/branches/BRANCH_2_1_X/lib/optional/xmlbeans-3.0.2.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/xmlbeans-3.0.2.jar?rev=1853823&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/xmlbeans-3.0.2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java?rev=1853823&r1=1853822&r2=1853823&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/EPCell.java Mon Feb 18 20:42:55 2019
@@ -27,6 +27,8 @@ import org.apache.cocoon.components.elem
import org.apache.cocoon.components.elementprocessor.types.NumericResult;
import org.apache.cocoon.components.elementprocessor.types.Validator;
import org.apache.poi.hssf.util.Region;
+import org.apache.poi.ss.util.CellRangeAddress;
+
/**
* Implementation of ElementProcessor to handle the "Cell" tag.
* This element has several attributes and may contain other elements.
@@ -232,7 +234,8 @@ public class EPCell extends BaseElementP
}
if(getColumns() != -1 && getRows() != -1) {
- getSheet().addMergedRegion(new Region(getRow(),(short)getColumn(),getRow() + getRows() - 1,(short)(getColumn() + getColumns() - 1)));
+ getSheet().addMergedRegion(new CellRangeAddress(getRow(), getRow() + getRows() - 1,
+ getColumn(), getColumn() + getColumns() - 1));
}
}
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java?rev=1853823&r1=1853822&r2=1853823&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/poi/hssf/elements/Sheet.java Mon Feb 18 20:42:55 2019
@@ -109,7 +109,7 @@ class Sheet extends AbstractLogEnabled {
* @param number the column number
* @return column width in characters
*/
- short getColumnWidth(short number) {
+ int getColumnWidth(short number) {
return _sheet.getColumnWidth(number);
}
@@ -224,20 +224,6 @@ class Sheet extends AbstractLogEnabled {
return (points >= 0 && points <= ((Short.MAX_VALUE + 0.5) / 48));
}
- /*
- * this method doesn't appear to be used private boolean
- * isValidCharacters(double characters) { return ((characters >= 0) &&
- * (characters <= ((Short.MAX_VALUE + 0.5) / 256)));
- */
-
- /**
- * Flag a certain region of cells to be merged
- * @param region the region to create as merged
- */
- void addMergedRegion(Region region) {
- this._sheet.addMergedRegion(region);
- }
-
/**
* Flag a certain region of cells to be merged
* @param range the cell range to create as merged
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/generation/HSSFGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/generation/HSSFGenerator.java?rev=1853823&r1=1853822&r2=1853823&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/generation/HSSFGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/poi/java/org/apache/cocoon/generation/HSSFGenerator.java Mon Feb 18 20:42:55 2019
@@ -170,7 +170,7 @@ public class HSSFGenerator extends Abstr
while (cells.hasNext()) {
final HSSFCell cell = (HSSFCell) cells.next();
attribute("Row", Integer.toString(row.getRowNum()));
- attribute("Col", Short.toString(cell.getCellNum()));
+ attribute("Col", Integer.toString(cell.getColumnIndex()));
attribute("ValueType", getValueType(cell.getCellType()));
start("Cell");
data(getValue(cell));
@@ -266,8 +266,8 @@ public class HSSFGenerator extends Abstr
cell = (HSSFCell) cells.next();
attribute("startRow", Integer.toString(row.getRowNum()));
attribute("endRow", Integer.toString(row.getRowNum()));
- attribute("startCol", Short.toString(cell.getCellNum()));
- attribute("endCol", Short.toString(cell.getCellNum()));
+ attribute("startCol", Integer.toString(cell.getColumnIndex()));
+ attribute("endCol", Integer.toString(cell.getColumnIndex()));
start("StyleRegion");
HSSFCellStyle style = cell.getCellStyle();
attribute("HAlign", Integer.toString(style.getAlignment()));
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?rev=1853823&r1=1853822&r2=1853823&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Feb 18 20:42:55 2019
@@ -185,6 +185,9 @@
<changes>
<release version="2.1.13" date="TBD">
<action dev="AN" type="update">
+ Update to poi-3.14
+ </action>
+ <action dev="AN" type="update">
Update to fop-1.1
</action>
<action dev="AN" type="update">