Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674348 via svnmerge from

https://svn.apache.org/repos/asf/poi/trunk

........
  r674348 | nick | 2008-07-06 22:16:05 +0100 (Sun, 06 Jul 2008) | 1 line
  
  Shuffle the HDGF chunks_parse_cmds.tbl off into resources where it more properly belongs, and correctly update the legal notice file to match
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@674349 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-07-06 21:19:17 +00:00
parent dcf1741253
commit 470f6800af
4 changed files with 23 additions and 10 deletions

View File

@ -90,6 +90,7 @@ under the License.
<property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/> <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/>
<!-- Scratchpad: --> <!-- Scratchpad: -->
<property name="scratchpad.resource1.dir" value="src/resources/scratchpad"/>
<property name="scratchpad.src" location="src/scratchpad/src"/> <property name="scratchpad.src" location="src/scratchpad/src"/>
<property name="scratchpad.src.test" location="src/scratchpad/testcases"/> <property name="scratchpad.src.test" location="src/scratchpad/testcases"/>
<property name="scratchpad.lib" location="src/scratchpad/lib"/> <property name="scratchpad.lib" location="src/scratchpad/lib"/>
@ -202,6 +203,7 @@ under the License.
<path id="scratchpad.classpath"> <path id="scratchpad.classpath">
<path refid="main.classpath"/> <path refid="main.classpath"/>
<pathelement location="${main.output.dir}"/> <pathelement location="${main.output.dir}"/>
<pathelement location="${scratchpad.resource1.dir}"/>
</path> </path>
<path id="contrib.classpath"> <path id="contrib.classpath">
@ -498,12 +500,9 @@ under the License.
</copy> </copy>
<!-- Copy HDGF Resources over --> <!-- Copy HDGF Resources over -->
<property name="hdgf.chunks" value="org/apache/poi/hdgf/chunks" /> <copy todir="${scratchpad.output.dir}">
<copy todir="${scratchpad.output.dir}/${hdgf.chunks}"> <fileset dir="${scratchpad.resource1.dir}"/>
<fileset dir="${scratchpad.src}/${hdgf.chunks}"> </copy>
<include name="*.tbl" />
</fileset>
</copy>
</target> </target>
<target name="compile-contrib" depends="init"> <target name="compile-contrib" depends="init">

View File

@ -11,8 +11,19 @@ Common Public License Version 1.0:
See http://www.junit.org/ See http://www.junit.org/
The Office Open XML experimental support had additional dependencies, A single resource file of the POI scratchpad component HDGF is taken from
with their own licensing: VSDump, and is under the GNU General Public Licence version 3 (GPL v3):
http://gplv3.fsf.org/
Since this is a data file, and has no compiled version (the original
file is distributed in both source and binary versions of POI), there should
be little difference in licencing requirements compared to the ASL.
For those wishing to avoid this component, the HDGF part of the POI
scratchpad should be omitted.
See http://www.gnome.ru/projects/vsdump_en.html
The Office Open XML support had additional dependencies, with their
own licensing:
* XML Beans - http://xmlbeans.apache.org/ * XML Beans - http://xmlbeans.apache.org/
Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0
* DOM4J - http://www.dom4j.org/ * DOM4J - http://www.dom4j.org/

View File

@ -41,9 +41,12 @@ public class ChunkFactory {
* Key is a Chunk's type, value is an array of its CommandDefinitions * Key is a Chunk's type, value is an array of its CommandDefinitions
*/ */
private Hashtable chunkCommandDefinitions = new Hashtable(); private Hashtable chunkCommandDefinitions = new Hashtable();
/** What the name is of the chunk table */ /**
* What the name is of the chunk table definitions file?
* This file comes from the scratchpad resources directory.
*/
private static String chunkTableName = private static String chunkTableName =
"/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl"; "/org/apache/poi/hdgf/chunks_parse_cmds.tbl";
/** For logging problems we spot with the file */ /** For logging problems we spot with the file */
private POILogger logger = POILogFactory.getLogger(ChunkFactory.class); private POILogger logger = POILogFactory.getLogger(ChunkFactory.class);