You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/12/13 15:32:44 UTC
svn commit: r1884381 - in /poi: site/src/documentation/content/xdocs/
site/src/documentation/content/xdocs/components/
site/src/documentation/content/xdocs/components/spreadsheet/
site/src/documentation/content/xdocs/help/ trunk/ trunk/jenkins/ trunk/l...
Author: kiwiwings
Date: Sun Dec 13 15:32:43 2020
New Revision: 1884381
URL: http://svn.apache.org/viewvc?rev=1884381&view=rev
Log:
#64979 - Change artifact names of poi-/ooxml-schemas
Added:
poi/trunk/maven/poi-ooxml-full.pom
- copied, changed from r1884380, poi/trunk/maven/ooxml-schemas.pom
poi/trunk/maven/poi-ooxml-lite.pom
- copied, changed from r1884380, poi/trunk/maven/poi-ooxml-schemas.pom
poi/trunk/sonar/ooxml-full/
- copied from r1884380, poi/trunk/sonar/ooxml-schema/
poi/trunk/src/multimodule/ooxml-full/
- copied from r1884380, poi/trunk/src/multimodule/ooxml-schemas/
Removed:
poi/trunk/maven/multisign.sh
poi/trunk/maven/mvn-deploy.sh
poi/trunk/maven/ooxml-schemas.pom
poi/trunk/maven/poi-ooxml-schemas.pom
poi/trunk/sonar/ooxml-schema/
poi/trunk/src/multimodule/ooxml-schemas/
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/site/src/documentation/content/xdocs/components/index.xml
poi/site/src/documentation/content/xdocs/components/poi-jvm-languages.xml
poi/site/src/documentation/content/xdocs/components/spreadsheet/excelant.xml
poi/site/src/documentation/content/xdocs/help/faq.xml
poi/trunk/.classpath
poi/trunk/.gitignore
poi/trunk/README.rst
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/jenkins/create_jobs.groovy
poi/trunk/legal/LICENSE
poi/trunk/maven/poi-ooxml.pom
poi/trunk/osgi/pom.xml
poi/trunk/sonar/ooxml-full/pom.xml
poi/trunk/sonar/ooxml/pom.xml
poi/trunk/sonar/pom.xml
poi/trunk/src/examples/scala/build.sbt
poi/trunk/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
poi/trunk/src/integrationtest/build.xml
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Sun Dec 13 15:32:43 2020
@@ -79,7 +79,7 @@
<summary-item>provide JigSaw modules</summary-item>
<summary-item>removed dependencies to jaxb</summary-item>
<summary-item>removed deprecated code</summary-item>
- <summary-item>ooxml-security is part of ooxml-schemas now and won't be provided separately</summary-item>
+ <summary-item>ooxml-security is part of poi-ooxml-full (known as ooxml-schemas) now and won't be provided separately</summary-item>
<summary-item>new experimental DeferredSXSSFWorkbook which avoids temp files by lazily generating rows (see DeferredGeneration in poi-examples)</summary-item>
</summary>
<actions>
@@ -120,6 +120,7 @@
<action type="fix" fixes-bug="github-206" context="SXSSF">Improve performance of SXSSF cell evaluation</action>
<action type="fix" fixes-bug="64976" context="SS_Common">Change some methods to return ints instead of shorts (Font and CellStyle)</action>
<action type="fix" fixes-bug="56205" context="OOXML">Upgrade OOXML schema to 3rd edition (transitional)</action>
+ <action type="fix" fixes-bug="64979" context="OOXML">Change artifact names of poi-/ooxml-schemas</action>
</actions>
</release>
Modified: poi/site/src/documentation/content/xdocs/components/index.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/index.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/index.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/index.xml Sun Dec 13 15:32:43 2020
@@ -233,8 +233,8 @@
<tr>
<td><a href="./oxml4j/index.html">OpenXML4J</a></td>
<td>OOXML</td>
- <td><em>poi-ooxml</em> plus either <em>poi-ooxml-schemas</em> or<br/>
- <em>ooxml-schemas</em> and <em>ooxml-security</em></td>
+ <td><em>poi-ooxml</em> plus either <em>poi-ooxml-lite</em> or<br/>
+ <em>poi-ooxml-full</em></td>
<td>See notes below for differences between these options</td>
</tr>
<tr>
@@ -307,7 +307,7 @@
<tr>
<td>poi-ooxml</td>
<td><a href="https://search.maven.org/#search|gav|1|g:org.apache.poi AND a:poi">poi</a>,
- <a href="https://search.maven.org/#search|gav|1|g:org.apache.poi AND a:poi-ooxml-schemas">poi-ooxml-schemas</a>,
+ <a href="https://search.maven.org/#search|gav|1|g:org.apache.poi AND a:poi-ooxml-lite">poi-ooxml-lite</a>,
<a href="https://search.maven.org/#artifactdetails|org.apache.commons|commons-compress|1.20|jar">commons-compress</a>,
<a href="https://search.maven.org/#artifactdetails|com.zaxxer|SparseBitSet|1.2|jar">SparseBitSet</a><br/>
For SVG support:
@@ -322,9 +322,9 @@
<td>poi-ooxml-version-yyyymmdd.jar</td>
</tr>
<tr>
- <td>poi-ooxml-schemas</td>
- <td><a href="https://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|3.1.0|jar">xmlbeans</a></td>
- <td>poi-ooxml-schemas-version-yyyymmdd.jar</td>
+ <td>poi-ooxml-lite</td>
+ <td><a href="https://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|4.0.0|jar">xmlbeans</a></td>
+ <td>poi-ooxml-lite-version-yyyymmdd.jar</td>
</tr>
<tr>
<td>poi-examples</td>
@@ -335,7 +335,7 @@
<td>poi-examples-version-yyyymmdd.jar</td>
</tr>
<tr>
- <td>ooxml-schemas</td>
+ <td>poi-ooxml-full (known as ooxml-schemas)</td>
<td><a href="https://search.maven.org/#artifactdetails|org.apache.xmlbeans|xmlbeans|4.0.0|jar">xmlbeans</a><br/>
For signing:
<a href="https://search.maven.org/#artifactdetails|org.bouncycastle|bcpkix-jdk15on|1.67|jar">bcpkix-jdk15on</a>,
@@ -343,7 +343,7 @@
<a href="https://search.maven.org/#artifactdetails|org.apache.santuario|xmlsec|2.2.0|bundle">xmlsec</a>,
<a href="https://search.maven.org/#artifactdetails|org.slf4j|slf4j-api|1.7.30|jar">slf4j-api</a>
</td>
- <td><a href="https://search.maven.org/#artifactdetails|org.apache.poi|ooxml-schemas|1.5|jar">ooxml-schemas-1.5.jar</a></td>
+ <td>poi-ooxml-full-version-yyyymmdd.jar</td>
</tr>
</table>
@@ -353,9 +353,9 @@
Zaxxer SparseBitSet was added as a dependency in POI 4.1.2
</note>
<p>
- poi-ooxml requires poi-ooxml-schemas. This is a substantially smaller
- version of the ooxml-schemas jar (ooxml-schemas-1.4.jar for POI 4.0.0
- or later, ooxml-schemas-1.3.jar for POI 3.14 or to POI 3.17,
+ poi-ooxml requires poi-ooxml-lite. This is a substantially smaller
+ version of the poi-ooxml-full jar (ooxml-schemas-1.4.jar for POI 4.0.0,
+ ooxml-schemas-1.3.jar for POI 3.14 or to POI 3.17,
ooxml-schemas-1.1.jar for POI 3.7 up to POI 3.13, ooxml-schemas-1.0.jar
for POI 3.5 and 3.6).
The larger ooxml-schemas jar is <a href="../help/index.html#faq-N10025">normally</a>
Modified: poi/site/src/documentation/content/xdocs/components/poi-jvm-languages.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/poi-jvm-languages.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/poi-jvm-languages.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/poi-jvm-languages.xml Sun Dec 13 15:32:43 2020
@@ -60,7 +60,7 @@
<section><title>POILanguageExample.java</title>
<source> <!-- lang="java" -->
// include poi-{version}-{yyyymmdd}.jar, poi-ooxml-{version}-{yyyymmdd}.jar,
- // and poi-ooxml-schemas-{version}-{yyyymmdd}.jar on Java classpath
+ // and poi-ooxml-lite-{version}-{yyyymmdd}.jar on Java classpath
// Import the POI classes
import java.io.File;
@@ -108,9 +108,9 @@
<source> <!-- lang="python" -->
# Add <a href="site:components">poi jars</a> onto the python classpath or add them at run time
import sys
- for jar in ('poi', 'poi-ooxml', 'poi-ooxml-schemas'):
- sys.path.append('/path/to/%s-3.14-20160307.jar')
-
+ for jar in ('poi', 'poi-ooxml', 'poi-ooxml-lite'):
+ sys.path.append('/path/to/%s-5.0.0-SNAPSHOT.jar')
+
from java.io import File, FileOutputStream
from contextlib import closing
@@ -140,19 +140,19 @@
wb.close()
</source>
<p>There are several websites that have examples of using Apache POI in Jython projects:
- <a href="https://wiki.python.org/jython/PoiExample">python.org</a>,
+ <a href="https://wiki.python.org/jython/PoiExample">python.org</a>,
<a href="http://www.jython.org/jythonbook/en/1.0/appendixB.html#working-with-spreadsheets">jython.org</a>, and many others.
</p>
</section>
-
+
<section><title>Scala example</title>
<section><title>build.sbt</title>
<source> <!-- lang="scala" -->
// Add the POI core and OOXML support dependencies into your build.sbt
libraryDependencies ++= Seq(
- "org.apache.poi" % "poi" % "3.15-beta2",
- "org.apache.poi" % "poi-ooxml" % "3.15-beta2",
- "org.apache.poi" % "poi-ooxml-schemas" "3.15-beta2"
+ "org.apache.poi" % "poi" % "5.0.0-SNAPSHOT",
+ "org.apache.poi" % "poi-ooxml" % "5.0.0-SNAPSHOT",
+ "org.apache.poi" % "poi-ooxml-lite" "5.0.0-SNAPSHOT"
)
</source>
</section>
@@ -255,7 +255,7 @@ WorkbookFactory.create(f,null,true).with
ns1.createRow(1).createCell(0).setCellValue("TODO - Populate with data")
Sheet ns2 = workbook.createSheet("Generated 2")
- exportHeader(ns2, headerStyle, "This is a demo sheet",
+ exportHeader(ns2, headerStyle, "This is a demo sheet",
["ID","Title","Date","Author","Num"] as String[])
ns2.createRow(2).createCell(0).setCellValue(1)
ns2.createRow(3).createCell(0).setCellValue(4)
@@ -344,7 +344,7 @@ void exportHeader(Sheet s, CellStyle hea
<legal>
Copyright (c) @year@ The Apache Software Foundation. All rights reserved.
<br />
- Apache POI, POI, Apache, the Apache feather logo, and the Apache
+ Apache POI, POI, Apache, the Apache feather logo, and the Apache
POI project logo are trademarks of The Apache Software Foundation.
</legal>
</footer>
Modified: poi/site/src/documentation/content/xdocs/components/spreadsheet/excelant.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/spreadsheet/excelant.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/spreadsheet/excelant.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/spreadsheet/excelant.xml Sun Dec 13 15:32:43 2020
@@ -29,7 +29,7 @@
</header>
<body>
<section><title>ExcelAnt - Ant Tasks for Validating Excel Spreadsheets</title>
-
+
<section><title>Introduction</title>
<p>ExcelAnt is a set of Ant tasks that make it possible to verify or test
a workbook without having to write Java code. Of course, the tasks themselves
@@ -48,10 +48,10 @@ workbooks then you need to have the foll
</ul>
<p> If you evaluate .xlsx workbooks then you need to add these: </p>
<ul>
- <li>poi-ooxml-schemas-$version-YYYYDDMM.jar</li>
+ <li>poi-ooxml-lite-$version-YYYYDDMM.jar</li>
<li>xmlbeans.jar</li>
</ul>
- <p>For example, if you have these jars in a lib/ dir in your project, your build.xml
+ <p>For example, if you have these jars in a lib/ dir in your project, your build.xml
might look like this:</p>
<source><![CDATA[
<property name="lib.dir" value="lib" />
@@ -60,8 +60,8 @@ workbooks then you need to have the foll
<pathelement location="${lib.dir}/poi-excelant-3.8-beta1-20101230.jar" />
<pathelement location="${lib.dir}/poi-3.8-beta1-20101230.jar" />
<pathelement location="${lib.dir}/poi-ooxml-3.8-beta1-20101230.jar" />
-</path>
-]]></source>
+</path>
+]]></source>
<p>Next, you'll need to define the Ant tasks. There are several ways to use ExcelAnt:</p>
<ul><li>The traditional way:</li></ul>
@@ -72,7 +72,7 @@ workbooks then you need to have the foll
Where excelant.path refers to the classpath with POI jars.
Using this approach the provided extensions will live in the default namespace. Note that the default task/typenames (evaluate, test) may be too generic and should either be explicitly overridden or used with a namespace.
</p>
-<ul><li>Similar, but assigning a namespace URI:</li></ul>
+<ul><li>Similar, but assigning a namespace URI:</li></ul>
<source><![CDATA[
<project name="excelant-demo" xmlns:poi="antlib:org.apache.poi.ss.excelant">
@@ -88,36 +88,36 @@ workbooks then you need to have the foll
</project>
]]></source>
</section>
-
+
<section><title>A Simple Example</title>
<p>The simplest example of using Excel is the ability to validate that POI is giving you back
the value you expect it to. Does this mean that POI is inaccurate? Hardly. There are cases
where POI is unable to evaluate cells for a variety of reasons. If you need to write code
- to integrate a worksheet into an app, you may want to know that it's going to work before
+ to integrate a worksheet into an app, you may want to know that it's going to work before
you actually try to write that code. ExcelAnt helps with that.</p>
-
- <p>Consider the mortgage-calculation.xls file found in the Examples
+
+ <p>Consider the mortgage-calculation.xls file found in the Examples
(/examples/src/org/apache/poi/examples/ss/excelant/simple-mortgage-calculation.xls). This sheet
is shown below:</p>
-
+
<!--img src="images/simple-xls-with-function.jpg" alt="mortgage calculation spreadsheet"/-->
-
+
<p>This sheet calculates the principal and interest payment for a mortgage based
- on the amount of the loan, term and rate. To write a simple ExcelAnt test you
+ on the amount of the loan, term and rate. To write a simple ExcelAnt test you
need to tell ExcelAnt about the file like this:</p>
<source><![CDATA[
<property name="xls.file" value="" />
-
+
<target name="simpleTest">
<excelant fileName="${xls.file}">
<test name="checkValue" showFailureDetail="true">
<evaluate showDelta="true" cell="'MortgageCalculator'!$B$4" expectedValue="790.7936" precision="1.0e-4" />
</test>
</excelant>
-</target>
+</target>
]]></source>
-
+
<p>This code sets up ExcelAnt to access the file defined in the ant property
xls.file. Then it creates a 'test' named 'checkValue'. Finally it tries
to evaluate the B4 on the sheet named 'MortgageCalculator'. There are some assumptions
@@ -125,20 +125,20 @@ workbooks then you need to have the foll
numerically oriented sheets. The <evaluate> task is actually evaluating the
cell as a formula using a FormulaEvaluator instance from POI. Therefore it will fail
if you point it to a cell that doesn't contain a formula or a test a plain old number.</p>
-
+
<p>Having said all that, here is what the output looks like:</p>
-
+
<source><![CDATA[
simpleTest:
[excelant] ExcelAnt version 0.4.0 Copyright 2011
[excelant] Using input file: resources/excelant.xls
[excelant] 1/1 tests passed.
BUILD SUCCESSFUL
-Total time: 391 milliseconds
+Total time: 391 milliseconds
]]></source>
</section>
-
+
<section><title>Setting Values into a Cell</title>
<p>So now we know that at a minimum POI can use our sheet to calculate the existing value.
This is an important point: in many cases sheets have dependencies, i.e., cells they reference.
@@ -148,7 +148,7 @@ Total time: 391 milliseconds
verifies that we can rely on POI to retrieve the default value, based on the stored values
of the sheet. Now we want to know if we can manipulate those dependencies and verify
the output.</p>
-
+
<p>To verify that we can manipulate cell values, we need a way in ExcelAnt to set a value.
This is provided by the following task types:</p>
<ul>
@@ -156,41 +156,41 @@ Total time: 391 milliseconds
<li>setFormula() - sets the specified cell as a formula.</li>
<li>setString() = sets the specified cell as a String.</li>
</ul>
-
+
<p>For the purposes of this example we'll use the <setDouble> task. Let's
start with a $240,000, 30 year loan at 11% (let's pretend it's like 1984). Here
is how we will set that up:</p>
-
+
<source><![CDATA[
<setDouble cell="'MortgageCalculator'!$B$1" value="240000"/>
<setDouble cell="'MortgageCalculator'!$B$2" value ="0.11"/>
<setDouble cell="'MortgageCalculator'!$B$3" value ="30"/>
-<evaluate showDelta="true" cell="'MortgageCalculator'!$B$4" expectedValue="2285.576149" precision="1.0e-4" />
+<evaluate showDelta="true" cell="'MortgageCalculator'!$B$4" expectedValue="2285.576149" precision="1.0e-4" />
]]></source>
<p>Don't forget that we're verifying the behavior so you need to put all this
into the sheet. That is how I got the result of $2,285 and change. So save your
changes and run it; you should get the following: </p>
-
-<source><![CDATA[
+
+<source><![CDATA[
Buildfile: C:\opt\eclipse\workspaces\excelant\excelant.examples\build.xml
simpleTest:
[excelant] ExcelAnt version 0.4.0 Copyright 2011
[excelant] Using input file: resources/excelant.xls
[excelant] 1/1 tests passed.
BUILD SUCCESSFUL
-Total time: 406 milliseconds
+Total time: 406 milliseconds
]]></source>
</section>
-
+
<section><title>Getting More Details</title>
<p>This is great, it's working! However, suppose you want to see a little more detail. The
ExcelAnt tasks leverage the Ant logging so you can add the -verbose and -debug flags to
- the Ant command line to get more detail. Try adding -verbose. Here is what
+ the Ant command line to get more detail. Try adding -verbose. Here is what
you should see:</p>
-
+
<source><![CDATA[
simpleTest:
[excelant] ExcelAnt version 0.4.0 Copyright 2011
@@ -199,20 +199,20 @@ simpleTest:
[evaluate] Using evaluate precision of 1.0E-4
[excelant] 1/1 tests passed.
BUILD SUCCESSFUL
-Total time: 406 milliseconds
+Total time: 406 milliseconds
]]></source>
-
+
<p>We see a little more detail. Notice that we see that there is a setting for global precision.
- Up until now we've been setting the precision on each evaluate that we call. This
+ Up until now we've been setting the precision on each evaluate that we call. This
is obviously useful but it gets cumbersome. It would be better if there were a way
- that we could specify a global precision - and there is. There is a <precision>
- tag that you can specify as a child of the <excelant> tag. Let's go back to
+ that we could specify a global precision - and there is. There is a <precision>
+ tag that you can specify as a child of the <excelant> tag. Let's go back to
our original task we set up earlier and modify it:</p>
-
+
<source><![CDATA[
<property name="xls.file" value="" />
-
+
<target name="simpleTest">
<excelant fileName="${xls.file}">
<precision value="1.0e-3"/>
@@ -220,16 +220,16 @@ Total time: 406 milliseconds
<evaluate showDelta="true" cell="'MortgageCalculator'!$B$4" expectedValue="790.7936" />
</test>
</excelant>
-</target>
+</target>
]]></source>
-
+
<p>In this example we have set the global precision to 1.0e-3. This means that
in the absence of something more stringent, all tests in the task will use
the global precision. We can still override this by specifying the
precision attribute of all of our <evaluate> task. Let's first run
this task with the global precision and the -verbose flag:</p>
-
-<source><![CDATA[
+
+<source><![CDATA[
simpleTest:
[excelant] ExcelAnt version 0.4.0 Copyright 2011
[excelant] Using input file: resources/excelant.xls
@@ -240,10 +240,10 @@ simpleTest:
[excelant] 1/1 tests passed.
]]></source>
-
+
<p>As the output clearly shows, the test itself has no precision but there is
the global precision. Additionally, it tells us we're going to use that
- more stringent global value. Now suppose that for this test we want
+ more stringent global value. Now suppose that for this test we want
to use a more stringent precision, say 1.0e-4. We can do that by adding
the precision attribute back to the <evaluate> task:</p>
@@ -272,27 +272,27 @@ simpleTest:
[evaluate] Using evaluate precision of 1.0E-4 over the global precision of 0.0010
[excelant] 1/1 tests passed.
BUILD SUCCESSFUL
-Total time: 390 milliseconds
+Total time: 390 milliseconds
]]></source>
</section>
-
+
<section><title>Leveraging User Defined Functions</title>
<p>POI has an excellent feature (besides ExcelAnt) called <a href="user-defined-functions.html">User Defined Functions</a>,
that allows you to write Java code that will be used in place of custom VB
code or macros is a spreadsheet. If you have read the documentation and written
your own FreeRefFunction implmentations, ExcelAnt can make use of this code.
- For each <excelant> task you define you can nest a <udf> tag
+ For each <excelant> task you define you can nest a <udf> tag
which allows you to specify the function alias and the class name.</p>
-
+
<p>Consider the previous example of the mortgage calculator. What if, instead
of being a formula in a cell, it was a function defined in a VB macro? As luck
- would have it, we already have an example of this in the examples from the
+ would have it, we already have an example of this in the examples from the
User Defined Functions example, so let's use that. In the example spreadsheet
there is a tab for MortgageCalculatorFunction, which will use. If you look in
cell B4, you see that rather than a messy cell based formula, there is only the function
call. Let's not get bogged down in the function/Java implementation, as these
are covered in the User Defined Function documentation. Let's just add
- a new target and test to our existing build file:</p>
+ a new target and test to our existing build file:</p>
<source><![CDATA[
<target name="functionTest">
<excelant fileName="${xls.file}">
@@ -306,13 +306,13 @@ Total time: 390 milliseconds
</test>
</excelant>
</target>
-]]></source>
+]]></source>
<p>So if you look at this carefully it looks the same as the previous examples. We
still use the global precision, we're still setting values, and we still want
to evaluate a cell. The only real differences are the sheet name and the
- addition of the function.</p>
+ addition of the function.</p>
</section>
</section>
</body>
-</document>
+</document>
Modified: poi/site/src/documentation/content/xdocs/help/faq.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/help/faq.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/help/faq.xml (original)
+++ poi/site/src/documentation/content/xdocs/help/faq.xml Sun Dec 13 15:32:43 2020
@@ -65,7 +65,7 @@ System.out.println("POI Scratchpad came
</faq>
<faq id="faq-N10025">
<question>
- I'm using the poi-ooxml-schemas jar, but my code is failing with "java.lang.NoClassDefFoundError: org/openxmlformats/schemas/*something*"
+ I'm using the poi-ooxml-lite (known as poi-ooxml-schemas) jar, but my code is failing with "java.lang.NoClassDefFoundError: org/openxmlformats/schemas/*something*"
</question>
<answer>
<p>To use the new OOXML file formats, POI requires a jar containing
@@ -75,21 +75,21 @@ System.out.println("POI Scratchpad came
<em>org.openxmlformats.schemas</em> namespace.</p>
<p>There are two jar files available, as described in
<a href="site:components">the components overview section</a>.
- The <em>full jar of all of the schemas is ooxml-schemas-1.4.jar
+ The <em>full jar of all of the schemas is poi-ooxml-full-XXX.jar (known as ooxml-schemas)
(lower versions for older releases, see table below)</em>,
- and it is currently around 16mb. The <em>smaller poi-ooxml-schemas
+ and it is currently around 16mb. The <em>smaller poi-ooxml-lite (known as poi-ooxml-schemas)
jar</em> is only about 6mb. This latter jar file only contains the
typically used parts though.</p>
- <p>Many users choose to use the smaller poi-ooxml-schemas jar to save
- space. However, the poi-ooxml-schemas jar only contains the XSDs and
+ <p>Many users choose to use the smaller poi-ooxml-lite jar to save
+ space. However, the poi-ooxml-lite jar only contains the XSDs and
classes that are typically used, as identified by the unit tests.
Every so often, you may try to use part of the file format which
- isn't included in the minimal poi-ooxml-schemas jar. In this case,
- you should switch to the full ooxml-schemas-1.4.jar. Longer term,
+ isn't included in the minimal poi-ooxml-lite jar. In this case,
+ you should switch to the full poi-ooxml-full jar. Longer term,
you may also wish to submit a new unit test which uses the extra
- parts of the XSDs, so that a future poi-ooxml-schemas jar will
+ parts of the XSDs, so that a future poi-ooxml-lite jar will
include them.</p>
- <p>There are a number of ways to get the full ooxml-schemas-1.4.jar.
+ <p>There are a number of ways to get the full poi-ooxml-full jar.
If you are a maven user, see the
<a href="site:components">the components overview section</a>
for the artifact details to have maven download it for you.
@@ -101,7 +101,7 @@ System.out.println("POI Scratchpad came
look at this). Finally, you can download the jar by hand from the
<a href="http://mirrors.ibiblio.org/apache/poi/">POI
Maven Repository</a>.</p>
- <p>Note that historically, different versions of ooxml-schemas were
+ <p>Note that historically, different versions of poi-ooxml-full / ooxml-schemas were
used</p>
<table class="POITable autosize">
@@ -132,9 +132,14 @@ System.out.println("POI Scratchpad came
</tr>
<tr>
<td>ooxml-schemas-1.4.jar</td>
- <td>POI 4.0.0 and newer</td>
+ <td>POI 4.*.*</td>
<td>Provide schema for AlternateContent, can be used with previous versions of POI as well</td>
</tr>
+ <tr>
+ <td>poi-ooxml-full jar</td>
+ <td>POI 5.0.0 and newer</td>
+ <td>Upgrade to ECMA-376 3rd edition - which is not downward compatible</td>
+ </tr>
</table>
</answer>
</faq>
@@ -415,16 +420,15 @@ case HSSFCell.CELL_TYPE_NUMERIC:
isn't common any more).</p>
<p>All of the <em>org.openxmlformats.schemas.spreadsheetml.x2006</em> CT...
classes are auto-generated by XMLBeans. The resulting generated Java goes
- in the <em>ooxml-schemas-src</em> jar, and the compiled version into the
- <em>ooxml-schemas</em> jar.</p>
- <p>The full <em>ooxml-schemas</em> jar is distributed with Apache POI,
- along with the cut-down <em>poi-ooxml-schemas</em> jar containing just
- the common parts. The source jar isn't normally distributed with POI.
- It is, however, available from Maven Central - ask your favourite Maven
- mirror for the <em>ooxml-schemas-src</em> jar. Alternately, if you download
+ in the <em>poi-ooxml-full-*-sources</em> jar, and the compiled version into the
+ <em>poi-ooxml-full</em> jar.</p>
+ <p>The full <em>poi-ooxml-full</em> jar is distributed with Apache POI,
+ along with the cut-down <em>poi-ooxml-lite</em> jar containing just
+ the common parts. Use the sources off <em>poi-ooxml-full</em> for the lite version,
+ which is available from Maven Central - ask your favourite Maven
+ mirror for the <em>poi-ooxml-full-*-sources</em> jar. Alternately, if you download
the POI source distribution (or checkout from SVN) and build, Ant will
- automatically download the specification XML Schema, and compile it for
- you to generate the source and binary ooxml-schemas jars.</p>
+ automatically compile it for you to generate the source and binary poi-ooxml-full jars.</p>
</answer>
</faq>
<faq id="faq-N101BA">
Modified: poi/trunk/.classpath
URL: http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Sun Dec 13 15:32:43 2020
@@ -18,12 +18,11 @@
<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-3.1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-4.0.0-sources.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
<classpathentry kind="lib" path="lib/ooxml/curvesapi-1.06.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ooxml/ooxml-schemas-1.4.jar" sourcepath="lib/ooxml/ooxml-schemas-1.4-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/ooxml/ooxml-security-1.1.jar" sourcepath="lib/ooxml/ooxml-security-1.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="build/dist/maven/poi-ooxml-full/poi-ooxml-full-5.0.0-SNAPSHOT.jar" sourcepath="build/xmlbean-sources"/>
<classpathentry kind="lib" path="lib/main-tests/jmh-core-1.26.jar"/>
<classpathentry kind="lib" path="lib/main-tests/jmh-generator-annprocess-1.26.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
Modified: poi/trunk/.gitignore
URL: http://svn.apache.org/viewvc/poi/trunk/.gitignore?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/.gitignore (original)
+++ poi/trunk/.gitignore Sun Dec 13 15:32:43 2020
@@ -26,7 +26,7 @@ TEST-org.apache.poi*.xml
sonar/main/src/
sonar/ooxml/src/
sonar/scratchpad/src/
-sonar/ooxml-schema-security/src/
+sonar/ooxml-full/src/
sonar/examples/src/
sonar/excelant/src/
sonar/target
Modified: poi/trunk/README.rst
URL: http://svn.apache.org/viewvc/poi/trunk/README.rst?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/README.rst (original)
+++ poi/trunk/README.rst Sun Dec 13 15:32:43 2020
@@ -87,7 +87,7 @@ Contributing
Building jar files
------------------
-To build the jar files for poi, poi-ooxml, poi-ooxml-schemas, and poi-examples::
+To build the jar files for poi, poi-ooxml, poi-ooxml-lite, poi-ooxml-full and poi-examples::
ant jar
Modified: poi/trunk/build.gradle
URL: http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Sun Dec 13 15:32:43 2020
@@ -302,7 +302,7 @@ project('ooxml') {
compile project(':main')
compile project(':scratchpad') // TODO: get rid of this dependency!
- compile files('../../build/dist/maven/ooxml-schemas/ooxml-schemas-1.5.jar')
+ compile files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
testCompile "junit:junit:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
@@ -338,7 +338,7 @@ project('examples') {
compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
- compile files('../../build/dist/maven/ooxml-schemas/ooxml-schemas-1.5.jar')
+ compile files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
}
@@ -385,7 +385,7 @@ project('integrationtest') {
testCompile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
- testCompile files('../../build/dist/maven/ooxml-schemas/ooxml-schemas-1.5.jar')
+ testCompile files('../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar')
testCompile files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
}
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Dec 13 15:32:43 2020
@@ -160,7 +160,7 @@ under the License.
<property name="ooxml.lite.agent" location="lib/ooxml-tests/ooxml-lite-agent.jar"/>
<property name="ooxml.lite.report" location="build/ooxml-lite-report.txt"/>
- <property name="ooxml.lite.jar" location="build/dist/maven/poi-ooxml-schemas/poi-ooxml-schemas-${version.id}.jar"/>
+ <property name="ooxml.lite.jar" location="build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${version.id}.jar"/>
<property name="ooxml.lite.includes" value="^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"/>
@@ -328,8 +328,8 @@ under the License.
<!-- "Copy these file(s), free of charge" -->
<property name="ooxml.xsds.izip.1" value="${basedir}/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
<property name="ooxml.xsds.src.dir" location="build/ooxml-xsds-src"/>
- <property name="ooxml.xsds.src.jar" location="build/dist/maven/ooxml-schemas/ooxml-schemas-${maven.ooxml.xsds.version.id}-sources.jar"/>
- <property name="ooxml.xsds.jar" location="build/dist/maven/ooxml-schemas/ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
+ <property name="ooxml.xsds.src.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}-sources.jar"/>
+ <property name="ooxml.xsds.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}.jar"/>
<!-- additional schemas are packed into the poi schemas jar, -->
<!-- so we don't have to care about a separate versioning of the original ooxml schemas -->
@@ -467,7 +467,7 @@ under the License.
</path>
<path id="ooxml.lite.verify.classpath">
- <pathelement location="build/dist/maven/poi-ooxml-schemas/poi-ooxml-schemas-${version.id}.jar"/>
+ <pathelement location="build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${version.id}.jar"/>
<path refid="ooxml.base.classpath"/>
</path>
@@ -856,8 +856,8 @@ under the License.
</javac>
<javac release="9"
- srcdir="${basedir}/src/multimodule/ooxml-schemas/java9"
- destdir="${basedir}/src/multimodule/ooxml-schemas/java9"
+ srcdir="${basedir}/src/multimodule/ooxml-full/java9"
+ destdir="${basedir}/src/multimodule/ooxml-full/java9"
includeantruntime="false"
fork="true"
modulepath="lib/ooxml"
@@ -865,11 +865,11 @@ under the License.
<compilerarg line="--patch-module org.apache.poi.ooxml.schemas=${xmlbean.classes.dir}"/>
</javac>
- <mkdir dir="build/dist/maven/ooxml-schemas"/>
+ <mkdir dir="build/dist/maven/poi-ooxml-full"/>
<jar destfile="${ooxml.xsds.jar}">
<fileset dir="${xmlbean.classes.dir}"/>
- <zipfileset dir="${basedir}/src/multimodule/ooxml-schemas/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+ <zipfileset dir="${basedir}/src/multimodule/ooxml-full/java9" prefix="META-INF/versions/9" excludes="*.java"/>
<metainf dir="legal/"/>
<manifest>
<attribute name="Multi-Release" value="true"/>
@@ -887,7 +887,7 @@ under the License.
<jar destfile="${ooxml.xsds.src.jar}">
<fileset dir="${xmlbean.sources.dir}"/>
- <zipfileset dir="${basedir}/src/multimodule/ooxml-schemas/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
+ <zipfileset dir="${basedir}/src/multimodule/ooxml-full/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
<metainf dir="legal"/>
</jar>
</target>
@@ -1090,7 +1090,7 @@ under the License.
<compile-jar module="examples"
java="${examples.src}" classes="${examples.output.dir}">
<lib>
- <pathelement path="build/dist/maven/ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-full"/>
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
<pathelement path="build/dist/maven/poi-ooxml-tests"/>
@@ -1107,7 +1107,7 @@ under the License.
<lib>
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
- <pathelement path="build/dist/maven/ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-full"/>
<pathelement path="lib/main"/>
<pathelement path="lib/main-tests"/>
<pathelement path="lib/ooxml"/>
@@ -1208,12 +1208,12 @@ under the License.
</macrodef>
<target name="retest-ooxml" depends="jar"
- description="run ooxml tests with poi-ooxml-schemas (= lite schema)">
+ description="run ooxml tests with poi-ooxml-lite">
<path id="restest.modules">
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
<pathelement path="build/dist/maven/poi-ooxml-tests"/>
- <pathelement path="build/dist/maven/poi-ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-lite"/>
<pathelement path="lib/main"/>
<pathelement path="lib/main-tests"/>
<pathelement path="lib/ooxml"/>
@@ -1290,7 +1290,7 @@ under the License.
unless:true="${isJava8}">
<compilerarg line="--patch-module org.apache.poi.stress=${integration.output.test.dir}"/>
<modulepath>
- <pathelement path="build/dist/maven/ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-full"/>
<pathelement path="build/dist/maven/poi"/>
<pathelement path="build/dist/maven/poi-ooxml"/>
<pathelement path="build/dist/maven/poi-scratchpad"/>
@@ -1574,7 +1574,7 @@ under the License.
description="test OOXML classes">
<path id="test-ooxml.modules">
<!-- full schema -->
- <pathelement path="build/dist/maven/ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-full"/>
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-ooxml-tests"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
@@ -1611,7 +1611,7 @@ under the License.
<pathelement path="build/dist/maven/poi-ooxml"/>
<pathelement path="build/dist/maven/poi-scratchpad"/>
<pathelement path="build/dist/maven/poi-examples"/>
- <pathelement path="build/dist/maven/ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-full"/>
<pathelement path="build/dist/maven/poi-integration"/>
<pathelement path="lib/main"/>
<pathelement path="lib/main-tests"/>
@@ -1662,7 +1662,7 @@ under the License.
<local name="full.schema"/>
<loadresource property="full.schema">
- <file file="${basedir}/src/multimodule/ooxml-schemas/java9/module-info.java"/>
+ <file file="${basedir}/src/multimodule/ooxml-full/java9/module-info.java"/>
<filterchain>
<linecontains negate="true" matchany="true">
<contains value="exports"/>
@@ -1741,7 +1741,7 @@ org/apache/poi/schemas/ooxml/system/ooxm
org/apache/poi/schemas/ooxml/system/ooxml/rectaf36doctype.xsb
</echo>
- <mkdir dir="build/dist/maven/poi-ooxml-schemas"/>
+ <mkdir dir="build/dist/maven/poi-ooxml-lite"/>
<jar destfile="${ooxml.lite.jar}" duplicate="preserve">
<zipfileset dir="${basedir}/src/multimodule/ooxml-lite/java9" prefix="META-INF/versions/9" excludes="*.java"/>
@@ -1750,7 +1750,7 @@ org/apache/poi/schemas/ooxml/system/ooxm
<include name="org/apache/poi/schemas/ooxml/element/**/*.xsb"/>
</patternset>
</zipfileset>
- <zipfileset dir="src/multimodule/ooxml-schemas/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+ <zipfileset dir="src/multimodule/ooxml-full/java9" prefix="META-INF/versions/9" excludes="*.java"/>
<manifest>
<attribute name="Multi-Release" value="true"/>
<attribute name="Automatic-Module-Name" value="org.apache.poi.ooxml.schemas"/>
@@ -1760,11 +1760,11 @@ org/apache/poi/schemas/ooxml/system/ooxm
<target name="test-ooxml-lite" depends="jacocotask,compile-ooxml-lite">
<delete file="${ooxml.testokfile}"/>
- <echo message="Running ooxml tests against 'poi-ooxml-schemas'"/>
+ <echo message="Running ooxml tests against 'poi-ooxml-lite'"/>
<path id="test-ooxml-lite.modules">
<!-- lite schema -->
- <pathelement path="build/dist/maven/poi-ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-lite"/>
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-ooxml-tests"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
@@ -1803,7 +1803,7 @@ org/apache/poi/schemas/ooxml/system/ooxm
<pathelement path="lib/excelant"/>
<pathelement path="build/dist/maven/poi-tests"/>
<pathelement path="build/dist/maven/poi-ooxml-tests"/>
- <pathelement path="build/dist/maven/poi-ooxml-schemas"/>
+ <pathelement path="build/dist/maven/poi-ooxml-lite"/>
<pathelement path="build/dist/maven/poi-scratchpad-tests"/>
<pathelement path="build/dist/maven/poi-excelant-tests"/>
</path>
@@ -2002,11 +2002,11 @@ org/apache/poi/schemas/ooxml/system/ooxm
</filterchain>
</copy>
- <mkdir dir="${dist.dir}/maven/ooxml-schemas"/>
- <copy tofile="${dist.dir}/maven/ooxml-schemas/ooxml-schemas-${maven.ooxml.xsds.version.id}.pom" file="maven/ooxml-schemas.pom">
+ <mkdir dir="${dist.dir}/maven/poi-ooxml-full"/>
+ <copy tofile="${dist.dir}/maven/poi-ooxml-full/poi-ooxml-full-${version.id}.pom" file="maven/poi-ooxml-full.pom">
<filterchain>
<replacetokens>
- <token key="VERSION" value="${maven.ooxml.xsds.version.id}"/>
+ <token key="VERSION" value="${version.id}"/>
</replacetokens>
</filterchain>
</copy>
@@ -2042,7 +2042,7 @@ org/apache/poi/schemas/ooxml/system/ooxm
<chainedmapper>
<filtermapper>
<replaceregex pattern=".jar" replace="" flags="g"/>
- <replaceregex pattern="ooxml-lite" replace="ooxml-schemas" flags="g"/>
+<!-- <replaceregex pattern="ooxml-lite" replace="ooxml-schemas" flags="g"/>-->
<replaceregex pattern="(.java|.src)$$" replace="-sources"/>
<replaceregex pattern=".*(?:build|src).?(.*)?" replace="\1"/>
<replaceregex pattern="(.*)(-classes|-sources)" replace="poi-\1/poi-\1-${version.id}\2"/>
@@ -2299,10 +2299,9 @@ org/apache/poi/schemas/ooxml/system/ooxm
<m2-install artifactId="poi-scratchpad"/>
<m2-install artifactId="poi-ooxml"/>
<m2-install artifactId="poi-examples"/>
- <m2-install artifactId="poi-ooxml-schemas"/>
- <m2-install artifactId="poi-excelant"/>
+ <m2-install artifactId="poi-ooxml-lite"/>
+ <m2-install artifactId="poi-ooxml-full"/>
<m2-install artifactId="poi-excelant"/>
- <m2-install artifactId="ooxml-schemas" versionId="${maven.ooxml.xsds.version.id}"/>
</target>
<target name="rat-check" depends="init" description="Runs the Apache Creadur Rat check against the source code, to spot any files which are missing the correct license headers">
@@ -2623,7 +2622,8 @@ org/apache/poi/schemas/ooxml/system/ooxm
<nexus-upload artifactId="poi-examples"/>
<nexus-upload artifactId="poi-excelant"/>
<nexus-upload artifactId="poi-ooxml"/>
- <nexus-upload artifactId="poi-ooxml-schemas"/>
+ <nexus-upload artifactId="poi-ooxml-lite"/>
+ <nexus-upload artifactId="poi-ooxml-full"/>
<nexus-upload artifactId="poi-scratchpad"/>
</target>
Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Sun Dec 13 15:32:43 2020
@@ -323,10 +323,6 @@ poijobs.each { poijob ->
localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE)
mavenInstallation(defaultMaven)
}
- /* Currently not done, let's see if it is still necessary:
- # Maven-Download fails for strange reasons, try to workaround...
- mkdir -p sonar/ooxml-schema-security/target/schemas && wget -O sonar/ooxml-schema-security/target/schemas/xmldsig-core-schema.xsd http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd
- */
maven {
if (poijob.sonar) {
goals('clean package sonar:sonar')
Modified: poi/trunk/legal/LICENSE
URL: http://svn.apache.org/viewvc/poi/trunk/legal/LICENSE?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/legal/LICENSE (original)
+++ poi/trunk/legal/LICENSE Sun Dec 13 15:32:43 2020
@@ -209,7 +209,7 @@ license terms. Your use of these subcomp
and conditions of the following licenses:
-Office Open XML schemas (ooxml-schemas-1.*.jar)
+Office Open XML schemas (poi-ooxml-full-*.jar)
The Office Open XML schema definitions used by Apache POI are
a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
@@ -268,7 +268,7 @@ JUnit test library (junit-4.*.jar) & JaC
b) in the case of each subsequent Contributor:
i) changes to the Program, and
ii) additions to the Program;
- where such changes and/or additions to the Program originate from and are
+ where such changes and/or additions to the Program originate from and are
distributed by that particular Contributor. A Contribution 'originates' from
a Contributor if it was added to the Program by such Contributor itself or
anyone acting on such Contributor's behalf. Contributions do not include
@@ -491,7 +491,7 @@ Hamcrest library (hamcrest-*.jar) & Cuve
SLF4J library (slf4j-api-*.jar)
Copyright (c) 2004-2013 QOS.ch
- All rights reserved.
+ All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -515,19 +515,19 @@ SLF4J library (slf4j-api-*.jar)
inbot-utils (https://github.com/Inbot/inbot-utils)
The MIT License (MIT)
-
+
Copyright (c) 2015 Inbot
-
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Copied: poi/trunk/maven/poi-ooxml-full.pom (from r1884380, poi/trunk/maven/ooxml-schemas.pom)
URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml-full.pom?p2=poi/trunk/maven/poi-ooxml-full.pom&p1=poi/trunk/maven/ooxml-schemas.pom&r1=1884380&r2=1884381&rev=1884381&view=diff
==============================================================================
--- poi/trunk/maven/ooxml-schemas.pom (original)
+++ poi/trunk/maven/poi-ooxml-full.pom Sun Dec 13 15:32:43 2020
@@ -24,12 +24,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.poi</groupId>
- <artifactId>ooxml-schemas</artifactId>
+ <artifactId>poi-ooxml-full</artifactId>
<version>@VERSION@</version>
<packaging>jar</packaging>
- <name>OOXML schemas</name>
- <description>XmlBeans generated from the Ecma supplied xsds:
- http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%20Part%204%20(DOCX).zip</description>
+ <name>Apache POI - OOXML schemas (full)</name>
+ <description>XmlBeans generated from the Ecma supplied xsds (since POI 5.0.0, the 3rd edition is used):
+ https://www.ecma-international.org/publications/standards/Ecma-376.htm</description>
<url>https://poi.apache.org/</url>
<mailingLists>
Copied: poi/trunk/maven/poi-ooxml-lite.pom (from r1884380, poi/trunk/maven/poi-ooxml-schemas.pom)
URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml-lite.pom?p2=poi/trunk/maven/poi-ooxml-lite.pom&p1=poi/trunk/maven/poi-ooxml-schemas.pom&r1=1884380&r2=1884381&rev=1884381&view=diff
==============================================================================
--- poi/trunk/maven/poi-ooxml-schemas.pom (original)
+++ poi/trunk/maven/poi-ooxml-lite.pom Sun Dec 13 15:32:43 2020
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<version>@VERSION@</version>
<packaging>jar</packaging>
- <name>Apache POI</name>
+ <name>Apache POI - OOXML Schemas (lite)</name>
<url>https://poi.apache.org/</url>
<description>Apache POI - Java API To Access Microsoft Format Files</description>
Modified: poi/trunk/maven/poi-ooxml.pom
URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi-ooxml.pom?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/maven/poi-ooxml.pom (original)
+++ poi/trunk/maven/poi-ooxml.pom Sun Dec 13 15:32:43 2020
@@ -24,7 +24,7 @@
<artifactId>poi-ooxml</artifactId>
<version>@VERSION@</version>
<packaging>jar</packaging>
- <name>Apache POI</name>
+ <name>Apache POI - API based on OPC and OOXML schemas</name>
<url>https://poi.apache.org/</url>
<description>Apache POI - Java API To Access Microsoft Format Files</description>
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<version>@VERSION@</version>
</dependency>
<dependency>
Modified: poi/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/osgi/pom.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/osgi/pom.xml (original)
+++ poi/trunk/osgi/pom.xml Sun Dec 13 15:32:43 2020
@@ -96,7 +96,7 @@
poi;inline=true,
poi-scratchpad;inline=true,
poi-ooxml;inline=true,
- poi-ooxml-schemas;inline=true,
+ poi-ooxml-lite;inline=true,
xmlbeans;inline=true,
SparseBitSet,
curvesapi,
@@ -150,7 +150,7 @@
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml-schemas</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<version>${poi.version}</version>
</dependency>
Modified: poi/trunk/sonar/ooxml-full/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml-full/pom.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml-full/pom.xml (original)
+++ poi/trunk/sonar/ooxml-full/pom.xml Sun Dec 13 15:32:43 2020
@@ -9,7 +9,7 @@
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>poi-ooxml-schema</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<packaging>jar</packaging>
<name>Apache POI - Openxmlformats Schema package</name>
@@ -36,7 +36,7 @@
<target>
<property name="xsdir" value="${basedir}/../../src/ooxml/resources/org/apache/poi"/>
<copy todir="${basedir}/target/schemas">
- <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema.zip"/>
+ <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
<zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
<fileset dir="${xsdir}/xdgf" includes="*.xsd,*.xsdconfig"/>
<fileset dir="${xsdir}/schemas" includes="*.xsd,*.xsdconfig"/>
@@ -105,7 +105,7 @@
<directory>${basedir}/target/generated-resources</directory>
</resource>
<resource>
- <directory>${basedir}/../../src/multimodule/ooxml-schemas/java9</directory>
+ <directory>${basedir}/../../src/multimodule/ooxml-full/java9</directory>
<targetPath>META-INF/versions/9</targetPath>
<includes>
<include>*.class</include>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Sun Dec 13 15:32:43 2020
@@ -102,7 +102,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>poi-ooxml-schema</artifactId>
+ <artifactId>poi-ooxml-lite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: poi/trunk/sonar/pom.xml
URL: http://svn.apache.org/viewvc/poi/trunk/sonar/pom.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/sonar/pom.xml (original)
+++ poi/trunk/sonar/pom.xml Sun Dec 13 15:32:43 2020
@@ -57,7 +57,7 @@
<modules>
<module>main</module>
- <module>ooxml-schema</module>
+ <module>ooxml-full</module>
<module>ooxml</module>
<module>scratchpad</module>
<module>excelant</module>
@@ -118,6 +118,7 @@
</dependency>
</dependencies>
<configuration>
+ <printSummary>false</printSummary>
<systemPropertyVariables>
<POI.testdata.path>../../test-data</POI.testdata.path>
<java.awt.headless>true</java.awt.headless>
Modified: poi/trunk/src/examples/scala/build.sbt
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/scala/build.sbt?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/examples/scala/build.sbt (original)
+++ poi/trunk/src/examples/scala/build.sbt Sun Dec 13 15:32:43 2020
@@ -14,10 +14,10 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
+
// Add the POI core and OOXML support dependencies into your build.sbt
libraryDependencies ++= Seq(
- "org.apache.poi" % "poi" % "4.1.2",
- "org.apache.poi" % "poi-ooxml" % "4.1.2",
- "org.apache.poi" % "poi-ooxml-schemas" "4.1.2",
+ "org.apache.poi" % "poi" % "5.0.0",
+ "org.apache.poi" % "poi-ooxml" % "5.0.0",
+ "org.apache.poi" % "poi-ooxml-lite" "5.0.0",
)
Modified: poi/trunk/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java Sun Dec 13 15:32:43 2020
@@ -41,10 +41,10 @@ import org.openxmlformats.schemas.wordpr
/**
* This program creates a simple WordprocessingML table using POI XWPF API, and
- * a more complex, styled table using both XWPF and ooxml-schema. It's possible
- * that not all referenced wordprocessingml classes are defined in
- * poi-ooxml-schemas-3.8-beta4. If this is the case, you'll need to use the full
- * ooxml-schemas.jar library.
+ * a more complex, styled table using both XWPF and poi-ooxml-full. It's possible
+ * that not all referenced wordprocessingml classes are defined in the
+ * poi-ooxml-lite jar. If this is the case, you'll need to use the
+ * poi-ooxml-full jar library.
*
* @author gisella bronzetti (original)
* @author Gregg Morris (styled table)
Modified: poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java (original)
+++ poi/trunk/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java Sun Dec 13 15:32:43 2020
@@ -32,20 +32,20 @@ import org.apache.tools.ant.Task;
* Ant task class for testing Excel workbook cells.
*/
public class ExcelAntTask extends Task {
-
+
public static final String VERSION = "0.5.0" ;
-
+
private String excelFileName ;
-
+
private boolean failOnError;
-
+
private ExcelAntWorkbookUtil workbookUtil ;
-
+
private ExcelAntPrecision precision ;
-
+
private LinkedList<ExcelAntTest> tests ;
private LinkedList<ExcelAntUserDefinedFunction> functions ;
-
+
public ExcelAntTask() {
tests = new LinkedList<>() ;
functions = new LinkedList<>() ;
@@ -54,29 +54,29 @@ public class ExcelAntTask extends Task {
public void addPrecision( ExcelAntPrecision prec ) {
precision = prec ;
}
-
+
public void setFailOnError( boolean value ) {
failOnError = value ;
}
public void setFileName( String fileName ) {
excelFileName = fileName ;
}
-
+
public void addTest( ExcelAntTest testElement ) {
tests.add( testElement ) ;
}
-
+
public void addUdf( ExcelAntUserDefinedFunction def ) {
functions.add( def ) ;
}
-
+
@Override
public void execute() throws BuildException {
checkClassPath();
int totalCount = 0 ;
int successCount = 0 ;
-
+
StringBuilder versionBffr = new StringBuilder() ;
versionBffr.append( "ExcelAnt version " ) ;
versionBffr.append( VERSION ) ;
@@ -88,11 +88,11 @@ public class ExcelAntTask extends Task {
versionBffr.append( currYear ) ;
}
log( versionBffr.toString(), Project.MSG_INFO ) ;
-
+
log( "Using input file: " + excelFileName, Project.MSG_INFO ) ;
workbookUtil = ExcelAntWorkbookUtilFactory.getInstance(excelFileName);
-
+
for (ExcelAntTest test : tests) {
log("executing test: " + test.getName(), Project.MSG_DEBUG);
@@ -133,7 +133,7 @@ public class ExcelAntTask extends Task {
}
workbookUtil = null;
}
-
+
/**
* ExcelAnt depends on external libraries not included in the Ant distribution.
@@ -147,7 +147,7 @@ public class ExcelAntTask extends Task {
throw new BuildException(
"The <classpath> for <excelant> must include poi.jar and poi-ooxml.jar " +
"if not in Ant's own classpath. Processing .xlsx spreadsheets requires " +
- "additional poi-ooxml-schemas.jar, xmlbeans.jar" ,
+ "additional poi-ooxml-lite.jar, xmlbeans.jar" ,
e, getLocation());
}
Modified: poi/trunk/src/integrationtest/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/build.xml?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/build.xml (original)
+++ poi/trunk/src/integrationtest/build.xml Sun Dec 13 15:32:43 2020
@@ -86,7 +86,7 @@ Before running this, you should execute
<fileset dir="${dist}">
<include name="**/poi-5.*.jar"/>
<include name="**/poi-ooxml-5.*.jar"/>
- <include name="**/poi-ooxml-schemas-5.*.jar"/>
+ <include name="**/poi-ooxml-lite-5.*.jar"/>
<exclude name="**/*-javadoc*"/>
<exclude name="**/*-sources*"/>
</fileset>
@@ -129,7 +129,7 @@ Before running this, you should execute
<fileset dir="${dist}">
<include name="**/poi-5.*.jar"/>
<include name="**/poi-ooxml-5.*.jar"/>
- <include name="**/poi-ooxml-schemas-5.*.jar"/>
+ <include name="**/poi-ooxml-lite-5.*.jar"/>
<include name="**/poi-scratchpad-5.*.jar"/>
<exclude name="**/*-javadoc*"/>
<exclude name="**/*-sources*"/>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java Sun Dec 13 15:32:43 2020
@@ -40,7 +40,7 @@ public final class XPathHelper {
"Schemas (*.xsb) for <CLASS> can't be loaded - usually this happens when OSGI " +
"loading is used and the thread context classloader has no reference to " +
"the xmlbeans classes - please either verify if the <XSB>.xsb is on the " +
- "classpath or alternatively try to use the full ooxml-schemas-x.x.jar";
+ "classpath or alternatively try to use the poi-ooxml-full-x.x.jar";
private static final String MC_NS = "http://schemas.openxmlformats.org/markup-compatibility/2006";
private static final String MAC_DML_NS = "http://schemas.microsoft.com/office/mac/drawingml/2008/main";
@@ -119,7 +119,7 @@ public final class XPathHelper {
}
// Pesky XmlBeans bug - see Bugzilla #49934
- // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+ // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
xo = innerCur.getObject();
if (xo instanceof XmlAnyTypeImpl) {
String errorTxt = OSGI_ERROR
@@ -169,7 +169,7 @@ public final class XPathHelper {
alterCont = (AlternateContentDocument.AlternateContent)xo;
} else {
// Pesky XmlBeans bug - see Bugzilla #49934
- // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+ // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
if (!reparseAlternate) {
throw new XmlException(OSGI_ERROR
.replace("<CLASS>", "AlternateContent")
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java Sun Dec 13 15:32:43 2020
@@ -68,7 +68,7 @@ public class XSLFTable extends XSLFGraph
XmlObject xo = xc.getObject();
// Pesky XmlBeans bug - see Bugzilla #49934
- // it never happens when using the full ooxml-schemas jar but may happen with the abridged poi-ooxml-schemas
+ // it never happens when using poi-ooxml-full jar but may happen with the abridged poi-ooxml-lite jar
if (xo instanceof XmlAnyTypeImpl){
String errStr =
"Schemas (*.xsb) for CTTable can't be loaded - usually this happens when OSGI " +
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java Sun Dec 13 15:32:43 2020
@@ -26,7 +26,7 @@ import org.junit.Test;
import org.openxmlformats.schemas.drawingml.x2006.chart.*;
import org.openxmlformats.schemas.drawingml.x2006.main.*;
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
public class TestNecessaryOOXMLClasses {
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java Sun Dec 13 15:32:43 2020
@@ -18,18 +18,18 @@
*/
package org.apache.poi.xddf.usermodel.chart;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.poi.ooxml.POIXMLFactory;
import org.apache.poi.ooxml.POIXMLRelation;
import org.junit.Test;
import org.openxmlformats.schemas.drawingml.x2006.chart.CTChartSpace;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
public class TestXDDFChart {
@Test
public void testConstruct() {
- // minimal test to cause ooxml-lite to include all the classes in poi-ooxml-schemas
+ // minimal test to cause ooxml-lite to include all the classes in poi-ooxml-lite
XDDFChart xddfChart = newXDDFChart();
assertNotNull(xddfChart.getCTChartSpace());
@@ -43,7 +43,7 @@ public class TestXDDFChart {
xddfChart.setExternalId("rid1");
assertEquals("rid1", ctChartSpace.getExternalData().getId());
-
+
xddfChart.setExternalId("rid2");
assertEquals("rid2", ctChartSpace.getExternalData().getId());
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java Sun Dec 13 15:32:43 2020
@@ -16,15 +16,16 @@
==================================================================== */
package org.apache.poi.xddf.usermodel.chart;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.*;
+import org.junit.Test;
public class TestXDDFChartExtensionList {
@Test
public void getXmlObject() {
- // minimal test to include generated classes in poi-ooxml-schemas
+ // minimal test to include generated classes in poi-ooxml-lite
XDDFChartExtensionList list = new XDDFChartExtensionList();
assertNotNull(list.getXmlObject());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java Sun Dec 13 15:32:43 2020
@@ -26,7 +26,7 @@ import java.util.function.Supplier;
import org.apache.xmlbeans.XmlObject;
import org.junit.Test;
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
public class TestNecessaryOOXMLClasses {
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java Sun Dec 13 15:32:43 2020
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRow;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSheetData;
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
public class TestNecessaryOOXMLClasses {
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Sun Dec 13 15:32:43 2020
@@ -272,7 +272,7 @@ public final class TestXSSFBugs extends
}
/**
- * ensure that CTPhoneticPr is loaded by the ooxml test suite so that it is included in poi-ooxml-schemas
+ * ensure that CTPhoneticPr is loaded by the ooxml test suite so that it is included in poi-ooxml-lite
*/
@Test
public void bug49325() throws IOException {
@@ -1969,7 +1969,7 @@ public final class TestXSSFBugs extends
/**
* CTDefinedNamesImpl should be included in the smaller
- * poi-ooxml-schemas jar
+ * poi-ooxml-lite jar
*/
@Test
public void bug57176() throws IOException {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java Sun Dec 13 15:32:43 2020
@@ -24,7 +24,7 @@ import org.openxmlformats.schemas.wordpr
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STEm;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblLayoutType;
-// aim is to get these classes loaded and included in poi-ooxml-schemas.jar
+// aim is to get these classes loaded and included in poi-ooxml-lite.jar
public class TestNecessaryOOXMLClasses {
@Test
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java Sun Dec 13 15:32:43 2020
@@ -17,16 +17,6 @@
package org.apache.poi.xwpf.extractor;
-import org.apache.poi.util.StringUtil;
-import org.apache.poi.xwpf.XWPFTestDataSamples;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import static org.apache.poi.POITestCase.assertContains;
import static org.apache.poi.POITestCase.assertEndsWith;
import static org.apache.poi.POITestCase.assertNotContained;
@@ -35,6 +25,16 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.poi.util.StringUtil;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.junit.Test;
+
/**
* Tests for HXFWordExtractor
*/
@@ -431,7 +431,7 @@ public class TestXWPFWordExtractor {
@Test
public void testCTPictureBase() throws IOException {
- //This forces ctpicturebase to be included in the poi-ooxml-schemas jar
+ //This forces ctpicturebase to be included in the poi-ooxml-lite jar
try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("61991.docx");
XWPFWordExtractor extractor = new XWPFWordExtractor(doc)) {
String txt = extractor.getText();
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java Sun Dec 13 15:32:43 2020
@@ -659,7 +659,7 @@ public class TestXWPFRun {
final XWPFRun run = document.createParagraph().createRun();
// at least trigger some of the setters to ensure classes are included in
- // the poi-ooxml-schemas
+ // the poi-ooxml-lite
run.setBold(true);
run.setCapitalized(true);
run.setCharacterSpacing(2);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java Sun Dec 13 15:32:43 2020
@@ -94,7 +94,7 @@ public final class TestXWPFStyles {
/**
* YK: tests below don't make much sense,
- * they exist only to copy xml beans to pi-ooxml-schemas.jar
+ * they exist only to copy xml beans to pi-ooxml-lite.jar
*/
@SuppressWarnings("resource")
@Test
@@ -206,7 +206,7 @@ public final class TestXWPFStyles {
assertEquals(200, styles.getDefaultParagraphStyle().getSpacingAfter());
}
}
-
+
// Bug 60329: style with missing StyleID throws NPE
@Test
public void testMissingStyleId() throws IOException {
@@ -218,7 +218,7 @@ public final class TestXWPFStyles {
assertNotNull(styles.getStyle("NoList"));
assertNull(styles.getStyle("EmptyCellLayoutStyle"));
assertNotNull(styles.getStyle("BalloonText"));
-
+
// Bug 64600: styleExist throws NPE
assertTrue(styles.styleExist("NoList"));
assertFalse(styles.styleExist("EmptyCellLayoutStyle"));
@@ -228,7 +228,7 @@ public final class TestXWPFStyles {
}
}
}
-
+
@Test
public void testGetStyleByName() throws IOException {
try (XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("SampleDoc.docx")) {
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java?rev=1884381&r1=1884380&r2=1884381&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/XWPFAbstractNumTest.java Sun Dec 13 15:32:43 2020
@@ -16,15 +16,15 @@
==================================================================== */
package org.apache.poi.xwpf.usermodel;
-import org.junit.Test;
-
import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
public class XWPFAbstractNumTest {
@Test
public void getXmlObject() {
- // minimal test to include generated classes in poi-ooxml-schemas
+ // minimal test to include generated classes in poi-ooxml-lite
XWPFAbstractNum num = new XWPFAbstractNum();
assertNull(num.getCTAbstractNum());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org