diff options
| -rw-r--r-- | build.xml | 11 | ||||
| -rw-r--r-- | legal/NOTICE | 15 | ||||
| -rw-r--r-- | src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl (renamed from src/scratchpad/src/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl) | 0 | ||||
| -rw-r--r-- | src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java | 7 |
4 files changed, 23 insertions, 10 deletions
@@ -90,6 +90,7 @@ under the License. <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/> <!-- Scratchpad: --> + <property name="scratchpad.resource1.dir" value="src/resources/scratchpad"/> <property name="scratchpad.src" location="src/scratchpad/src"/> <property name="scratchpad.src.test" location="src/scratchpad/testcases"/> <property name="scratchpad.lib" location="src/scratchpad/lib"/> @@ -202,6 +203,7 @@ under the License. <path id="scratchpad.classpath"> <path refid="main.classpath"/> <pathelement location="${main.output.dir}"/> + <pathelement location="${scratchpad.resource1.dir}"/> </path> <path id="contrib.classpath"> @@ -498,12 +500,9 @@ under the License. </copy> <!-- Copy HDGF Resources over --> - <property name="hdgf.chunks" value="org/apache/poi/hdgf/chunks" /> - <copy todir="${scratchpad.output.dir}/${hdgf.chunks}"> - <fileset dir="${scratchpad.src}/${hdgf.chunks}"> - <include name="*.tbl" /> - </fileset> - </copy> + <copy todir="${scratchpad.output.dir}"> + <fileset dir="${scratchpad.resource1.dir}"/> + </copy> </target> <target name="compile-contrib" depends="init"> diff --git a/legal/NOTICE b/legal/NOTICE index 848c767bc3..2c9f235691 100644 --- a/legal/NOTICE +++ b/legal/NOTICE @@ -11,8 +11,19 @@ Common Public License Version 1.0: See http://www.junit.org/ -The Office Open XML experimental support had additional dependencies, -with their own licensing: +A single resource file of the POI scratchpad component HDGF is taken from + 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/ Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 * DOM4J - http://www.dom4j.org/ diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl b/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl index 530e6c2281..530e6c2281 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl +++ b/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java index bb6f918d16..bb58933de8 100644 --- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java +++ b/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java @@ -41,9 +41,12 @@ public class ChunkFactory { * Key is a Chunk's type, value is an array of its CommandDefinitions */ 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 = - "/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 */ private POILogger logger = POILogFactory.getLogger(ChunkFactory.class); |