poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r674348 - in /poi/trunk: ./ legal/ src/resources/scratchpad/ src/resources/scratchpad/org/ src/resources/scratchpad/org/apache/ src/resources/scratchpad/org/apache/poi/ src/resources/scratchpad/org/apache/poi/hdgf/ src/scratchpad/src/org/ap...
Date Sun, 06 Jul 2008 21:16:05 GMT
Author: nick
Date: Sun Jul  6 14:16:05 2008
New Revision: 674348

URL: http://svn.apache.org/viewvc?rev=674348&view=rev
Log:
Shuffle the HDGF chunks_parse_cmds.tbl off into resources where it more properly belongs,
and correctly update the legal notice file to match

Added:
    poi/trunk/src/resources/scratchpad/
    poi/trunk/src/resources/scratchpad/org/
    poi/trunk/src/resources/scratchpad/org/apache/
    poi/trunk/src/resources/scratchpad/org/apache/poi/
    poi/trunk/src/resources/scratchpad/org/apache/poi/hdgf/
    poi/trunk/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
      - copied unchanged from r674337, poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl
Removed:
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/chunks_parse_cmds.tbl
Modified:
    poi/trunk/build.xml
    poi/trunk/legal/NOTICE
    poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=674348&r1=674347&r2=674348&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun Jul  6 14:16:05 2008
@@ -85,6 +85,7 @@
   <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"/>
@@ -152,6 +153,7 @@
     <path id="scratchpad.classpath">
         <path refid="main.classpath"/>
         <pathelement location="${main.output.dir}"/>
+        <pathelement location="${scratchpad.resource1.dir}"/>
     </path>
 
     <path id="contrib.classpath">
@@ -338,12 +340,9 @@
 	</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">

Modified: poi/trunk/legal/NOTICE
URL: http://svn.apache.org/viewvc/poi/trunk/legal/NOTICE?rev=674348&r1=674347&r2=674348&view=diff
==============================================================================
--- poi/trunk/legal/NOTICE (original)
+++ poi/trunk/legal/NOTICE Sun Jul  6 14:16:05 2008
@@ -11,6 +11,17 @@
 See http://www.junit.org/
 
 
+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 experimental support had additional dependencies,
 with their own licensing:
  * XML Beans - http://xmlbeans.apache.org/

Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java?rev=674348&r1=674347&r2=674348&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java Sun Jul  6 14:16:05
2008
@@ -41,9 +41,12 @@
 	 * 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);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message