use woodstox property on all junit calls
move test system properties to junit propertyset git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1694751 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7c8f544b9f
commit
8635ec311c
474
build.xml
474
build.xml
@ -73,20 +73,28 @@ under the License.
|
||||
<!-- issue warnings if source code contains unmappable characters for encoding ASCII -->
|
||||
<property name="java.source.encoding" value="ASCII"/>
|
||||
|
||||
<scriptdef name="propertyreset" language="javascript"
|
||||
description="Allows to assign @{property} new value">
|
||||
<attribute name="name"/>
|
||||
<attribute name="value"/>
|
||||
project.setProperty(attributes.get("name"), attributes.get("value"));
|
||||
</scriptdef>
|
||||
|
||||
<!--
|
||||
JVM system properties for running tests,
|
||||
user.language and user.country are required as we have locale-sensitive formatters
|
||||
-->
|
||||
<property name="testpattern" value="Test*"/>
|
||||
<property name="poi.test.locale" value="-Duser.language=en -Duser.country=US"/>
|
||||
<property name="POI.testdata.path" value="test-data"/>
|
||||
<property name="java.awt.headless" value="true"/>
|
||||
<property name="additionaljar" value=""/>
|
||||
<condition property="http_proxy"
|
||||
value="${env.http_proxy}"
|
||||
else="">
|
||||
<isset property="env.http_proxy"/>
|
||||
</condition>
|
||||
<propertyreset name="user.language" value="en"/>
|
||||
<propertyreset name="user.country" value="US"/>
|
||||
<condition property="http_proxy" value="${env.http_proxy}" else="">
|
||||
<isset property="env.http_proxy"/>
|
||||
</condition>
|
||||
<!-- Fix for strange woodstox references in gump build -->
|
||||
<property name="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
|
||||
|
||||
<!-- Main: -->
|
||||
<property name="main.resource1.dir" value="src/resources/main"/>
|
||||
@ -108,9 +116,8 @@ under the License.
|
||||
<property name="scratchpad.testokfile" location="build/scratchpad-testokfile.txt"/>
|
||||
|
||||
<!-- Scratchpad/Geometry -->
|
||||
<property name="geometry.pkg" value="org.apache.poi.sl.draw.binding"/>
|
||||
<property name="geometry.output.tmpdir" value="build/geometry-java"/>
|
||||
|
||||
<property name="geometry.pkg" value="org.apache.poi.sl.draw.binding"/>
|
||||
<property name="geometry.output.tmpdir" value="build/geometry-java"/>
|
||||
|
||||
<!-- Examples: -->
|
||||
<property name="examples.src" location="src/examples/src"/>
|
||||
@ -126,7 +133,7 @@ under the License.
|
||||
<property name="ooxml.testokfile" location="build/ooxml-testokfile.txt"/>
|
||||
<property name="ooxml.lite.output.dir" location="build/ooxml-lite-classes"/>
|
||||
|
||||
<!-- Integration testing -->
|
||||
<!-- Integration testing -->
|
||||
<property name="integration.src.test" location="src/integrationtest"/>
|
||||
<property name="integration.reports.test" location="build/integration-test-results"/>
|
||||
<property name="integration.output.test.dir" location="build/integration-test-classes"/>
|
||||
@ -159,17 +166,17 @@ under the License.
|
||||
<property name="main.antlauncher.jar" location="${main.lib}/ant-launcher-1.9.4.jar"/>
|
||||
<property name="main.antlauncher.url" value="${repository.m2}/maven2/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar"/>
|
||||
|
||||
<!-- xml signature libs -->
|
||||
<property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.1.jar"/>
|
||||
<property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.1/xmlsec-2.0.1.jar"/>
|
||||
<property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.51/bcprov-ext-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.7.jar"/>
|
||||
<property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
|
||||
<!-- xml signature libs -->
|
||||
<property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.0.1.jar"/>
|
||||
<property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.0.1/xmlsec-2.0.1.jar"/>
|
||||
<property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.51/bcprov-ext-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.51/bcpkix-jdk15on-1.51.jar"/>
|
||||
<property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.7.jar"/>
|
||||
<property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar"/>
|
||||
|
||||
<!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
|
||||
<!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
|
||||
<property name="ooxml.xmlbeans23.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
|
||||
<property name="ooxml.xmlbeans23.url"
|
||||
value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
|
||||
@ -239,6 +246,10 @@ under the License.
|
||||
<propertyref name="java.awt.headless"/>
|
||||
<propertyref name="org.apache.poi.util.POILogger"/>
|
||||
<propertyref name="http_proxy"/>
|
||||
<propertyref name="additionaljar"/>
|
||||
<propertyref name="user.language"/>
|
||||
<propertyref name="user.country"/>
|
||||
<propertyref name="javax.xml.stream.XMLInputFactory"/>
|
||||
</propertyset>
|
||||
|
||||
<path id="main.classpath">
|
||||
@ -329,6 +340,7 @@ under the License.
|
||||
<pathelement location="${main.ant.jar}"/>
|
||||
<pathelement location="${ooxml.output.dir}"/>
|
||||
</path>
|
||||
|
||||
<path id="test.excelant.classpath">
|
||||
<path refid="ooxml.classpath"/>
|
||||
<pathelement location="${ooxml.output.dir}"/>
|
||||
@ -383,7 +395,7 @@ under the License.
|
||||
<mkdir dir="${scratchpad.output.dir}"/>
|
||||
<mkdir dir="${scratchpad.output.test.dir}"/>
|
||||
<mkdir dir="${scratchpad.reports.test}"/>
|
||||
<mkdir dir="${geometry.output.tmpdir}"/>
|
||||
<mkdir dir="${geometry.output.tmpdir}"/>
|
||||
<mkdir dir="${ooxml.output.dir}"/>
|
||||
<mkdir dir="${ooxml.output.test.dir}"/>
|
||||
<mkdir dir="${ooxml.reports.test}"/>
|
||||
@ -396,7 +408,7 @@ under the License.
|
||||
<mkdir dir="${dist.dir}"/>
|
||||
<mkdir dir="${build.site}"/>
|
||||
|
||||
<echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
|
||||
<echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
|
||||
</target>
|
||||
|
||||
<target name="clean">
|
||||
@ -412,32 +424,32 @@ under the License.
|
||||
</target>
|
||||
|
||||
<target name="check-jars">
|
||||
<!-- remove previous versions of third-party jars to prevent them from lingering around,
|
||||
we often had hard-to-find build/CI-problems because of these! -->
|
||||
<mkdir dir="${main.lib}"/>
|
||||
<mkdir dir="${compile.lib}"/>
|
||||
<delete verbose="true">
|
||||
<fileset dir="${main.lib}">
|
||||
<include name="ant-1.8*"/>
|
||||
<include name="asm-all-4*"/>
|
||||
<include name="commons-codec-1.5*"/>
|
||||
<include name="commons-logging-1.1.jar"/>
|
||||
<include name="jacoco-0.6*"/>
|
||||
<include name="jacoco-0.7.1*"/>
|
||||
<include name="jacoco-0.7.2*"/>
|
||||
<include name="jacoco-0.7.3*"/>
|
||||
<include name="log4j-1.2.13*"/>
|
||||
<include name="org.jacoco.*-0.6.*"/>
|
||||
<include name="org.jacoco.*-0.7.1*"/>
|
||||
<include name="org.jacoco.*-0.7.2*"/>
|
||||
<include name="org.jacoco.*-0.7.3*"/>
|
||||
<include name="dom4j*"/>
|
||||
<include name="apache-rat-0.10*"/>
|
||||
<include name="xercesImpl-*.jar"/>
|
||||
<include name="junit-3*"/>
|
||||
<include name="junit-4.11*"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
<!-- remove previous versions of third-party jars to prevent them from lingering around,
|
||||
we often had hard-to-find build/CI-problems because of these! -->
|
||||
<mkdir dir="${main.lib}"/>
|
||||
<mkdir dir="${compile.lib}"/>
|
||||
<delete verbose="true">
|
||||
<fileset dir="${main.lib}">
|
||||
<include name="ant-1.8*"/>
|
||||
<include name="asm-all-4*"/>
|
||||
<include name="commons-codec-1.5*"/>
|
||||
<include name="commons-logging-1.1.jar"/>
|
||||
<include name="jacoco-0.6*"/>
|
||||
<include name="jacoco-0.7.1*"/>
|
||||
<include name="jacoco-0.7.2*"/>
|
||||
<include name="jacoco-0.7.3*"/>
|
||||
<include name="log4j-1.2.13*"/>
|
||||
<include name="org.jacoco.*-0.6.*"/>
|
||||
<include name="org.jacoco.*-0.7.1*"/>
|
||||
<include name="org.jacoco.*-0.7.2*"/>
|
||||
<include name="org.jacoco.*-0.7.3*"/>
|
||||
<include name="dom4j*"/>
|
||||
<include name="apache-rat-0.10*"/>
|
||||
<include name="xercesImpl-*.jar"/>
|
||||
<include name="junit-3*"/>
|
||||
<include name="junit-4.11*"/>
|
||||
</fileset>
|
||||
</delete>
|
||||
|
||||
<condition property="jars.present">
|
||||
<or>
|
||||
@ -566,39 +578,39 @@ under the License.
|
||||
depends="check-ooxml-xsds"
|
||||
description="Fetches needed OOXML xsd files from the Internet">
|
||||
<get dest="${ooxml.lib}" skipexisting="true">
|
||||
<url url="${ooxml.xsds.url.1}"/>
|
||||
<url url="${ooxml.xsds.url.2}"/>
|
||||
<url url="${ooxml.xsds.dc.1}"/>
|
||||
<url url="${ooxml.xsds.dc.2}"/>
|
||||
<url url="${ooxml.xsds.dc.3}"/>
|
||||
<url url="${ooxml.xsds.dsig.1}"/>
|
||||
<url url="${ooxml.xsds.dsig.2}"/>
|
||||
<url url="${ooxml.xsds.dsig.3}"/>
|
||||
<chainedmapper>
|
||||
<flattenmapper/>
|
||||
<firstmatchmapper>
|
||||
<globmapper from="Office%20Open%20XML%201st%20edition%20Part%20*%20(PDF).zip" to="OfficeOpenXML-Part*.zip"/>
|
||||
<identitymapper/>
|
||||
</firstmatchmapper>
|
||||
</chainedmapper>
|
||||
</get>
|
||||
<url url="${ooxml.xsds.url.1}"/>
|
||||
<url url="${ooxml.xsds.url.2}"/>
|
||||
<url url="${ooxml.xsds.dc.1}"/>
|
||||
<url url="${ooxml.xsds.dc.2}"/>
|
||||
<url url="${ooxml.xsds.dc.3}"/>
|
||||
<url url="${ooxml.xsds.dsig.1}"/>
|
||||
<url url="${ooxml.xsds.dsig.2}"/>
|
||||
<url url="${ooxml.xsds.dsig.3}"/>
|
||||
<chainedmapper>
|
||||
<flattenmapper/>
|
||||
<firstmatchmapper>
|
||||
<globmapper from="Office%20Open%20XML%201st%20edition%20Part%20*%20(PDF).zip" to="OfficeOpenXML-Part*.zip"/>
|
||||
<identitymapper/>
|
||||
</firstmatchmapper>
|
||||
</chainedmapper>
|
||||
</get>
|
||||
<unzip src="${ooxml.lib}/${ooxml.xsds.ozip.1}" dest="${ooxml.lib}">
|
||||
<fileset dir="${ooxml.lib}" includes="OfficeOpenXML-Part*.zip"/>
|
||||
<fileset dir="${ooxml.lib}" includes="OfficeOpenXML-Part*.zip"/>
|
||||
<patternset>
|
||||
<include name="${ooxml.xsds.izip.1}"/>
|
||||
<include name="${ooxml.xsds.izip.2}"/>
|
||||
<include name="${ooxml.xsds.izip.2}"/>
|
||||
</patternset>
|
||||
</unzip>
|
||||
</target>
|
||||
<target name="check-compiled-ooxml-xsds" depends="fetch-ooxml-xsds">
|
||||
<condition property="ooxml-compiled-xsds.present">
|
||||
<or>
|
||||
<and>
|
||||
<and>
|
||||
<available file="${ooxml.xsds.jar}"/>
|
||||
<available file="${ooxml.security.jar}"/>
|
||||
<available file="${ooxml.xsds.src.jar}"/>
|
||||
<available file="${ooxml.security.src.jar}"/>
|
||||
</and>
|
||||
</and>
|
||||
<isset property="disconnected"/>
|
||||
</or>
|
||||
</condition>
|
||||
@ -617,7 +629,7 @@ under the License.
|
||||
<equals arg1="${sun.arch.data.model}" arg2="64" />
|
||||
</condition>
|
||||
|
||||
<property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
|
||||
<property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
|
||||
<mkdir dir="${ooxml.xsds.tmp.dir}"/>
|
||||
<unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${ooxml.xsds.tmp.dir}"/>
|
||||
<xmlbean
|
||||
@ -633,25 +645,25 @@ under the License.
|
||||
<classpath refid="ooxml.classpath"/>
|
||||
</xmlbean>
|
||||
|
||||
<!-- Now make a jar of the schema sources -->
|
||||
<jar
|
||||
<!-- Now make a jar of the schema sources -->
|
||||
<jar
|
||||
basedir="${ooxml.xsds.src.dir}"
|
||||
destfile="${ooxml.xsds.src.jar}"
|
||||
/>
|
||||
|
||||
<!-- Now do the same for the security schemas -->
|
||||
<property name="ooxml.enc.xsds.tmp.dir" location="build/ooxml-security-xsds"/>
|
||||
<!-- Now do the same for the security schemas -->
|
||||
<property name="ooxml.enc.xsds.tmp.dir" location="build/ooxml-security-xsds"/>
|
||||
<mkdir dir="${ooxml.enc.xsds.tmp.dir}"/>
|
||||
<unzip src="${ooxml.lib}/${ooxml.xsds.izip.2}" dest="${ooxml.enc.xsds.tmp.dir}"/>
|
||||
|
||||
<copy todir="${ooxml.enc.xsds.tmp.dir}">
|
||||
<fileset dir="${ooxml.lib}" includes="dc*.xsd,xmldsig*.xsd,XAdES*.xsd"/>
|
||||
<fileset dir="${ooxml.security.xsd.dir}"/>
|
||||
</copy>
|
||||
<copy todir="${ooxml.enc.xsds.tmp.dir}">
|
||||
<fileset dir="${ooxml.lib}" includes="dc*.xsd,xmldsig*.xsd,XAdES*.xsd"/>
|
||||
<fileset dir="${ooxml.security.xsd.dir}"/>
|
||||
</copy>
|
||||
|
||||
<!-- noupa/nopvr is set because of the dublincore schemas -->
|
||||
<!-- https://issues.apache.org/jira/browse/XMLBEANS-340 -->
|
||||
<!-- javasource > 1.5 will not generate all array accessor -->
|
||||
<!-- noupa/nopvr is set because of the dublincore schemas -->
|
||||
<!-- https://issues.apache.org/jira/browse/XMLBEANS-340 -->
|
||||
<!-- javasource > 1.5 will not generate all array accessor -->
|
||||
<xmlbean
|
||||
schema="${ooxml.enc.xsds.tmp.dir}"
|
||||
srcgendir="${ooxml.security.src.dir}"
|
||||
@ -661,8 +673,8 @@ under the License.
|
||||
failonerror="true"
|
||||
fork="true"
|
||||
memoryMaximumSize="${ooxml.memory}"
|
||||
noupa="true"
|
||||
nopvr="true"
|
||||
noupa="true"
|
||||
nopvr="true"
|
||||
>
|
||||
<classpath refid="ooxml.classpath"/>
|
||||
</xmlbean>
|
||||
@ -708,39 +720,39 @@ under the License.
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
|
||||
<delete dir="${geometry.output.tmpdir}"/>
|
||||
<!-- taskdef xjc -->
|
||||
<!-- "D:\Program Files\Java\jdk1.6.0_45\bin\xjc" -p org.apache.poi.sl.model.geom.binding -readOnly -Xlocator -mark-generated ooxml-schemas\dml-shapeGeometry.xsd -->
|
||||
<unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${geometry.output.tmpdir}"/>
|
||||
<exec executable="${env.JAVA_HOME}/bin/xjc">
|
||||
<arg value="-p"/>
|
||||
<arg value="${geometry.pkg}"/>
|
||||
<arg value="-b"/>
|
||||
<arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
|
||||
<arg value="-readOnly"/>
|
||||
<arg value="-npa"/>
|
||||
<arg value="-no-header"/>
|
||||
<!--arg value="-mark-generated"/ -->
|
||||
<!--arg value="-Xlocator"/ -->
|
||||
<arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
|
||||
<arg value="-d"/>
|
||||
<arg file="${geometry.output.tmpdir}"/>
|
||||
</exec>
|
||||
<copy file="src/java/org/apache/poi/POIDocument.java" tofile="${geometry.output.tmpdir}/apache-license.txt">
|
||||
<filterchain>
|
||||
<headfilter lines="16"/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
<copy todir="${main.src}">
|
||||
<fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
|
||||
<filterchain>
|
||||
<concatfilter prepend="${geometry.output.tmpdir}/apache-license.txt"/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
</target>
|
||||
<target name="generate-geometry" depends="fetch-ooxml-xsds" if="ignoreme">
|
||||
<delete dir="${geometry.output.tmpdir}"/>
|
||||
<!-- taskdef xjc -->
|
||||
<!-- "D:\Program Files\Java\jdk1.6.0_45\bin\xjc" -p org.apache.poi.sl.model.geom.binding -readOnly -Xlocator -mark-generated ooxml-schemas\dml-shapeGeometry.xsd -->
|
||||
<unzip src="${ooxml.lib}/${ooxml.xsds.izip.1}" dest="${geometry.output.tmpdir}"/>
|
||||
<exec executable="${env.JAVA_HOME}/bin/xjc">
|
||||
<arg value="-p"/>
|
||||
<arg value="${geometry.pkg}"/>
|
||||
<arg value="-b"/>
|
||||
<arg file="src/types/definitions/dml-shapeGeometry.xjb"/>
|
||||
<arg value="-readOnly"/>
|
||||
<arg value="-npa"/>
|
||||
<arg value="-no-header"/>
|
||||
<!--arg value="-mark-generated"/ -->
|
||||
<!--arg value="-Xlocator"/ -->
|
||||
<arg file="${geometry.output.tmpdir}/dml-shapeGeometry.xsd"/>
|
||||
<arg value="-d"/>
|
||||
<arg file="${geometry.output.tmpdir}"/>
|
||||
</exec>
|
||||
<copy file="src/java/org/apache/poi/POIDocument.java" tofile="${geometry.output.tmpdir}/apache-license.txt">
|
||||
<filterchain>
|
||||
<headfilter lines="16"/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
<copy todir="${main.src}">
|
||||
<fileset dir="${geometry.output.tmpdir}" includes="**/*.java"/>
|
||||
<filterchain>
|
||||
<concatfilter prepend="${geometry.output.tmpdir}/apache-license.txt"/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="compile-scratchpad" depends="compile-main,generate-geometry">
|
||||
<target name="compile-scratchpad" depends="compile-main,generate-geometry">
|
||||
<javac target="${jdk.version.class}"
|
||||
source="${jdk.version.source}"
|
||||
destdir="${scratchpad.output.dir}"
|
||||
@ -801,9 +813,9 @@ under the License.
|
||||
fork="yes"
|
||||
includeantruntime="false">
|
||||
<classpath>
|
||||
<path refid="ooxml.classpath"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
</classpath>
|
||||
<path refid="ooxml.classpath"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<javac target="${jdk.version.class}"
|
||||
source="${jdk.version.source}"
|
||||
@ -815,8 +827,8 @@ under the License.
|
||||
includeantruntime="false">
|
||||
<classpath>
|
||||
<path refid="ooxml.classpath"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
<path refid="test.ooxml.classpath"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
<path refid="test.ooxml.classpath"/>
|
||||
<pathelement path="${ooxml.output.dir}"/>
|
||||
<pathelement path="${main.output.test.dir}"/>
|
||||
</classpath>
|
||||
@ -868,9 +880,9 @@ under the License.
|
||||
<classpath>
|
||||
<path refid="scratchpad.classpath"/>
|
||||
<path refid="ooxml.classpath"/>
|
||||
<pathelement location="${ooxml.output.dir}"/>
|
||||
<pathelement location="${ooxml.output.dir}"/>
|
||||
<pathelement location="${main.output.test.dir}"/>
|
||||
<pathelement location="${main.ant.jar}"/>
|
||||
<pathelement location="${main.ant.jar}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
<!--copy todir="${integration.output.dir}">
|
||||
@ -928,7 +940,7 @@ under the License.
|
||||
<group name="Main">
|
||||
<classfiles>
|
||||
<fileset dir="${main.output.dir}">
|
||||
<!-- exclude large test-class -->
|
||||
<!-- exclude large test-class -->
|
||||
<exclude name="org/apache/poi/hssf/usermodel/DummyGraphics2d.class"/>
|
||||
</fileset>
|
||||
</classfiles>
|
||||
@ -939,10 +951,10 @@ under the License.
|
||||
<group name="Scratchpad">
|
||||
<classfiles>
|
||||
<fileset dir="${scratchpad.output.dir}">
|
||||
<!-- exclude some generated classes -->
|
||||
<exclude name="org/apache/poi/hwpf/model/types/*.class"/>
|
||||
<exclude name="org/apache/poi/hdf/model/hdftypes/definitions/*.class"/>
|
||||
</fileset>
|
||||
<!-- exclude some generated classes -->
|
||||
<exclude name="org/apache/poi/hwpf/model/types/*.class"/>
|
||||
<exclude name="org/apache/poi/hdf/model/hdftypes/definitions/*.class"/>
|
||||
</fileset>
|
||||
</classfiles>
|
||||
<sourcefiles encoding="UTF-8">
|
||||
<fileset dir="${scratchpad.src}"/>
|
||||
@ -955,9 +967,9 @@ under the License.
|
||||
fileset dir="${ooxml.lite.output.dir}">
|
||||
<exclude name="org/openxmlformats/**"/>
|
||||
<exclude name="schema*/**"/>
|
||||
<exclude name="org/etsi/**"/>
|
||||
<exclude name="org/w3/**"/>
|
||||
<exclude name="com/**"/>
|
||||
<exclude name="org/etsi/**"/>
|
||||
<exclude name="org/w3/**"/>
|
||||
<exclude name="com/**"/>
|
||||
</fileset-->
|
||||
</classfiles>
|
||||
<sourcefiles encoding="UTF-8">
|
||||
@ -1004,10 +1016,8 @@ under the License.
|
||||
failureproperty="main.test.failed" showoutput="true">
|
||||
<classpath refid="test.classpath"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Xmx256m"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<formatter type="plain"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest todir="${main.reports.test}">
|
||||
@ -1047,9 +1057,7 @@ under the License.
|
||||
failureproperty="scratchpad.test.failed">
|
||||
<classpath refid="test.scratchpad.classpath"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<!--
|
||||
YK: ensure that JUnit has enough memory to run tests.
|
||||
Without the line below tests fail on Mac OS X with jdk-1.6.26
|
||||
@ -1090,9 +1098,7 @@ under the License.
|
||||
failureproperty="ooxml.test.failed">
|
||||
<classpath refid="@{classpath}"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<formatter type="plain"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest todir="${ooxml.reports.test}">
|
||||
@ -1100,7 +1106,7 @@ under the License.
|
||||
<include name="**/${testpattern}.java"/>
|
||||
<exclude name="**/TestUnfixedBugs.java"/>
|
||||
<exclude name="**/All*Tests.java"/>
|
||||
<exclude name="**/TestSignatureInfo.java"/>
|
||||
<exclude name="**/TestSignatureInfo.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
@ -1109,18 +1115,16 @@ under the License.
|
||||
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
|
||||
failureproperty="ooxml.xmlsec.test.failed">
|
||||
<classpath>
|
||||
<path refid="@{classpath}"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
<path refid="@{classpath}"/>
|
||||
<path refid="ooxml.xmlsec.classpath"/>
|
||||
</classpath>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<formatter type="plain"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest todir="${ooxml.reports.test}">
|
||||
<fileset dir="${ooxml.src.test}">
|
||||
<include name="**/TestSignatureInfo.java"/>
|
||||
<include name="**/TestSignatureInfo.java"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
@ -1151,7 +1155,6 @@ under the License.
|
||||
failureproperty="integration.test.failed" showoutput="true">
|
||||
<classpath refid="test.integration.classpath"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<!--
|
||||
YK: ensure that JUnit has enough memory to run tests.
|
||||
@ -1159,7 +1162,6 @@ under the License.
|
||||
and on Windows with jdk-1.5.22
|
||||
-->
|
||||
<jvmarg value="-Xmx1512M"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<formatter type="plain"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest todir="${integration.reports.test}">
|
||||
@ -1181,24 +1183,20 @@ under the License.
|
||||
<property name="ooxml.lite-merged.dir" location="build/ooxml-lite-merged"/>
|
||||
<mkdir dir="${ooxml.lite-merged.dir}"/>
|
||||
|
||||
<jar destfile="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar">
|
||||
<zipfileset includes="**/*" src="${ooxml.xsds.jar}"/>
|
||||
<zipfileset includes="**/*" src="${ooxml.security.jar}"/>
|
||||
<jar destfile="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar">
|
||||
<zipfileset includes="**/*" src="${ooxml.xsds.jar}"/>
|
||||
<zipfileset includes="**/*" src="${ooxml.security.jar}"/>
|
||||
</jar>
|
||||
|
||||
<java classname="org.apache.poi.util.OOXMLLite" fork="yes"
|
||||
failonerror="true">
|
||||
<classpath>
|
||||
<pathelement path="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
|
||||
</classpath>
|
||||
failonerror="true">
|
||||
<classpath>
|
||||
<pathelement path="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
|
||||
</classpath>
|
||||
<classpath refid="test.ooxml.classpath"/>
|
||||
<classpath refid="ooxml.xmlsec.classpath"/>
|
||||
<classpath refid="ooxml.xmlsec.classpath"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<!-- Fix for strange woodstox references in gump build -->
|
||||
<jvmarg value="-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
|
||||
<arg value="-ooxml"/>
|
||||
<arg value="-ooxml"/>
|
||||
<arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
|
||||
<arg value="-test"/>
|
||||
<arg value="${ooxml.output.test.dir}"/>
|
||||
@ -1231,9 +1229,7 @@ under the License.
|
||||
failureproperty="excelant.test.failed">
|
||||
<classpath refid="test.excelant.classpath"/>
|
||||
<syspropertyset refid="junit.properties"/>
|
||||
<jvmarg value="${poi.test.locale}"/>
|
||||
<jvmarg value="-ea"/>
|
||||
<jvmarg value="-Dadditionaljar=${additionaljar}"/>
|
||||
<formatter type="plain"/>
|
||||
<formatter type="xml"/>
|
||||
<batchtest todir="${excelant.reports.test}">
|
||||
@ -1484,18 +1480,18 @@ under the License.
|
||||
|
||||
<target name="-do-jar-check-javadocs-package-list">
|
||||
<condition property="javadocs.package-list.present">
|
||||
<available file="build/tmp/site/build/site/apidocs/package-list"/>
|
||||
<available file="build/tmp/site/build/site/apidocs/package-list"/>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="-do-jar-create-javadocs-package-list"
|
||||
depends="-do-jar-check-javadocs-package-list"
|
||||
unless="javadocs.package-list.present">
|
||||
<antcall target="javadocs"/>
|
||||
depends="-do-jar-check-javadocs-package-list"
|
||||
unless="javadocs.package-list.present">
|
||||
<antcall target="javadocs"/>
|
||||
</target>
|
||||
|
||||
|
||||
<target name="jar-javadocs" description="JavaDocs for Maven" depends="compile,-manifest,-do-jar-create-javadocs-package-list">
|
||||
<target name="jar-javadocs" description="JavaDocs for Maven" depends="compile,-manifest,-do-jar-create-javadocs-package-list">
|
||||
<property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
|
||||
|
||||
<!-- Build and package the main javadocs -->
|
||||
@ -1515,7 +1511,7 @@ under the License.
|
||||
</antcall>
|
||||
</target>
|
||||
|
||||
<target name="-do-jar-javadocs">
|
||||
<target name="-do-jar-javadocs">
|
||||
<echo message="Building ${jarname} javadocs from ${srcfolder}" />
|
||||
<delete dir="${build.maven.javadocs}"/>
|
||||
<mkdir dir="${build.maven.javadocs}"/>
|
||||
@ -1721,99 +1717,99 @@ under the License.
|
||||
<fail><condition><matches pattern="[1-9][0-9]* Unknown Licens" string="${rat.reportcontent}"/></condition></fail>
|
||||
</target>
|
||||
|
||||
<target name="findbugs"><!-- depends="assemble" -->
|
||||
<target name="findbugs"><!-- depends="assemble" -->
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="http://prdownloads.sourceforge.net/findbugs/findbugs-noUpdateChecks-2.0.3.zip?download"/>
|
||||
<param name="destfile" value="${main.lib}/findbugs-noUpdateChecks-2.0.3.zip"/>
|
||||
</antcall>
|
||||
|
||||
<unzip src="${main.lib}/findbugs-noUpdateChecks-2.0.3.zip"
|
||||
dest="build/findbugs/lib">
|
||||
<patternset>
|
||||
<include name="findbugs-2.0.3/lib/**"/>
|
||||
</patternset>
|
||||
<mapper type="flatten"/>
|
||||
</unzip>
|
||||
<unzip src="${main.lib}/findbugs-noUpdateChecks-2.0.3.zip"
|
||||
dest="build/findbugs/lib">
|
||||
<patternset>
|
||||
<include name="findbugs-2.0.3/lib/**"/>
|
||||
</patternset>
|
||||
<mapper type="flatten"/>
|
||||
</unzip>
|
||||
|
||||
<property name="findbugs.home" value="build/findbugs" />
|
||||
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
|
||||
<classpath>
|
||||
<fileset dir="${findbugs.home}/lib">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<findbugs home="${findbugs.home}" output="html" outputFile="build/findbugs.html"
|
||||
excludeFilter="src/resources/devtools/findbugs-filters.xml">
|
||||
<fileset dir="${dist.dir}">
|
||||
<include name="poi-${version.id}-*.jar"/>
|
||||
<include name="poi-scratchpad-${version.id}-*.jar"/>
|
||||
<include name="poi-ooxml-${version.id}-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-sources-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-javadocs-*.jar"/>
|
||||
</fileset>
|
||||
<auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
|
||||
<auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
|
||||
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
|
||||
<auxClasspath path="lib/commons-codec-1.9.jar" />
|
||||
<auxClasspath path="lib/commons-logging-1.1.3.jar" />
|
||||
<auxClasspath path="lib/junit-4.12.jar" />
|
||||
<sourcePath path="src/java" />
|
||||
<sourcePath path="src/ooxml/java" />
|
||||
<sourcePath path="src/scratchpad/src" />
|
||||
</findbugs>
|
||||
<findbugs home="${findbugs.home}" output="xml" outputFile="build/findbugs.xml"
|
||||
excludeFilter="src/resources/devtools/findbugs-filters.xml">
|
||||
<fileset dir="${dist.dir}">
|
||||
<include name="poi-${version.id}-*.jar"/>
|
||||
<include name="poi-scratchpad-${version.id}-*.jar"/>
|
||||
<include name="poi-ooxml-${version.id}-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-sources-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-javadocs-*.jar"/>
|
||||
</fileset>
|
||||
<auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
|
||||
<auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
|
||||
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
|
||||
<auxClasspath path="lib/commons-codec-1.9.jar" />
|
||||
<auxClasspath path="lib/commons-logging-1.1.3.jar" />
|
||||
<auxClasspath path="lib/junit-4.12.jar" />
|
||||
<sourcePath path="src/java" />
|
||||
<sourcePath path="src/ooxml/java" />
|
||||
<sourcePath path="src/scratchpad/src" />
|
||||
</findbugs>
|
||||
</target>
|
||||
<property name="findbugs.home" value="build/findbugs" />
|
||||
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
|
||||
<classpath>
|
||||
<fileset dir="${findbugs.home}/lib">
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</classpath>
|
||||
</taskdef>
|
||||
<findbugs home="${findbugs.home}" output="html" outputFile="build/findbugs.html"
|
||||
excludeFilter="src/resources/devtools/findbugs-filters.xml">
|
||||
<fileset dir="${dist.dir}">
|
||||
<include name="poi-${version.id}-*.jar"/>
|
||||
<include name="poi-scratchpad-${version.id}-*.jar"/>
|
||||
<include name="poi-ooxml-${version.id}-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-sources-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-javadocs-*.jar"/>
|
||||
</fileset>
|
||||
<auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
|
||||
<auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
|
||||
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
|
||||
<auxClasspath path="lib/commons-codec-1.9.jar" />
|
||||
<auxClasspath path="lib/commons-logging-1.1.3.jar" />
|
||||
<auxClasspath path="lib/junit-4.12.jar" />
|
||||
<sourcePath path="src/java" />
|
||||
<sourcePath path="src/ooxml/java" />
|
||||
<sourcePath path="src/scratchpad/src" />
|
||||
</findbugs>
|
||||
<findbugs home="${findbugs.home}" output="xml" outputFile="build/findbugs.xml"
|
||||
excludeFilter="src/resources/devtools/findbugs-filters.xml">
|
||||
<fileset dir="${dist.dir}">
|
||||
<include name="poi-${version.id}-*.jar"/>
|
||||
<include name="poi-scratchpad-${version.id}-*.jar"/>
|
||||
<include name="poi-ooxml-${version.id}-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-sources-*.jar"/>
|
||||
<exclude name="poi-*${version.id}-javadocs-*.jar"/>
|
||||
</fileset>
|
||||
<auxClasspath path="${compile.lib}/bcpkix-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/bcprov-ext-jdk15on-1.51.jar" />
|
||||
<auxClasspath path="${compile.lib}/slf4j-api-1.7.7.jar" />
|
||||
<auxClasspath path="${compile.lib}/xmlsec-2.0.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" />
|
||||
<auxClasspath path="ooxml-lib/ooxml-security-1.0.jar" />
|
||||
<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
|
||||
<auxClasspath path="lib/commons-codec-1.9.jar" />
|
||||
<auxClasspath path="lib/commons-logging-1.1.3.jar" />
|
||||
<auxClasspath path="lib/junit-4.12.jar" />
|
||||
<sourcePath path="src/java" />
|
||||
<sourcePath path="src/ooxml/java" />
|
||||
<sourcePath path="src/scratchpad/src" />
|
||||
</findbugs>
|
||||
</target>
|
||||
|
||||
<target name="test-scratchpad-download-resources">
|
||||
<!-- disable font downloading until TestFontRendering works on all plattforms -->
|
||||
<!-- ... eventually copy the files into the resource dirs ... -->
|
||||
<!--
|
||||
<mkdir dir="build/scratchpad-test-resources"/>
|
||||
<target name="test-scratchpad-download-resources">
|
||||
<!-- disable font downloading until TestFontRendering works on all plattforms -->
|
||||
<!-- ... eventually copy the files into the resource dirs ... -->
|
||||
<!--
|
||||
<mkdir dir="build/scratchpad-test-resources"/>
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="http://sourceforge.net/projects/monafont/files/monafont/monafont-2.90/monafont-ttf-2.90.zip/download"/>
|
||||
<param name="destfile" value="build/scratchpad-test-resources/monafont-ttf-2.90.zip"/>
|
||||
</antcall>
|
||||
|
||||
<unzip src="build/scratchpad-test-resources/monafont-ttf-2.90.zip"
|
||||
dest="build/scratchpad-test-resources">
|
||||
<patternset>
|
||||
<include name="mona.ttf"/>
|
||||
</patternset>
|
||||
</unzip>
|
||||
<unzip src="build/scratchpad-test-resources/monafont-ttf-2.90.zip"
|
||||
dest="build/scratchpad-test-resources">
|
||||
<patternset>
|
||||
<include name="mona.ttf"/>
|
||||
</patternset>
|
||||
</unzip>
|
||||
|
||||
<antcall target="downloadfile">
|
||||
<param name="sourcefile" value="https://googlefontdirectory.googlecode.com/hg-history/c5955de4df3e40f6ab705bbccbd1f5ad93998287/cabin/Cabin-Regular.ttf"/>
|
||||
<param name="destfile" value="build/scratchpad-test-resources/Cabin-Regular.ttf"/>
|
||||
</antcall>
|
||||
-->
|
||||
</target>
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
Loading…
Reference in New Issue
Block a user