You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2009/10/15 22:25:34 UTC
svn commit: r825637 - in /poi/trunk: ./ legal/
src/ooxml/java/org/apache/poi/ooxml/ src/ooxml/testcases/
src/ooxml/testcases/org/apache/poi/ooxml/
Author: josh
Date: Thu Oct 15 20:25:34 2009
New Revision: 825637
URL: http://svn.apache.org/viewvc?rev=825637&view=rev
Log:
reverted Digital Signature stuff (r824836, r824963 r825294) in attempt to get gump build working
Removed:
poi/trunk/src/ooxml/java/org/apache/poi/ooxml/
poi/trunk/src/ooxml/testcases/hello-world-office-2010-technical-preview-unsigned.docx
poi/trunk/src/ooxml/testcases/hello-world-office-2010-technical-preview.docx
poi/trunk/src/ooxml/testcases/hello-world-signed-twice.docx
poi/trunk/src/ooxml/testcases/hello-world-signed.docx
poi/trunk/src/ooxml/testcases/hello-world-signed.pptx
poi/trunk/src/ooxml/testcases/hello-world-signed.xlsx
poi/trunk/src/ooxml/testcases/hello-world-unsigned.docx
poi/trunk/src/ooxml/testcases/hello-world-unsigned.pptx
poi/trunk/src/ooxml/testcases/hello-world-unsigned.xlsx
poi/trunk/src/ooxml/testcases/invalidsig.docx
poi/trunk/src/ooxml/testcases/org/apache/poi/ooxml/
Modified:
poi/trunk/build.xml
poi/trunk/legal/NOTICE
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=825637&r1=825636&r2=825637&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Oct 15 20:25:34 2009
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -30,7 +30,7 @@
Bruno Girin brunogirin@gmail.com
This build was tested with ant 1.6.2 although it will probably work with
- other versions. The following jar files should be available on the
+ other versions. The following jar files should be available on the
classpath when running ant:
LIBRARY LOCATION
@@ -44,7 +44,7 @@
To build the documentation you will need to install forrest and set
the FORREST_HOME environment variable. Forrest 0.5.1 required.
- Since POI 3.5 you will need JDK 1.5 or newer to build POI.
+ Since POI 3.5 you will need JDK 1.5 or newer to build POI.
Some people may find the tests hang when run through Ant. If this
happens to you, try giving Ant some more memory when you run it, eg:
@@ -123,7 +123,7 @@
<property name="ooxml.output.test.dir" location="build/ooxml-test-classes"/>
<property name="ooxml.testokfile" location="build/ooxml-testokfile.txt"/>
- <!-- The following jars are downloaded by the fetch-ooxml-jars task -->
+ <!-- The following jars are downloaded by the fetch-ooxml-jars task -->
<property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
<property name="ooxml.dom4j.url" value="${repository.m2}/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
<property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
@@ -132,19 +132,6 @@
<property name="ooxml.jsr173.url" value="${repository.m2}/maven2/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0/geronimo-stax-api_1.0_spec-1.0.jar"/>
<property name="ooxml.schemas.jar" location="${ooxml.lib}/ooxml-schemas-1.0.jar"/>
<property name="ooxml.schemas.url" value="${repository.m2}/maven2/org/apache/poi/ooxml-schemas/1.0/ooxml-schemas-1.0.jar"/>
- <property name="ooxml.commons-lang.jar" location="${ooxml.lib}/commons-lang-2.4.jar"/>
- <property name="ooxml.commons-lang.url" value="${repository.m2}/maven2/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
- <property name="ooxml.commons-io.jar" location="${ooxml.lib}/commons-io-1.4.jar"/>
- <property name="ooxml.commons-io.url" value="${repository.m2}/maven2/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <property name="ooxml.xmlsec.jar" location="${ooxml.lib}/xmlsec-1.4.3.jar"/>
- <property name="ooxml.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/1.4.3/xmlsec-1.4.3.jar"/>
- <property name="ooxml.xalan.jar" location="${ooxml.lib}/xalan-2.7.1.jar"/>
- <property name="ooxml.xalan.url" value="${repository.m2}/maven2/xalan/xalan/2.7.1/xalan-2.7.1.jar"/>
- <property name="ooxml.xalan-serializer.jar" location="${ooxml.lib}/serializer-2.7.1.jar"/>
- <property name="ooxml.xalan-serializer.url" value="${repository.m2}/maven2/xalan/serializer/2.7.1/serializer-2.7.1.jar"/>
- <!-- BouncyCastle is used only for OOXML Digital Signature tests -->
- <property name="ooxml.bcprov.jar" location="${ooxml.lib}/bcprov-jdk15-140.jar"/>
- <property name="ooxml.bcprov.url" value="${repository.m2}/maven2/bouncycastle/bcprov-jdk15/140/bcprov-jdk15-140.jar"/>
<!-- See http://www.ecma-international.org/publications/standards/Ecma-376.htm -->
<!-- "Copy these file(s), free of charge" -->
@@ -155,7 +142,7 @@
<property name="maven.ooxml.xsds.version.id" value="1.0"/>
<property name="maven.ooxml.xsds.jar" value="ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
-
+
<property name="build.site" location="build/tmp/site/build/site"/>
<property name="build.site.src" location="build/tmp/site"/>
<property name="junit.report.dir" location="${build.site}/junit"/>
@@ -173,12 +160,12 @@
<property name="jdk.version.source" value="1.5"
description="JDK version of source code"/>
<property name="jdk.version.class" value="1.5"
- description="JDK version of generated class files"/>
+ description="JDK version of generated class files"/>
<path id="main.classpath">
- <fileset dir="${main.lib}">
- <include name="*.jar"/>
- </fileset>
+ <fileset dir="${main.lib}">
+ <include name="*.jar"/>
+ </fileset>
<pathelement location="${main.resource1.dir}"/>
</path>
@@ -196,9 +183,6 @@
<pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${contrib.output.dir}"/>
<pathelement location="${contrib.output.test.dir}"/>
- <fileset dir="${ooxml.lib}">
- <include name="*.jar" />
- </fileset>
</path>
<path id="ooxml.classpath">
@@ -222,9 +206,8 @@
<pathelement location="${ooxml.output.dir}"/>
<pathelement location="${ooxml.output.test.dir}"/>
<pathelement location="${main.output.test.dir}"/> <!-- ooxml tests use some utilities from main tests -->
- <pathelement location="${scratchpad.output.test.dir}"/>
+ <pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
- <pathelement location="${ooxml.src.test}"/>
</path>
@@ -288,7 +271,7 @@
<available resource="clovertasks" property="clover.present"/>
<antcall target="with.clover"/>
-
+
<mkdir dir="build"/>
<mkdir dir="build/non-ant-classes"/>
<mkdir dir="${main.output.dir}"/>
@@ -368,12 +351,6 @@
<available file="${ooxml.xmlbeans.jar}"/>
<available file="${ooxml.jsr173.jar}"/>
<available file="${ooxml.schemas.jar}"/>
- <available file="${ooxml.commons-lang.jar}"/>
- <available file="${ooxml.commons-io.jar}"/>
- <available file="${ooxml.xmlsec.jar}"/>
- <available file="${ooxml.xalan.jar}"/>
- <available file="${ooxml.xalan-serializer.jar}"/>
- <available file="${ooxml.bcprov.jar}"/>
</and>
<isset property="disconnected"/>
</or>
@@ -396,30 +373,6 @@
<param name="sourcefile" value="${ooxml.schemas.url}"/>
<param name="destfile" value="${ooxml.schemas.jar}"/>
</antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.commons-lang.url}"/>
- <param name="destfile" value="${ooxml.commons-lang.jar}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.commons-io.url}"/>
- <param name="destfile" value="${ooxml.commons-io.jar}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.xmlsec.url}"/>
- <param name="destfile" value="${ooxml.xmlsec.jar}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.xalan.url}"/>
- <param name="destfile" value="${ooxml.xalan.jar}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.xalan-serializer.url}"/>
- <param name="destfile" value="${ooxml.xalan-serializer.jar}"/>
- </antcall>
- <antcall target="downloadfile">
- <param name="sourcefile" value="${ooxml.bcprov.url}"/>
- <param name="destfile" value="${ooxml.bcprov.jar}"/>
- </antcall>
</target>
<target name="check-ooxml-xsds">
@@ -475,7 +428,7 @@
</xmlbean>
</target>
- <target name="compile" depends="init, compile-main,
+ <target name="compile" depends="init, compile-main,
compile-scratchpad, compile-contrib, compile-examples, compile-scratchpad-examples"
description="Compiles the POI main classes, scratchpad, contrib, examples, and scratchpad examples"/>
@@ -598,7 +551,7 @@
<!-- Generate the .java file -->
<property name="version.java" value="${main.output.dir}/org/apache/poi/Version.java" />
<delete file="${version.java}" />
- <copy
+ <copy
file="src/resources/version/Version.java.template"
tofile="${version.java}">
<filterset>
@@ -631,9 +584,9 @@
<junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
failureproperty="main.test.failed" showoutput="true">
<classpath refid="test.classpath"/>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -662,9 +615,9 @@
<pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
</classpath>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
<batchtest todir="${main.reports.test}">
@@ -674,7 +627,7 @@
</fileset>
</batchtest>
</junit>
- </target>
+ </target>
@@ -688,9 +641,9 @@
<pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
</classpath>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
<formatter type="xml"/>
@@ -724,9 +677,9 @@
<pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
</classpath>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -755,9 +708,9 @@
<pathelement location="${scratchpad.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
</classpath>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
@@ -765,7 +718,7 @@
<test name="${testcase}"/>
</junit>
</target>
-
+
<target name="-test-contrib-check">
<uptodate property="contrib.test.notRequired" targetfile="${contrib.testokfile}">
<srcfiles dir="${contrib.src}"/>
@@ -782,8 +735,8 @@
<pathelement location="${contrib.output.test.dir}"/>
<pathelement location="${junit.jar1.dir}"/>
</classpath>
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -812,9 +765,9 @@
<target name="test-ooxml" depends="compile-main,compile-ooxml,-test-ooxml-check" unless="ooxml.test.notRequired">
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}" failureproperty="ooxml.test.failed">
<classpath refid="test.ooxml.classpath" />
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -836,9 +789,9 @@
<target name="single-test-ooxml" depends="-test-property-check,compile-main,compile-ooxml" description="Runs a single ooxml test case specified with -Dtestcase=classname">
<junit printsummary="yes" showoutput="true" filtertrace="no" haltonfailure="false" >
<classpath refid="test.ooxml.classpath" />
- <sysproperty key="user.language" value="en"/>
- <sysproperty key="user.country" value="US"/>
- <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
+ <sysproperty key="user.language" value="en"/>
+ <sysproperty key="user.country" value="US"/>
+ <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/>
<sysproperty key="java.awt.headless" value="true"/>
<formatter type="plain" usefile="no"/>
<formatter type="xml"/>
@@ -1087,7 +1040,7 @@
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+ </manifest>
</jar>
<jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar">
<fileset dir="${contrib.output.dir}" />
@@ -1100,7 +1053,7 @@
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+ </manifest>
</jar>
<jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar">
<fileset dir="${scratchpad.output.dir}" />
@@ -1113,7 +1066,7 @@
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+ </manifest>
</jar>
<jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar">
<fileset dir="${ooxml.output.dir}" />
@@ -1126,7 +1079,7 @@
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+ </manifest>
</jar>
</target>
<target name="jar-examples" depends="compile, compile-version" description="Creates a jar file of the examples, in case people want to use them as-is">
@@ -1141,7 +1094,7 @@
<attribute name="Implementation-Title" value="Apache POI"/>
<attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
<attribute name="Implementation-Vendor" value="Apache"/>
- </manifest>
+ </manifest>
</jar>
</target>
@@ -1244,7 +1197,7 @@
JDepend is not available. You must download JDepend from
<http://www.clarkware.com/software/JDepend.html> and include the
JAR file in your classpath.
- </echo>
+ </echo>
<fail message="JDepend is not available."/>
</target>
Modified: poi/trunk/legal/NOTICE
URL: http://svn.apache.org/viewvc/poi/trunk/legal/NOTICE?rev=825637&r1=825636&r2=825637&view=diff
==============================================================================
--- poi/trunk/legal/NOTICE (original)
+++ poi/trunk/legal/NOTICE Thu Oct 15 20:25:34 2009
@@ -19,6 +19,3 @@
This product contains the chunks_parse_cmds.tbl file from the vsdump program.
Copyright (C) 2006-2007 Valek Filippov (frob@df.ru)
-
-This product contains parts that were originally based on the eID Applet project
-(http://code.google.com/p/eid-applet/). Copyright (C) 2008-2009 FedICT.
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org