move poi to top level

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_2_BRANCH@550311 13f79535-47bb-0310-9956-ffa450edef68

.classpath

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src/testcases"/>
-    <classpathentry kind="src" path="src/java"/>
-    <classpathentry kind="src" path="src/examples/src"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="lib" path="tools/cents/junit.cent/lib/junit-3.7.jar"/>
-    <classpathentry kind="lib" path="lib/core/commons-logging-1.0.jar"/>
-    <classpathentry kind="output" path="build"/>
-</classpath>

.cvsignore

@@ -1,4 +1,5 @@
 dist
+build
 scripts
 *.el
 *.ipr
@@ -7,4 +8,6 @@ scripts
 build.number
 log*.*
 *.log
-build
+.clover
+.classpath
+.project

.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>POI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

KEYS

@@ -0,0 +1,29 @@
+pub  1024D/12DAE9BE 2004-01-25 Glen Stampoultzis <glens@apache.org>
+sig 3       12DAE9BE 2004-01-25   Glen Stampoultzis <glens@apache.org>
+sub  1024g/2BBB28EA 2004-01-25
+sig         12DAE9BE 2004-01-25   Glen Stampoultzis <glens@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.2 (Cygwin)
+
+mQGiBEATU6gRBACo3iUkfku4/G2q8ldWFiiCekHK5oqx0U1N6fyO+Xgs+6V6btEZ
+drF2DUCyto6ig4FJT81L34HUQ6l9bPnpa4nNsl2EMBknY42LjmC55x7Q5rsQbiRj
++2JkoQJk2Jc3hneuh4Wsv49stOCDQMOV5BtjZs31t7rr+wuKPMkIw/Nf1wCgngI9
+ZWFyLxspoi9bL1/xBID18jsD/RxGBep4F8HwXEdHTeHnmjEuJSlYhmAKQ6Fd7bdb
+ex16a54Gsg7fVD0rIIsytzVUACQMi7V6tmE4Wf/XaY7+ma5w4gCsxUCIeujU4Y7i
+WUDwtlTkr2IudmoxSIDDpS12NPZqCP7PbU2RK+KwnnITjs80a+QlHYaO9te7HVcL
+F6YIA/9YZkYp5TpoMO1ISnlv0gXMcIaznbNMoRgeXZHvYyEvy014jArHmG41LVBj
+6TnBHFLQi4xA7Ql98oIgfszaRr/9GshvoL6Iu1x1SoV7dMrqFBC6e2JD9N/IgBtZ
+EGg7US3nIJnlCjJSIkXKfPJL4FyYWwt6IEZcF6Mi/USsyLA6wrQkR2xlbiBTdGFt
+cG91bHR6aXMgPGdsZW5zQGFwYWNoZS5vcmc+iFsEExECABsFAkATU6gGCwkIBwMC
+AxUCAwMWAgECHgECF4AACgkQONrI4hLa6b48RgCaAqQg0wtiOQ8jqX6S7tZi1OMg
+CQAAn2Ty1d/UdGLqlGkCPMkaB6otTMhZuQENBEATU6kQBADUbn5pT2D8vi64RU5E
+SeTn/rNzLglJ4nzoOfeIcHm7p3hppjT0Q1YbHvdOSaigYApzxoiSf+0Mt8NSCfDf
+B/wjfndHlrcdPkiJi4fBkQHihcuJtEgOkAwXfSJ+MUXG+fEgEuGdYm7tNV3n/eOY
+gn9Vzs/LofrQ7nY3+WkNOUia/wADBwQAnqZ4wPm0VY/fjCWJ34wvSfPk6Qg8m502
+MfHIGY/UZ+BY5DK3iQR8hrIu6FU0tn0qoF7PCNehOtd2cR9kA7I2gyfaVR8JY2Ek
+F18jungrNRrNuNx3rJeUD6ViQjC44K4vf6y8CkxmkHTmB9ZC2+uGdMeOdDvbck/u
+JA+XB2tykJWIRgQYEQIABgUCQBNTqQAKCRA42sjiEtrpvpy3AJ4trdVLGCzJwB2R
+Z/zxD3xBnTdY5QCeNUdw2VcsrzAF541sawFRxOmL3eY=
+=la1N
+-----END PGP PUBLIC KEY BLOCK-----

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

NOTICE

@@ -0,0 +1,3 @@
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+   

build.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 
 <!--
     POI Build System.  Written by:
@@ -6,7 +7,7 @@
         Glen Stampoultzis   glens at apache.org
 
 
-    This build was tested with and 1.5.3 although it will probably work with
+    This build was tested with ant 1.5.3 although it will probably work with
     other versions.  The following jar files should be installed
     into the ant lib directory:
 
@@ -15,6 +16,7 @@
     junit(3.8+)     http://www.ibiblio.org/maven/junit/jars/
     xerces          http://www.ibiblio.org/maven/xerces/jars/
     jdepend         http://www.ibiblio.org/maven/jdepend/jars/
+    xalan           http://www.ibiblio.org/maven/xalan/jars/
 
     The ant jar "optional.jar" should also be available otherwise the
     build will fail.
@@ -70,7 +72,12 @@
     <property name="contrib.jar2.url" value="${repository}/commons-collections/jars/commons-collections-2.1.jar"/>
     <property name="contrib.jar3.dir" value="${contrib.lib}/commons-lang-1.0-b1.jar"/>
     <property name="contrib.jar3.url" value="${repository}/commons-lang/jars/commons-lang-1.0-b1.jar"/>
+    <property name="contrib.jar4.dir" value="${contrib.lib}/xmlParserAPIs-2.2.1.jar"/>
+    <property name="contrib.jar4.url" value="${repository}/xerces/jars/xmlParserAPIs-2.2.1.jar"/>
+    <property name="contrib.jar5.dir" value="${contrib.lib}/xercesImpl-2.4.0.jar"/>
+    <property name="contrib.jar5.url" value="${repository}/xerces/jars/xercesImpl-2.4.0.jar"/>
     <property name="contrib.testokfile" value="build/contrib-testokfile.txt"/>
+    <property name="main.resource1.dir" value="src/resources/fontmetrics"/>
     <property name="junit.jar1.dir" value="${main.lib}/junit-3.8.1.jar"/>
     <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/>
     <property name="build.site" value="build/tmp/site/build/site"/>
@@ -82,12 +89,13 @@
     <property name="changelog.file" value="${build.site}/changelog.html"/>
     <property name="dist.dir" value="build/dist"/>
     <property name="jar.name" value="poi"/>
-    <property name="version.id" value="2.0-pre1"/>
+    <property name="version.id" value="2.5.1-final"/>
     <property name="halt.on.test.failure" value="true"/>
 
     <path id="main.classpath">
         <pathelement location="${main.jar1.dir}"/>
         <pathelement location="${main.jar2.dir}"/>
+        <pathelement location="${main.resource1.dir}"/>
     </path>
 
     <path id="scratchpad.classpath">
@@ -100,6 +108,8 @@
         <pathelement location="${contrib.jar1.dir}"/>
         <pathelement location="${contrib.jar2.dir}"/>
         <pathelement location="${contrib.jar3.dir}"/>
+        <pathelement location="${contrib.jar4.dir}"/>
+        <pathelement location="${contrib.jar5.dir}"/>
         <pathelement location="${main.output.dir}"/>
         <pathelement location="${main.output.test.dir}"/>
         <pathelement location="${scratchpad.output.dir}"/>
@@ -141,14 +151,19 @@
 
     <target name="check-jars">
         <condition property="jars.present">
+	    <or>
             <and>
                 <available file="${main.jar1.dir}"/>
                 <available file="${main.jar2.dir}"/>
                 <available file="${contrib.jar1.dir}"/>
                 <available file="${contrib.jar2.dir}"/>
               	<available file="${contrib.jar3.dir}"/>
+              	<available file="${contrib.jar4.dir}"/>
+              	<available file="${contrib.jar5.dir}"/>
                	<available file="${junit.jar1.dir}"/>
             </and>
+			<isset property="disconnected"/>
+	    </or>
         </condition>
     </target>
 
@@ -158,6 +173,8 @@
         <get src="${contrib.jar1.url}" dest="${contrib.jar1.dir}"/>
         <get src="${contrib.jar2.url}" dest="${contrib.jar2.dir}"/>
         <get src="${contrib.jar3.url}" dest="${contrib.jar3.dir}"/>
+        <get src="${contrib.jar4.url}" dest="${contrib.jar4.dir}"/>
+        <get src="${contrib.jar5.url}" dest="${contrib.jar5.dir}"/>
         <get src="${junit.jar1.url}" dest="${junit.jar1.dir}"/>
     </target>
 
@@ -166,6 +183,9 @@
     </target>
 
     <target name="compile-main" depends="init">
+        <copy todir="${main.output.dir}">
+            <fileset dir="${main.resource1.dir}"/>
+        </copy>
         <javac srcdir="${main.src}" destdir="${main.output.dir}" debug="on">
             <classpath refid="main.classpath"/>
         </javac>
@@ -214,17 +234,19 @@
         </uptodate>
     </target>
 
-    <target name="test-main" depends="compile-main,-test-main-check" unless="main.test.notRequired">
-        <junit printsummary="yes" showoutput="true" filtertrace="no" fork="no"
-            haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
-            <classpath>
+	<path id="test.classpath">
                 <path refid="main.classpath"/>
                 <pathelement location="${main.output.dir}"/>
                 <pathelement location="${main.output.test.dir}"/>
                 <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
+         </path>
+    <target name="test-main" depends="compile-main,-test-main-check" unless="main.test.notRequired">
+        <junit printsummary="yes" showoutput="true" filtertrace="no" fork="no"
+            haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
+            <classpath refid="test.classpath"/>
             <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
+            <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
             <batchtest todir="${main.reports.test}">
@@ -238,22 +260,37 @@
         <antcall target="-test-main-write-testfile"/>
     </target>
 
-    <target name="single-test" depends="compile-main">
-	<junit printsummary="no" showoutput="true" filtertrace="no" fork="no" haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed" >
-	<classpath>
-                <path refid="main.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${main.output.test.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
+    <target name="single-test" depends="-test-property-check,compile-main">
+	<junit printsummary="no" showoutput="true" filtertrace="no" haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed" >
+            <classpath refid="test.classpath"/>
 	    <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
+            <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain" usefile="no"/>
             <formatter type="xml"/>
 	    <test name="${testcase}" />
 	</junit>
     </target>
 
+    <target name="debug-test" depends="-test-property-check,compile-main">
+	<junit printsummary="no" showoutput="true" filtertrace="no" fork="yes" haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed" >
+	<jvmarg value="-Xdebug"/>
+	<jvmarg value="-Xrunjdwp:transport=dt_socket,address=5001,server=y,suspend=y"/>
+	<sysproperty key="java.compiler" value="NONE"/>
+            <sysproperty key="java.awt.headless" value="true"/>
+	<classpath refid="test.classpath"/>
+	    <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
+            <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
+            <formatter type="plain" usefile="no"/>
+	    <test name="${testcase}" />
+	</junit>
+    </target>
+
+    <target name="-test-property-check" unless="testcase">
+	<echo message="Please use -Dtestcase=org.your.testcase to run a single test"/>
+	<fail/>
+    </target>
+
     <target name="-test-main-write-testfile" unless="main.test.failed">
         <echo file="${main.testokfile}" append="false" message="testok"/>
     </target>
@@ -277,6 +314,7 @@
             <sysproperty key="HSSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
             <sysproperty key="HDF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
+            <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="xml"/>
             <batchtest todir="${scratchpad.reports.test}">
                 <fileset dir="${scratchpad.src.test}">
@@ -311,6 +349,7 @@
             </classpath>
             <sysproperty key="HSSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hpsf/data"/>
+            <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="xml"/>
             <batchtest todir="${contrib.reports.test}">
                 <fileset dir="${contrib.src.test}">
@@ -334,11 +373,10 @@
     </target>
 
     <target name="-check-forrest-installed" unless="env.FORREST_HOME">
-        <echo>
-            Please install apache forrest and set the
-            FORREST_HOME environment variable.
-        </echo>
-        <fail/>
+        <echo>Please install Apache Forrest (see
+&lt;http://xml.apache.org/forrest/index.html&gt;) and set the
+FORREST_HOME environment variable!</echo>
+        <fail message="Apache Forrest is not installed."/>
     </target>
 
     <!--    <target name="check-docs">-->
@@ -386,6 +424,18 @@
         </condition>
     </target>
 
+    <target name="-cvschangelog" unless="disconnected">
+        <cvschangelog destfile="${changelog.file}" daysinpast="30"/>
+
+	<style in="${changelog.file}"
+            out="${build.site.src}/src/documentation/content/changelog.html"
+            style="changelog.xsl">
+            <param name="title" expression="POI Change Log"/>
+            <param name="module" expression="jakarta-poi"/>
+            <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/>
+        </style>
+    </target>
+
     <target name="reports" depends="-check-reports" unless="reports.notRequired"
         description="Creates junit,jdepend and javadoc reports">
         <antcall target="test">
@@ -425,15 +475,7 @@
             out="${jdepend.report.out.dir}/index.html"
             style="jdepend.xsl"/>
 
-        <cvschangelog destfile="${changelog.file}" daysinpast="30"/>
-
-        <style in="${changelog.file}"
-            out="${build.site.src}/src/documentation/content/changelog.html"
-            style="changelog.xsl">
-            <param name="title" expression="POI Change Log"/>
-            <param name="module" expression="jakarta-poi"/>
-            <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/>
-        </style>
+	<antcall target="-cvschangelog"/>
 
         <javadoc
             destdir="${apidocs.report.dir}"
@@ -519,9 +561,45 @@
         description="generate the documentation and reports"/>
 
     <target name="jar" depends="compile" description="Creates jar files for distribution">
-        <jar basedir="${main.output.dir}" destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"/>
-        <jar basedir="${contrib.output.dir}" destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"/>
-        <jar basedir="${scratchpad.output.dir}" destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"/>
+        <jar basedir="${main.output.dir}" destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <section name="common">
+                  <attribute name="Specification-Title" value="Jakarta POI"/>
+                  <attribute name="Specification-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Specification-Vendor" value="Apache"/>
+                  <attribute name="Implementation-Title" value="Jakarta POI"/>
+                  <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Implementation-Vendor" value="Apache"/>
+                </section>
+            </manifest>
+        </jar>
+        <jar basedir="${contrib.output.dir}" destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <section name="common">
+                  <attribute name="Specification-Title" value="Jakarta POI"/>
+                  <attribute name="Specification-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Specification-Vendor" value="Apache"/>
+                  <attribute name="Implementation-Title" value="Jakarta POI"/>
+                  <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Implementation-Vendor" value="Apache"/>
+                </section>
+            </manifest>
+        </jar>
+        <jar basedir="${scratchpad.output.dir}" destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar">
+            <manifest>
+                <attribute name="Built-By" value="${user.name}"/>
+                <section name="common">
+                  <attribute name="Specification-Title" value="Jakarta POI"/>
+                  <attribute name="Specification-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Specification-Vendor" value="Apache"/>
+                  <attribute name="Implementation-Title" value="Jakarta POI"/>
+                  <attribute name="Implementation-Version" value="${version.id}-${DSTAMP}"/>
+                  <attribute name="Implementation-Vendor" value="Apache"/>
+                </section>
+            </manifest>
+        </jar>
     </target>
 
     <target name="dist" depends="compile,site,jar" description="Creates the entire distribution into build/dist">
@@ -547,9 +625,9 @@
 
         <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.tar.gz" compression="gzip">
             <tarfileset dir="${build.site}" prefix="docs"/>
-            <tarfileset file="${dist.dir}/${jar.name}-${version.id}.jar"/>
-            <tarfileset file="${dist.dir}/${jar.name}-contrib-${version.id}.jar"/>
-            <tarfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"/>
+            <tarfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"/>
             <tarfileset dir="legal" prefix="legal"/>
         </tar>
 
@@ -570,6 +648,6 @@
 
     <target name="clean-dist" depends="clean,dist" description="Cleans the build directory then creates a distribution"/>
 
-    <target name="gump" depends="jar"/>
+    <target name="gump" depends="jar,test"/>
 
 </project>

changelog.xsl

@@ -1,61 +1,24 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 
 <xsl:stylesheet
     xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
     version='1.0'>
 
 <!--
- The Apache Software License, Version 1.1
+   Copyright 2002-2004   Apache Software Foundation
 
- Copyright (c) 2003 The Apache Software Foundation.  All rights
- reserved.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+       http://www.apache.org/licenses/LICENSE-2.0
 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3. The end-user documentation included with the redistribution, if
-    any, must include the following acknowlegement:
-       "This product includes software developed by the
-        Apache Software Foundation (http://www.apache.org/)."
-    Alternately, this acknowlegement may appear in the software itself,
-    if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
-    Foundation" must not be used to endorse or promote products derived
-    from this software without prior written permission. For written
-    permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
-    nor may "Apache" appear in their names without prior written
-    permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation.  For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
  -->
   <xsl:param name="title"/>
   <xsl:param name="module"/>

jdepend.xsl

@@ -1,57 +1,21 @@
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <xsl:stylesheet	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
 <!--
- The Apache Software License, Version 1.1
+   Copyright 2002-2004   Apache Software Foundation
 
- Copyright (c) 2003 The Apache Software Foundation.  All rights
- reserved.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
+       http://www.apache.org/licenses/LICENSE-2.0
 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
   
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3. The end-user documentation included with the redistribution, if
-    any, must include the following acknowlegement:
-       "This product includes software developed by the
-        Apache Software Foundation (http://www.apache.org/)."
-    Alternately, this acknowlegement may appear in the software itself,
-    if and wherever such third-party acknowlegements normally appear.
-
- 4. The names "The Jakarta Project", "Ant", and "Apache Software
-    Foundation" must not be used to endorse or promote products derived
-    from this software without prior written permission. For written
-    permission, please contact apache@apache.org.
-
- 5. Products derived from this software may not be called "Apache"
-    nor may "Apache" appear in their names without prior written
-    permission of the Apache Group.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the Apache Software Foundation.  For more
- information on the Apache Software Foundation, please see
- <http://www.apache.org/>.
  -->
 
 <xsl:output method="html" indent="yes"/>

legal/LICENSE

@@ -1,53 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */

legal/LICENSE.apache

@@ -1,50 +0,0 @@
-/*
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
-    used to  endorse or promote  products derived from  this software without
-    prior written permission. For written permission, please contact
-    apache@apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
-*/

src/contrib/src/org/apache/poi/contrib/metrics/FontMetricsDumper.java

@@ -0,0 +1,81 @@
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.contrib.metrics;
+
+import java.awt.*;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+public class FontMetricsDumper
+{
+    public static void main( String[] args ) throws IOException
+    {
+
+        Properties props = new Properties();
+
+        Font[] allFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
+        for ( int i = 0; i < allFonts.length; i++ )
+        {
+            String fontName = allFonts[i].getFontName();
+
+            Font font = new Font(fontName, Font.BOLD, 10);
+            FontMetrics fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics(font);
+            int fontHeight = fontMetrics.getHeight();
+
+            props.setProperty("font." + fontName + ".height", fontHeight+"");
+            StringBuffer characters = new StringBuffer();
+            for (char c = 'a'; c <= 'z'; c++)
+            {
+                characters.append( c + ", " );
+            }
+            for (char c = 'A'; c <= 'Z'; c++)
+            {
+                characters.append( c + ", " );
+            }
+            for (char c = '0'; c <= '9'; c++)
+            {
+                characters.append( c + ", " );
+            }
+            StringBuffer widths = new StringBuffer();
+            for (char c = 'a'; c <= 'z'; c++)
+            {
+                widths.append( fontMetrics.getWidths()[c] + ", " );
+            }
+            for (char c = 'A'; c <= 'Z'; c++)
+            {
+                widths.append( fontMetrics.getWidths()[c] + ", " );
+            }
+            for (char c = '0'; c <= '9'; c++)
+            {
+                widths.append( fontMetrics.getWidths()[c] + ", " );
+            }
+            props.setProperty("font." + fontName + ".characters", characters.toString());
+            props.setProperty("font." + fontName + ".widths", widths.toString());
+        }
+
+        FileOutputStream fileOut = new FileOutputStream("font_metrics.properties");
+        try
+        {
+            props.store(fileOut, "Font Metrics");
+        }
+        finally
+        {
+            fileOut.close();
+        }
+    }
+}

src/contrib/src/org/apache/poi/contrib/poibrowser/Codec.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptor.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/DocumentDescriptorRenderer.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/ExtendableTreeCellRenderer.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/POIBrowser.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptor.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/PropertySetDescriptorRenderer.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/TreeReaderListener.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/Util.java

@@ -1,60 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.contrib.poibrowser;
 

src/contrib/src/org/apache/poi/contrib/poibrowser/package.html

@@ -1,4 +1,5 @@
 <!doctype html public "-//W3C//DTD HTML 4.0//EN//">
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 
 <html>
  <head>

src/contrib/src/org/apache/poi/hssf/contrib/view/SVBorder.java

@@ -1,3 +1,18 @@
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 package org.apache.poi.hssf.contrib.view;
 
 import java.awt.*;

src/contrib/src/org/apache/poi/hssf/contrib/view/SVFractionalFormat.java

@@ -1,57 +1,18 @@
-/*
- *  ====================================================================
- *  The Apache Software License, Version 1.1
- *
- *  Copyright (c) 2003 The Apache Software Foundation.  All rights
- *  reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *  2. Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in
- *  the documentation and/or other materials provided with the
- *  distribution.
- *
- *  3. The end-user documentation included with the redistribution,
- *  if any, must include the following acknowledgment:
- *  "This product includes software developed by the
- *  Apache Software Foundation (http://www.apache.org/)."
- *  Alternately, this acknowledgment may appear in the software itself,
- *  if and wherever such third-party acknowledgments normally appear.
- *
- *  4. The names "Apache" and "Apache Software Foundation" and
- *  "Apache POI" must not be used to endorse or promote products
- *  derived from this software without prior written permission. For
- *  written permission, please contact apache@apache.org.
- *
- *  5. Products derived from this software may not be called "Apache",
- *  "Apache POI", nor may "Apache" appear in their name, without
- *  prior written permission of the Apache Software Foundation.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- *  ====================================================================
- *
- *  This software consists of voluntary contributions made by many
- *  individuals on behalf of the Apache Software Foundation.  For more
- *  information on the Apache Software Foundation, please see
- *  <http://www.apache.org/>.
- */
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 
 package org.apache.poi.hssf.contrib.view;
 

src/contrib/src/org/apache/poi/hssf/contrib/view/SVRowHeader.java

@@ -1,56 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 
 package org.apache.poi.hssf.contrib.view;

src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellEditor.java

@@ -1,57 +1,19 @@
-/*
- *  ====================================================================
- *  The Apache Software License, Version 1.1
- *
- *  Copyright (c) 2003 The Apache Software Foundation.  All rights
- *  reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *  2. Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in
- *  the documentation and/or other materials provided with the
- *  distribution.
- *
- *  3. The end-user documentation included with the redistribution,
- *  if any, must include the following acknowledgment:
- *  "This product includes software developed by the
- *  Apache Software Foundation (http://www.apache.org/)."
- *  Alternately, this acknowledgment may appear in the software itself,
- *  if and wherever such third-party acknowledgments normally appear.
- *
- *  4. The names "Apache" and "Apache Software Foundation" and
- *  "Apache POI" must not be used to endorse or promote products
- *  derived from this software without prior written permission. For
- *  written permission, please contact apache@apache.org.
- *
- *  5. Products derived from this software may not be called "Apache",
- *  "Apache POI", nor may "Apache" appear in their name, without
- *  prior written permission of the Apache Software Foundation.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- *  ====================================================================
- *
- *  This software consists of voluntary contributions made by many
- *  individuals on behalf of the Apache Software Foundation.  For more
- *  information on the Apache Software Foundation, please see
- *  <http://www.apache.org/>.
- */
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
 package org.apache.poi.hssf.contrib.view;
 
 import java.awt.*;

src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellRenderer.java

@@ -1,57 +1,20 @@
 
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.hssf.contrib.view;
 

src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableModel.java

@@ -1,57 +1,20 @@
 
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 
 package org.apache.poi.hssf.contrib.view;

src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableUtils.java

@@ -1,57 +1,19 @@
-/*
- *  ====================================================================
- *  The Apache Software License, Version 1.1
- *
- *  Copyright (c) 2003 The Apache Software Foundation.  All rights
- *  reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *  2. Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in
- *  the documentation and/or other materials provided with the
- *  distribution.
- *
- *  3. The end-user documentation included with the redistribution,
- *  if any, must include the following acknowledgment:
- *  "This product includes software developed by the
- *  Apache Software Foundation (http://www.apache.org/)."
- *  Alternately, this acknowledgment may appear in the software itself,
- *  if and wherever such third-party acknowledgments normally appear.
- *
- *  4. The names "Apache" and "Apache Software Foundation" and
- *  "Apache POI" must not be used to endorse or promote products
- *  derived from this software without prior written permission. For
- *  written permission, please contact apache@apache.org.
- *
- *  5. Products derived from this software may not be called "Apache",
- *  "Apache POI", nor may "Apache" appear in their name, without
- *  prior written permission of the Apache Software Foundation.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- *  ====================================================================
- *
- *  This software consists of voluntary contributions made by many
- *  individuals on behalf of the Apache Software Foundation.  For more
- *  information on the Apache Software Foundation, please see
- *  <http://www.apache.org/>.
- */
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
 package org.apache.poi.hssf.contrib.view;
 
 import java.util.*;

src/contrib/src/org/apache/poi/hssf/contrib/view/SViewer.java

@@ -1,57 +1,20 @@
 
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 
 package org.apache.poi.hssf.contrib.view;

src/contrib/src/org/apache/poi/hssf/contrib/view/SViewerPanel.java

@@ -1,57 +1,20 @@
 
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 
 package org.apache.poi.hssf.contrib.view;

src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java

@@ -1,56 +1,20 @@
+
 /* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
 
 package org.apache.poi.hssf.usermodel.contrib;
 

src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFRegionUtil.java

@@ -1,63 +1,23 @@
+/* ====================================================================
+   Copyright 2003-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
 
-/*
- *  ====================================================================
- *  The Apache Software License, Version 1.1
- *
- *  Copyright (c) 2003 The Apache Software Foundation.  All rights
- *  reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *  1. Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *  2. Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in
- *  the documentation and/or other materials provided with the
- *  distribution.
- *
- *  3. The end-user documentation included with the redistribution,
- *  if any, must include the following acknowledgment:
- *  "This product includes software developed by the
- *  Apache Software Foundation (http://www.apache.org/)."
- *  Alternately, this acknowledgment may appear in the software itself,
- *  if and wherever such third-party acknowledgments normally appear.
- *
- *  4. The names "Apache" and "Apache Software Foundation" and
- *  "Apache POI" must not be used to endorse or promote products
- *  derived from this software without prior written permission. For
- *  written permission, please contact apache@apache.org.
- *
- *  5. Products derived from this software may not be called "Apache",
- *  "Apache POI", nor may "Apache" appear in their name, without
- *  prior written permission of the Apache Software Foundation.
- *
- *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- *  SUCH DAMAGE.
- *  ====================================================================
- *
- *  This software consists of voluntary contributions made by many
- *  individuals on behalf of the Apache Software Foundation.  For more
- *  information on the Apache Software Foundation, please see
- *  <http://www.apache.org/>.
- */
 package org.apache.poi.hssf.usermodel.contrib;
 
 import org.apache.log4j.Category;
 
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;

src/documentation/content/xdocs/3rdparty.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="Poi"
@@ -9,7 +10,7 @@
     <menu label="Community">
         <menu-item label="News" href="news.html"/>
         <menu-item label="Mirrors" href="mirrors.html"/>
-        <menu-item label="Changes" href="changes.html"/>
+        <menu-item label="Changes" href="site:changes"/>
         <menu-item label="To Do" href="todo.html"/>
         <menu-item label="Get Involved" href="getinvolved/index.html"/>
         <menu-item label="Mailing Lists" href="http://jakarta.apache.org/site/mail.html"/>
@@ -27,7 +28,7 @@
         <menu-item label="Overview" href="overview.html"/>
         <menu-item label="POIFS" href="poifs/index.html"/>
         <menu-item label="HSSF" href="hssf/index.html"/>
-        <menu-item label="HDF" href="hdf/index.html"/>
+        <menu-item label="HWPF" href="http://jakarta.apache.org/poi/hwpf/index.html"/>
         <menu-item label="HPSF" href="hpsf/index.html"/>
         <menu-item label="POI-Utils" href="utils/index.html"/>
         <menu-item label="Download" href="ext:download"/>

src/documentation/content/xdocs/casestudies.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/changes.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "./dtd/changes-v11.dtd">
-
-<changes>
-
-    <title>History of Changes</title>
-
-    <devs>
-        <!-- in strict alphabetical order -->
-        <person id="AO" name="Andrew C. Oliver" email="acoliver2@users.sourceforge.net"/>
-        <person id="GJS" name="Glen Stampoultzis" email="glens@apache.org"/>
-        <person id="MJ" name="Marc Johnson" email="mjohnson@apache.org"/>
-        <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
-        <person id="POI-DEVELOPERS" name="Poi Developers" email="poi-dev@jakarta.apache.org"/>
-    </devs>
-    <release version="2.0-pre1" date="unreleased">
-        <action dev="POI-DEVELOPERS" type="add">Patch applied for deep cloning of worksheets was provided</action>
-        <action dev="POI-DEVELOPERS" type="add">Patch applied to allow sheet reordering</action>
-        <action dev="POI-DEVELOPERS" type="add">Added additional print area setting methods using row/column numbers</action>
-        <action dev="POI-DEVELOPERS" type="fix">HDF:  Negative Array size fix</action>
-        <action dev="POI-DEVELOPERS" type="update">Added argument pointers to support the IF formula</action>
-        <action dev="POI-DEVELOPERS" type="update">Formulas: Added special character support for string literals, specifically for SUMIF formula support and addresses a bug as well</action>
-        <action dev="POI-DEVELOPERS" type="fix">BlockingInputStream committed to help ensure reads</action>
-        <action dev="POI-DEVELOPERS" type="fix">Fixed problem with NaN values differing from the investigated value from file reads in FormulaRecords</action>
-        <action dev="POI-DEVELOPERS" type="fix">Patch for getColumnWidth in HSSF</action>
-        <action dev="POI-DEVELOPERS" type="add">Patch for dealing with mult-level numbered lists in HDF</action>
-        <action dev="POI-DEVELOPERS" type="fix">Due to named reference work, several named-ranged bugs were closed</action>
-        <action dev="POI-DEVELOPERS" type="fix">Patch applied to prevent sheet corruption after a template modification</action>
-        <action dev="POI-DEVELOPERS" type="update">Shared Formulas now Supported</action>
-        <action dev="POI-DEVELOPERS" type="update">Added GreaterEqual, LessEqual and NotEqual to Formula Parser</action>
-        <action dev="POI-DEVELOPERS" type="update">Added GreaterThan and LessThan functionality to formulas</action>
-        <action dev="POI-DEVELOPERS" type="fix">Patches for i10n</action>
-        <action dev="POI-DEVELOPERS" type="update">POI Build System Updated</action>
-        <action dev="POI-DEVELOPERS" type="fix">font names can now be null</action>
-    </release>
-    <release version="1.10-dev" date="19 Feb 2003">
-        <action dev="POI-DEVELOPERS" type="add">Support for zoom level</action>
-        <action dev="POI-DEVELOPERS" type="add">Freeze and split pane support</action>
-        <action dev="POI-DEVELOPERS" type="add">Row and column headers on printouts</action>
-    </release>
-    <release version="1.8-dev" date="20 Sep 2002">
-        <action dev="POI-DEVELOPERS" type="add">Custom Data Format Support</action>
-        <action dev="POI-DEVELOPERS" type="add">Enhanced Unicode Support for Russian and Japanese</action>
-        <action dev="POI-DEVELOPERS" type="add">Enhanced formula support including read-only for
-            "optimized if" statements.</action>
-        <action dev="POI-DEVELOPERS" type="add">Support for cloning objects</action>
-        <action dev="POI-DEVELOPERS" type="add">Fixes for header/footer</action>
-        <action dev="POI-DEVELOPERS" type="add">Spanish Documentation translations</action>
-        <action dev="POI-DEVELOPERS" type="add">Support for preserving VBA macros</action>
-    </release>
-    <release version="1.7-dev" date="???">
-        <action dev="NKB" type="update">Removed runtime dependency on commons logging.</action>
-        <action dev="POI-DEVELOPERS" type="update">Formula support</action>
-    </release>
-    <release version="1.5.1" date="16 June 2002">
-        <action dev="GJS" type="update">Removed depedency on commons logging.  Now define poi.logging system property to enable logging to standard out.</action>
-        <action dev="GJS" type="fix">Fixed SST string handling so that spreadsheets with rich text or extended text will be read correctly.</action>
-    </release>
-    <release version="1.5" date="06 May 2002">
-        <action dev="NKB" type="update">New project build.</action>
-        <action dev="NKB" type="update">New project documentation system based on Cocoon.</action>
-        <action dev="POI-DEVELOPERS" type="update">Package rename</action>
-        <action dev="POI-DEVELOPERS" type="fix">Various bug fixes</action>
-        <action dev="POI-DEVELOPERS" type="add">Early stages of HSF development (not ready for development)</action>
-        <action dev="POI-DEVELOPERS" type="add">Initial low level record support for charting (not complete)</action>
-    </release>
-    <release version="1.1.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Created new event model</action>
-        <action dev="POI-DEVELOPERS">Optimizations made to HSSF including aggregate records for
-        values, rows, etc.</action>
-        <action dev="POI-DEVELOPERS">predictive sizing, offset based writing (instead of lots of
-        array copies)</action>
-        <action dev="POI-DEVELOPERS">minor re-factoring and bug fixes.</action>
-    </release>
-    <release version="1.0.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Minor documentation updates.</action>
-    </release>
-    <release version="0.14.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Added DataFormat helper class and exposed set and get format
-        on HSSFCellStyle</action>
-        <action dev="POI-DEVELOPERS">Fixed column width apis (unit wise) and various javadoc on
-        the subject</action>
-        <action dev="POI-DEVELOPERS">Fix for Dimensions record (again)... (one of these days I'll
-        write a unit test for this ;-p).</action>
-        <action dev="POI-DEVELOPERS">Some optimization on sheet creation.</action>
-    </release>
-    <release version="0.13.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Changes not recorded.</action>
-    </release>
-    <release version="0.12.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Added MulBlank, Blank, ColInfo</action>
-        <action dev="POI-DEVELOPERS">Added log4j facility and removed all sys.out type logging</action>
-        <action dev="POI-DEVELOPERS">Added support for adding font's, styles and corresponding
-        high level api for styling cells</action>
-        <action dev="POI-DEVELOPERS">added support for changing row height, cell width and default
-        row height/cell width.</action>
-        <action dev="POI-DEVELOPERS">Added fixes for internationalization (UTF-16 should work now
-        from HSSFCell.setStringValue, etc when the encoding is set)</action>
-        <action dev="POI-DEVELOPERS">added support for adding/removing and naming sheets.</action>
-    </release>
-    <release version="0.11.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Bugfix release. We were throwing an exception when reading
-        RKRecord objects.</action>
-    </release>
-    <release version="0.10.0" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Got continuation records to work (read/write)</action>
-        <action dev="POI-DEVELOPERS">Added various pre-support for formulas</action>
-        <action dev="POI-DEVELOPERS">Massive API reorganization, repackaging.</action>
-        <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
-        HSSF Output.</action>
-        <action dev="POI-DEVELOPERS">Better API support for modification.</action>
-    </release>
-    <release version="0.7 (and interim releases)" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Added encoding flag to high and low level api to use utf-16
-        when needed (HSSFCell.setEncoding())</action>
-        <action dev="POI-DEVELOPERS">added read only support for Label records (which are
-        reinterpreted as LabelSST when written)</action>
-        <action dev="POI-DEVELOPERS">Broken continuation record implementation (oops)</action>
-        <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
-        HSSF Output.</action>
-    </release>
-    <release version="0.6 (release)" date="Release date not recorded">
-        <action dev="POI-DEVELOPERS">Support for read/write and modify.</action>
-        <action dev="POI-DEVELOPERS">Read only support for MulRK records (converted to Number when
-        writing)
-        </action>
-    </release>
-
-</changes>

src/documentation/content/xdocs/faq.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "./dtd/faq-v11.dtd">
 
 <faqs title="Frequently Asked Questions">

src/documentation/content/xdocs/getinvolved/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="Poi" 

src/documentation/content/xdocs/getinvolved/branching.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/getinvolved/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hdf/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project"

src/documentation/content/xdocs/hdf/docoverview.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hdf/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/historyandfuture.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/howtobuild.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -46,6 +47,10 @@
                     <td>jdepend</td>
                     <td>http://www.ibiblio.org/maven/jdepend/jars/</td>
                 </tr>
+                <tr>
+                    <td>xalan</td>
+                    <td>http://www.ibiblio.org/maven/xalan/jars/</td>
+                </tr>
             </table>
             <p>
                 Just pick the latest versions of these jars and place

src/documentation/content/xdocs/hpsf/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 <!-- $Id$ -->
 <book software="POI Project" 

src/documentation/content/xdocs/hpsf/how-to.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
 "../dtd/document-v11.dtd">
 <!-- $Id$ -->

src/documentation/content/xdocs/hpsf/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 

src/documentation/content/xdocs/hpsf/internals.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 

src/documentation/content/xdocs/hpsf/thumbnails.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
 "../dtd/document-v11.dtd">
 <!-- $Id$ -->

src/documentation/content/xdocs/hpsf/todo.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <!-- $Id$ -->
 

src/documentation/content/xdocs/hssf/alternatives.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -16,7 +17,8 @@
             <p>
                 Maybe it's unwise to advertise your competitors but we believe
                 competition is good and we have the best support reading and
-                write Excel workbooks currently available.
+                write Excel workbooks currently available. This however does not
+ 				purport to be a complete list.
             </p>
             <table>
                 <tr>

src/documentation/content/xdocs/hssf/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project"

src/documentation/content/xdocs/hssf/chart.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -478,7 +479,7 @@
     recordid = 0x1034, size =0
     [END]
     [/END]
-
+                <!--  break -->
     ============================================
     Offset 0x1006 (4102)
     rectype = 0x1044, recsize = 0x4
@@ -801,6 +802,7 @@
              .crossesFarRight          = false
              .reversed                 = false
     [/CATSERRANGE]
+                <!--  break -->
 
     ============================================
     Offset 0x1124 (4388)
@@ -1220,7 +1222,7 @@
     [UNKNOWN RECORD]
         .id        = 104f
     [/UNKNOWN RECORD]
-
+                <!--  break -->
     ============================================
     Offset 0x12c4 (4804)
     rectype = 0x1051, recsize = 0x8

src/documentation/content/xdocs/hssf/diagram1.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hssf/diagrams.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hssf/formula.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -12,7 +13,7 @@
         <section><title>Introduction</title>
             <p>
                 This document describes the current state of formula support in POI. 
-                The information in this document applies to the 2.0-dev version of POI (i.e. CVS HEAD). 
+                The information in this document currently applies to the 2.0 version of POI. 
                 Since this area is a work in progress, this document will be updated with new features as and 
                 when they are added. 
             </p>
@@ -36,16 +37,14 @@
              <li>String, integer and floating point literals</li>
               <li>Area references</li>
               <li>Relative or absolute references</li>
-              <li>Arithmetic Operators</li>
-              <li>Sheet Functions</li>
+              <li>Arithmetic and logical operators</li>
+              <li>Sheet or Macro Functions (inlcuding logical functions)</li>
+              <li>Sheet References</li>
+              <li>Formual return values (number or string)</li>
         </ul>
         </section>
         <section><title>Partially supported</title>
             <ul>
-                <li>
-                   The formula parser now has the ability to parse formulas containing strings. However
-                   formulas that return a string value are not yet supported. 
-                   </li>
                 <li>Formula tokens in Excel are stored in one of three possible <em> classes </em>:
                     Reference, Value and Array. Based on the location of a token, its class can change
                     in complicated and undocumented ways. While we have support for most cases, we
@@ -60,8 +59,9 @@
         <section><title>Not yet supported</title>
             <ul>
                 <li>Array formulas</li>
-                <li>Formulas with logical operations (IF) </li>
-                    <li>Sheet References in formulas</li>
+                <li>Unary Operators</li>
+                <li>3D References</li>
+                <li>Error Values (cells containing #REF's or #VALUE's)</li>
                 <li>Everything else :) </li>
             </ul>
         </section>

src/documentation/content/xdocs/hssf/hacking-hssf.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hssf/how-to.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -11,23 +12,23 @@
         </authors>
     </header>
   <body>
-    <section><title>How to use the HSSF prototype API</title>
+    <section><title>How to use the HSSF API</title>
 
         <section><title>Capabilities</title>
             <p>This release of the how-to outlines functionality for the CVS HEAD.
             Those looking for information on previous releases should
             look in the documentation distributed with that release.</p>
             <p>
-              This release allows numeric and string cell values to be written to
-              or read from an XLS file as well as reading and writing dates. Also
+              HSSF allows numeric, string, date or formuala cell values to be written to
+              or read from an XLS file. Also
               in this release is row and column sizing, cell styling (bold,
               italics, borders,etc), and support for both built-in and user 
-	      defined data formats.  New
-              to this release is an event-based API for reading XLS files.
+	      defined data formats.  Also available is
+              an event-based API for reading XLS files.
               It differs greatly from the read/write API
               and is intended for intermediate developers who need a smaller
-              memory footprint.  It will also serve as the basis for the HSSF
-              Generator.</p>
+              memory footprint. 
+              </p>
         </section>
     <section><title>General Use</title>
         <section><title>User API</title>
@@ -474,25 +475,15 @@ yet. When it does something, we'll document it.</p>
      </section>
                 <section><title>What's Next?</title>
 
-<p>This release contains code that supports &quot;internationalization&quot;
-or more accurately non-US/UK languages; however, it has not been
-tested with the new API changes (please help us with this). We've
-shifted focus a bit for this release in recognition of the
-international support we've gotten. We're going to focus on western
-European languages for our first beta. We're more than happy to
-accept help in supporting non-Western European languages if someone
-who knows what they're doing in this area is willing to pitch in!
-(There is next to no documentation on what is necessary to support
-such a move and its really hard to support a language when you don't even
-know the alphabet).</p>
-<p>This release of HSSF does not yet support Formulas. I've been
-focusing on the requests I've gotten in. That being said, if we get
-more user feedback on what is most useful first we'll aim for that.
-As a general principal, HSSF's goal is to support HSSF-Serializer
-(meaning an emphasis on write). We would like to hear from you! How
-are you using HSSF/POIFS? How would you like to use it? What features
-are most important first?
-</p>
+<p>Further effort on HSSF is going to focus on the following major areas: </p>
+  <ul>
+  <li>Performance: A lot of work is going on in CVS and mailing lists for greatly improving the
+  memory efficiency of POI, as well as improving speed. Many approaches have been suggested, and a lot of code as been written.
+  It now needs a lot of testing and bugfixing. </li>
+  <li>Charts: This is a hard problem, with very little documentation.</li>
+  </ul>
+  <p><link href="../getinvolved/index.html"> So jump in! </link> </p>
+  
      </section>
 
 </section>

src/documentation/content/xdocs/hssf/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -24,22 +25,17 @@
         <li>a full usermodel api for creating, reading and modifying XLS files</li>
   </ul>
   <p>
-        Truth be told there is probably a better way to generate your spreadsheet
-        generation (yet you'll still be using HSSF indirectly).  At the time of
-        this writing we're in the process of moving the HSSF Serializer over to 
-        the <link href="http://xml.apache.org/cocoon">Apache Cocoon
-        Project</link>.  With Cocoon you can serialize any XML datasource (of
-        which might be a ESQL page outputting in SQL for instance) by simply 
+        An alternate way of generating a spreadsheet is via the <link href="http://cocoon.apache.org">Cocoon</link> serializer (yet you'll still be using HSSF indirectly). 
+        With Cocoon you can serialize any XML datasource (which might be a ESQL page outputting in SQL for instance) by simply 
          applying the stylesheet and designating the serializer.
   </p>
   <p>
         If you're merely reading spreadsheet data, then use the eventmodel api
-        in the org.apache.poi.hssf.eventmodel package.
+        in the org.apache.poi.hssf.eventusermodel package.
   </p>
   <p>
         If you're modifying spreadsheet data then use the usermodel api.  You
-        can also generate spreadsheets this way, but using Cocoon (which will do
-        it this way indirectly) is the best way...we promise.
+        can also generate spreadsheets this way.
   </p>
 
   </section>

src/documentation/content/xdocs/hssf/limitations.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>
@@ -9,7 +10,7 @@
         </authors>
     </header>
     <body>
-        <section><title>Version 1.5 limitations</title>
+        <section><title>Version 2.0 limitations</title>
             <p>
                 The intent of this document is to outline some of the known limitations of the
                 POI HSSF API's.  It is not intended to be complete list of every bug or missing
@@ -19,7 +20,7 @@
             <ul>
                 <li>
                     Charts<br/><br/>
-                    You can not currently create charts.  This is planned for the 2.0 release.  You can
+                    You can not currently create charts.  You can
                     however create a chart in Excel, modify the chart data values using HSSF and write
                     a new spreadsheet out.  This is possible because POI attempts to keep existing records
                     intact as far as possible.<br/><br/>
@@ -39,15 +40,13 @@
                 </li>
                 <li>
                     Macros<br/><br/>
-                    Macros can not be created.  The are currently no plans to support macros.  Reading
-                    workbooks containing macros is supported but attempting to write those workbooks
-                    will fail.  This is because macros are stored as extra file sytems within the
-                    compound document, and these are not currently kept when the file is rewritten.<br/><br/>
+                    Macros can not be created.  However, reading and re-writing files containing macros will
+					safely preserve the macros.<br/><br/>
                 </li>
                 <li>
                     Pivot Tables<br/><br/>
-                    Generating pivot tables is not supported.  Reading spreadsheets containing pivot tables
-                    has not been tested.
+                    Generating pivot tables is not supported. It has been reported that files containing pivot
+					tables can be read and re-written safely.
                 </li>
             </ul>
         </section>

src/documentation/content/xdocs/hssf/quick-guide.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>
     <header>
         <title>Busy Developers' Guide to HSSF Features</title>
         <authors>
-            <person email="glens@apache.org" name="Glen Stampoultzis" id="CO"/>
+            <person email="glens@apache.org" name="Glen Stampoultzis" id="GS"/>
         </authors>
     </header>
     <body>
@@ -31,7 +32,7 @@
                     <li><link href="#ReadWriteWorkbook">Reading and writing</link></li>
                     <li><link href="#NewLinesInCells">Use newlines in cells.</link></li>
                     <li><link href="#DataFormats">Create user defined data formats.</link></li>
-                    <li><link href="#PrintArea">Fit sheet to one page</link></li>
+                    <li><link href="#FitTo">Fit Sheet to One Page</link></li>
                     <li><link href="#PrintArea2">Set print area for a sheet.</link></li>		    
                     <li><link href="#FooterPageNumbers">Set page numbers on the footer of a sheet.</link></li>
                     <li><link href="#ShiftRows">Shift rows.</link></li>
@@ -40,6 +41,10 @@
                     <li><link href="#Splits">Create split and freeze panes.</link></li>
                     <li><link href="#Repeating">Repeating rows and columns.</link></li>
                     <li><link href="#HeaderFooter">Headers and Footers.</link></li>
+                    <li><link href="#DrawingShapes">Drawing Shapes.</link></li>
+                    <li><link href="#StylingShapes">Styling Shapes.</link></li>
+                    <li><link href="#Graphics2d">Shapes and Graphics2d.</link></li>
+                    <li><link href="#Outlining">Outlining.</link></li>
                 </ul>
             </section>
             <section><title>Features</title>
@@ -420,14 +425,14 @@
     fileOut.close();
                     </source>
                 </section>
-                <anchor id="PrintArea"/>
-                <section><title>Set Print Area to One Page</title>
+                <anchor id="FitTo"/>
+                <section><title>Fit Sheet to One Page</title>
                     <source>
     HSSFWorkbook wb = new HSSFWorkbook();
     HSSFSheet sheet = wb.createSheet("format sheet");
-    HSSFPrintSetup ps = sheet.getPrintSetup()
+    HSSFPrintSetup ps = sheet.getPrintSetup();
     
-    sheet.setAutobreaks(true)
+    sheet.setAutobreaks(true);
     
     ps.setFitHeight((short)1);
     ps.setFitWidth((short)1);
@@ -672,6 +677,7 @@
     fileOut.close();
                     </source>
                 </section>
+
                 <anchor id="HeaderFooter"/>
                 <section><title>Headers and Footers</title>
                     <p>
@@ -692,6 +698,247 @@
     fileOut.close();
                     </source>
                 </section>
+
+                <anchor id="DrawingShapes"/>
+                <section><title>Drawing Shapes</title>
+                    <p>
+                        POI supports drawing shapes using the Microsoft Office
+                        drawing tools.  Shapes on a sheet are organized in a
+                        hiearchy of groups and and shapes.  The top-most shape
+                        is the patriarch.  This is not visisble on the sheet
+                        at all.  To start drawing you need to call <code>createPatriarch</code>
+                        on the <code>HSSFSheet</code> class.  This has the
+                        effect erasing any other shape information stored
+                        in that sheet.  By default POI will leave shape
+                        records alone in the sheet unless you make a call to
+                        this method.
+                    </p>
+                    <p>
+                        To create a shape you have to go through the following
+                        steps:
+                    </p>
+                    <ol>
+                        <li>Create the patriarch.</li>
+                        <li>Create an anchor to position the shape on the sheet.</li>
+                        <li>Ask the patriarch to create the shape.</li>
+                        <li>Set the shape type (line, oval, rectangle etc...)</li>
+                        <li>Set any other style details converning the shape. (eg:
+                        line thickness, etc...)</li>
+                    </ol>
+                    <source>
+    HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
+    a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 0, (short) 1, 0 );
+    HSSFSimpleShape shape1 = patriarch.createSimpleShape(a1);
+    shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
+                    </source>
+                    <p>
+                        Text boxes are created using a different call:
+                    </p>
+                    <source>
+    HSSFTextbox textbox1 = patriarch.createTextbox(
+            new HSSFClientAnchor(0,0,0,0,(short)1,1,(short)2,2));
+    textbox1.setString(new HSSFRichTextString("This is a test") );
+                    </source>
+                    <p>
+                        It's possible to use different fonts to style parts of
+                        the text in the textbox.  Here's how:
+                    </p>
+                    <source>
+    HSSFFont font = wb.createFont();
+    font.setItalic(true);
+    font.setUnderline(HSSFFont.U_DOUBLE);
+    HSSFRichTextString string = new HSSFRichTextString("Woo!!!");
+    string.applyFont(2,5,font);
+    textbox.setString(string );
+                    </source>
+                    <p>
+                        Just as can be done manually using Excel, it is possible
+                        to group shapes together.  This is done by calling
+                        <code>createGroup()</code> and then creating the shapes
+                        using those groups.
+                    </p>
+                    <p>
+                        It's also possible to create groups within groups.
+                    </p>
+                    <warning>Any group you create should contain at least two
+                        other shapes or subgroups.</warning>
+                    <p>
+                        Here's how to create a shape group:
+                    </p>
+                    <source>
+    // Create a shape group.
+    HSSFShapeGroup group = patriarch.createGroup(
+            new HSSFClientAnchor(0,0,900,200,(short)2,2,(short)2,2));
+
+    // Create a couple of lines in the group.
+    HSSFSimpleShape shape1 = group.createShape(new HSSFChildAnchor(3,3,500,500));
+    shape1.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
+    ( (HSSFChildAnchor) shape1.getAnchor() ).setAnchor((short)3,3,500,500);
+    HSSFSimpleShape shape2 = group.createShape(new HSSFChildAnchor((short)1,200,400,600));
+    shape2.setShapeType(HSSFSimpleShape.OBJECT_TYPE_LINE);
+                    </source>
+                    <p>
+                        If you're being observant you'll noticed that the shapes
+                        that are added to the group use a new type of anchor:
+                        the <code>HSSFChildAnchor</code>.  What happens is that
+                        the created group has it's own coordinate space for
+                        shapes that are placed into it.  POI defaults this to
+                        (0,0,1023,255) but you are able to change it as desired.
+                        Here's how:
+                    </p>
+                    <source>
+    myGroup.setCoordinates(10,10,20,20); // top-left, bottom-right
+                    </source>
+                    <p>
+                        If you create a group within a group it's also going
+                        to have it's own coordinate space.
+                    </p>
+                </section>
+
+                <anchor id="StylingShapes"/>
+                <section><title>Styling Shapes</title>
+                    <p>
+                        By default shapes can look a little plain.  It's possible
+                        to apply different styles to the shapes however.  The
+                        sorts of things that can currently be done are:
+                    </p>
+                    <ul>
+                        <li>Change the fill color.</li>
+                        <li>Make a shape with no fill color.</li>
+                        <li>Change the thickness of the lines.</li>
+                        <li>Change the style of the lines. Eg: dashed, dotted.</li>
+                        <li>Change the line color.</li>
+                    </ul>
+                    <p>
+                        Here's an examples of how this is done:
+                    </p>
+                    <source>
+    HSSFSimpleShape s = patriarch.createSimpleShape(a);
+    s.setShapeType(HSSFSimpleShape.OBJECT_TYPE_OVAL);
+    s.setLineStyleColor(10,10,10);
+    s.setFillColor(90,10,200);
+    s.setLineWidth(HSSFShape.LINEWIDTH_ONE_PT * 3);
+    s.setLineStyle(HSSFShape.LINESTYLE_DOTSYS);
+                    </source>
+                </section>
+                <anchor id="Graphics2d"/>
+                <section><title>Shapes and Graphics2d</title>
+                    <p>
+                        While the native POI shape drawing commands are the
+                        recommended way to draw shapes in a shape it's sometimes
+                        desirable to use a standard API for compatibility with
+                        external libraries.  With this in mind we created some
+                        wrappers for <code>Graphics</code> and <code>Graphics2d</code>.
+                    </p>
+                    <warning>
+                        It's important to not however before continuing that
+                        <code>Graphics2d</code> is a poor match to the capabilities
+                        of the Microsoft Office drawing commands.  The older
+                        <code>Graphics</code> class offers a closer match but is
+                        still a square peg in a round hole.
+                    </warning>
+                    <p>
+                        All Graphics commands are issued into an <code>HSSFShapeGroup</code>.
+                        Here's how it's done:
+                    </p>
+                    <source>
+    a = new HSSFClientAnchor( 0, 0, 1023, 255, (short) 1, 0, (short) 1, 0 );
+    group = patriarch.createGroup( a );
+    group.setCoordinates( 0, 0, 80 * 4 , 12 * 23  );
+    float verticalPointsPerPixel = a.getAnchorHeightInPoints(sheet) / (float)Math.abs(group.getY2() - group.getY1());
+    g = new EscherGraphics( group, wb, Color.black, verticalPointsPerPixel );
+    g2d = new EscherGraphics2d( g );
+    drawChemicalStructure( g2d );
+                    </source>
+                    <p>
+                        The first thing we do is create the group and set it's coordinates
+                        to match what we plan to draw.  Next we calculate a reasonable
+                        fontSizeMultipler then create the EscherGraphics object.
+                        Since what we really want is a <code>Graphics2d</code>
+                        object we create an EscherGraphics2d object and pass in
+                        the graphics object we created.  Finally we call a routine
+                        that draws into the EscherGraphics2d object.
+                    </p>
+                    <p>
+                        The vertical points per pixel deserves some more explanation.
+                        One of the difficulties in converting Graphics calls
+                        into escher drawing calls is that Excel does not have
+                        the concept of absolute pixel positions.  It measures
+                        it's cell widths in 'characters' and the cell heights in points.
+                        Unfortunately it's not defined exactly what type of character it's
+                        measuring.  Presumably this is due to the fact that the Excel will be
+                        using different fonts on different platforms or even within the same
+                        platform.
+                    </p>
+                    <p>
+                        Because of this constraint we've had to implement the concept of a
+                        verticalPointsPerPixel.  This the amount the font should be scaled by when
+                        you issue commands such as drawString().  To calculate this value
+                        use the follow formula:
+                    </p>
+                    <source>
+    multipler = groupHeightInPoints / heightOfGroup
+                    </source>
+                    <p>
+                        The height of the group is calculated fairly simply by calculating the
+                        difference between the y coordinates of the bounding box of the shape.  The
+                        height of the group can be calculated by using a convenience called
+                        <code>HSSFClientAnchor.getAnchorHeightInPoints()</code>.
+                    </p>
+                    <p>
+                        Many of the functions supported by the graphics classes
+                        are not complete.  Here's some of the functions that are known
+                        to work.
+                    </p>
+                    <ul>
+                        <li>fillRect()</li>
+                        <li>fillOval()</li>
+                        <li>drawString()</li>
+                        <li>drawOval()</li>
+                        <li>drawLine()</li>
+                        <li>clearRect()</li>
+                    </ul>
+                    <p>
+                        Functions that are not supported will return and log a message
+                        using the POI logging infrastructure (disabled by default).
+                    </p>
+                </section>
+                <anchor id="Outlining"/>
+                <section>
+                    <title>Outlining</title>
+                    <p>
+                        Outlines are great for grouping sections of information
+                        together and can be added easily to columns and rows
+                        using the POI API.  Here's how:
+                    </p>
+                    <source>
+    HSSFWorkbook wb = new HSSFWorkbook();
+    HSSFSheet sheet1 = wb.createSheet("new sheet");
+
+    sheet1.groupRow( 5, 14 );
+    sheet1.groupRow( 7, 14 );
+    sheet1.groupRow( 16, 19 );
+
+    sheet1.groupColumn( (short)4, (short)7 );
+    sheet1.groupColumn( (short)9, (short)12 );
+    sheet1.groupColumn( (short)10, (short)11 );
+
+    FileOutputStream fileOut = new FileOutputStream(filename);
+    wb.write(fileOut);
+    fileOut.close();
+                    </source>
+                    <p>
+                        To collapse (or expand) an outline use the following calls:
+                    </p>
+                    <source>
+    sheet1.setRowGroupCollapsed( 7, true );
+    sheet1.setColumnGroupCollapsed( (short)4, true );
+                    </source>
+                    <p>
+                        The row/column you choose should contain an already
+                        created group.  It can be anywhere within the group.
+                    </p>
+                </section>
             </section>
         </section>
     </body>

src/documentation/content/xdocs/hssf/record-generator.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/hssf/use-case.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd"> 
      
 <document>

src/documentation/content/xdocs/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
@@ -6,7 +7,8 @@
     <title>Welcome to POI</title>
     <authors>
       <person id="AO" name="Andrew C. Oliver" email="acoliver@apache.org"/>
-      <person id="GJS" name="Glen Stampoultzis" email="glens@apache.org"/>
+      <person id="GJS" name="Glen Stampoultzis" email="poi-user@jakarta.apache.org"/>
+      <person id="AS" name="Avik Sengupta" email="poi-user@jakarta.apache.org"/>
     </authors>
   </header>
 
@@ -18,16 +20,20 @@
     <section><title>Purpose</title>
       <p>
       The POI project consists of APIs for manipulating various file formats
-      based upon Microsoft's OLE 2 Compound Document format using pure Java.
+      based upon Microsoft's OLE 2 Compound Document format using pure Java.  In short, you can
+      read and write MS Excel files using Java.  Soon, you'll be able to read and write 
+      Word files using Java.  POI is your Java Excel solution as well as your Word Excel solution.
+      However, we have a complete API for porting other OLE 2 Compound Document formats and welcome
+      others to participate.
       </p>
       <p>
       OLE 2 Compound Document Format based files include most Microsoft Office
-      files such as XLS and DOC.
+      files such as XLS and DOC as well as MFC serialization API based file formats.
       </p>
       <p>
          As a general policy we try to collaborate as much as possible with other projects to
          provide this functionality.  Examples include: <link href="http://xml.apache.org/cocoon">Cocoon</link> for
-         which you'll soon find generators and serializers for our projects;
+         which there are serializers for HSSF;
          <link href="http://www.openoffice.org">Open Office.org</link> with whom we collaborate in documenting the
          XLS format; and <link href="http://jakarta.apache.org/lucene">Lucene</link> for which we'll soon have file
          format interpretors.  When practical, we donate components directly to those projects for POI-enabling them.
@@ -41,12 +47,12 @@
         </p>
         <p>
 		You'd use POIFS if you had a document written in OLE 2 Compound Document Format, probably written using
-		MFC, that you needed to read in Java. Alternatively, you'd use POI to write OLE 2 Compound Document Format
+		MFC, that you needed to read in Java. Alternatively, you'd use POIFS to write OLE 2 Compound Document Format
 		if you needed to inter-operate with software running on the Windows platform. We are not just bragging when
 		we say that POIFS is the most complete and correct port of this file format to date!
         </p>
         <p>
-		You'd use HSSF if you needed to read or write an XLS (Excel) file using Java. You can also read and modify
+		You'd use HSSF if you needed to read or write an Excel file using Java (XLS). You can also read and modify
 		spreadsheets using this API, although right now writing is more mature.
         </p>
       </section>
@@ -88,10 +94,10 @@
              <p>HSSF is our port of the Microsoft Excel 97(-2002) file format (BIFF8) to pure Java.  It supports read and write
              capability.  Please see <link href="./hssf/index.html">the HSSF project page</link> for more information.</p>
         </section>
-        <section><title>HDF (Horrible Document Format)</title>
-             <p>HDF is our port of the Microsoft Word 97 file format to pure Java.  It supports read and write capability.
-             Please see <link href="./hdf/index.html">the HDF project page for more information</link>.  This component is
-             in the early stages of design.  Jump in!</p>
+        <section><title>HWPF</title>
+                <p>HWPF is our port of the Microsoft Word 97 file format to pure Java.  It supports read and write capability.
+                Please see <link href="http://jakarta.apache.org/poi/hwpf/index.html">the HWPF project page for more information</link>.  This component is
+                in the early stages of development.It can already read and write simple files.  Jump in!. (Please note that the HWPF codebase is NOT included in the 2.0 releases. Please use CVS to access this code.) </p>
            </section>
         <section><title>HPSF (Horrible Property Set Format)</title>
 	<p>HPSF is our port of the OLE 2 property set format to pure

src/documentation/content/xdocs/mirrors.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/news.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/news/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project" 

src/documentation/content/xdocs/news/logocontest.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/overview.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/patches.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 <!-- Is this being used? -->
 

src/documentation/content/xdocs/plan/POI10Vision.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/plan/POI20Vision.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/plan/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project" 

src/documentation/content/xdocs/plan/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/plan/release.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/poifs/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project" 

src/documentation/content/xdocs/poifs/fileformat.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>

src/documentation/content/xdocs/poifs/how-to.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>

src/documentation/content/xdocs/poifs/html/POIFSDesignDocument.html

@@ -1,3 +1,4 @@
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <HTML>
     <HEAD>
         <TITLE>POIFS Design Document</TITLE>

src/documentation/content/xdocs/poifs/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>

src/documentation/content/xdocs/poifs/usecases.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 <document>
   <header>

src/documentation/content/xdocs/references/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="Poi" 

src/documentation/content/xdocs/references/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/resolutions/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "../dtd/book-cocoon-v10.dtd">
 
 <book software="Poi Project" 

src/documentation/content/xdocs/resolutions/index.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/resolutions/res001.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "../dtd/document-v11.dtd">
 
 <document>

src/documentation/content/xdocs/site.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 
 <!--
 Forrest site.xml
@@ -16,6 +17,7 @@ See http://xml.apache.org/forrest/linking.html for more info
 
 <site label="POI" href="" xmlns="http://apache.org/forrest/linkmap/1.0">
 
+
     <external-refs>
         <xml.apache.org href="http://xml.apache.org/">
             <forrest href="forrest/">
@@ -32,6 +34,7 @@ See http://xml.apache.org/forrest/linking.html for more info
         <jdepend href="jdepend/index.html"/>
         <javadoc href="apidocs/index.html"/>
         <download href="http://jakarta.apache.org/builds/jakarta-poi/"/>
+        <changes href="changes.html"/>
     </external-refs>
 
 </site>

src/documentation/content/xdocs/status.xml

@@ -1,18 +1,218 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <status>
-    <devs>
+    <developers>
         <!-- in strict alphabetical order -->
         <person id="AO" name="Andrew C. Oliver" email="acoliver2@users.sourceforge.net"/>
         <person id="GS" name="Glen Stampoultzis" email="gstamp@iprimus.com.au"/>
         <person id="MJ" name="Marc Johnson" email="mjohnson at apache dot org"/>
         <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
         <person id="open" name="Poi Developers" email="poi-dev@jakarta.apache.org"/>
-    </devs>
+    </developers>
+
+    <changes>
+
+        <release version="2.5.1-FINAL" date="29 Feburary 2004">
+            <action dev="POI-DEVELOPERS" type="add" context="All">Outlining support</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">27574 - [PATCH] HSSFDateUtil.getExcelDate() is one hour off when DST changes</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">26465 - [PATCH] wrong lastrow entry</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">28203 - [PATCH] Unable to open read-write excel file including forms</action>
+        </release>
+ 
+        <release version="2.5-FINAL" date="29 Feburary 2004">
+            <action dev="POI-DEVELOPERS" type="add" context="All">Add support for the Escher file format</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">27005 java.lang.IndexOutOfBoundsException during Workbook.cloneSheet()</action>
+        </release>
+
+        <release version="2.0-FINAL" date="26 Janurary 2004">
+            <action dev="POI-DEVELOPERS" type="update" context="All">No changes</action>
+        </release>
+
+        <release version="2.0-RC2" date="11 Janurary 2004">
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Bug 25695 - HSSFCell.getStringCellValue() on cell which has string formula will return swap bye unicode characters.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Updated website for upcoming release</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Formula Parser fixes with tests, by Peter M Murray Bug 25457</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Fixed cloning merge regions</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">The cloned reference for merged cells did not create a new collection, so deletes cascaded to the original.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Fix to 24519 call to getCustomPalette() from a newly created workbook now works</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Fix supplied for bug 24397 where some compilation got ambiguous classes.  Explicitly imports the classes.  Patch supplied by Jean-Pierre Paris.</action>
+        </release>
+
+        <release verion="2.0-RC1" date="2 November 2003">
+            <action dev="POI-DEVELOPERS" type="fix" context="All">12561 (Min)	HSSFWorkbook throws Exceptions</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">12730 (Nor)	values dont get copied to another sheet.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">13224 (Maj)	Exception thrown when cell has =Names call</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">13796 (Nor)	Error Reading Formula Record (optimized if, external link)</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">13921 (Nor)	Sheet name cannot exceed 31 characters and cannot contain :</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">14330 (Nor)	Error reading FormulaRecord</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">14460 (Nor)	Name in Formula - ArrayOutOfBoundsException</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">15228 (Cri)	[Urgent] ArrayIndexoutofbounds Exception. POI - Version 1.8</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">16488 (Maj)	Unable to open written spreadsheet in Excel, but can in Open</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">16559 (Nor)	testCustomPalette.xls crashes Excel 97</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">16560 (Nor)	testBoolErr.xls crashes Excel '97</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">17374 (Min)	HSSFFont - BOLDWEIGHT_NORMAL</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">18800 (Maj)	The sheet made by HSSFWorkbook#cloneSheet() doesn't work cor</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">18846 (Min)	[PATCH][RFE]Refactor the transformation between byte array a</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">19599 (Min)	java.lang.IllegalArgumentException</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">19961 (Nor)	[PATCH] Sheet.getColumnWidth() returns wrong value</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21066 (Blo)	Can not modify a blank spreadsheet</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21444 (Enh)	[PATCH] Macro functions</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21447 (Nor)	[RFE]String Formula Cells</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21674 (Enh)	[PATCH] Documentation changes for @(Greater|Less|Not)EqualPt</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21863 (Enh)	[PATCH] build.xml fixes</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">22195 (Nor)	[RFE] [PATCH] Support for Storage Class ID</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">22742 (Cri)	Failed to create HSSFWorkbook!</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">22922 (Cri)	HSSFSheet.shiftRows() throws java.lang.IndexOutOfBoundsExcep</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">22963 (Nor)	org.apache.poi.hpsf.SummaryInformation.getEditTime() should</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">24149 (Maj)	Error passing inputstream to POIFSFileSystem</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">21722 (Nor)	[PATCH] Add a ProtectRecord to Sheets and give control over</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">9576  (Nor) 	[PATCH] DBCELL, INDEX EXTSST (was Acess 97 import)</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">13478 (Blo)	[PATCH] [RFE] POIFS, RawDataBlock: Missing workaround for lo</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">14824 (Nor)	Unable to modify empty sheets</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">12843 (Cri)	[PATCH] Make POI handle chinese better</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">15353 (Nor)	[RFE] creating a cell with a hyperlink</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">15375 (Blo)	Post 1.5.1 POI causes spreadsheet to become unopenable.</action>
+        </release>
+
+        <release version="2.0-pre3" date="29 July 2003">
+            <action dev="POI-DEVELOPERS" type="add" context="All">HPSF is now able to read properties which are given in the property set stream but which don't have a value ("variant" type VT_EMPTY). The getXXX() methods of the PropertySet class return null if their return type is a reference (like a string) or 0 if the return type is numeric. Details about the return types and about how to distinguish between a property value of zero and a property value that is not present can be found in the API documentation.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Gridlines can now be turned on and off</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">NamePTG refactoring/fixes</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">minor fixes to ExternSheet and formula strings</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Sheet comparisons now ignore case</action>
+        </release>
+
+        <release version="2.0-pre2" date="6 July 2003">
+            <action dev="POI-DEVELOPERS" type="fix" context="All" >A nasty concurrency problem has been fixed. Any users working in a multithreaded environment should seriously consider upgrading to this release.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">The EXTSST record has been implemented. This record is used by excel for optimized reading of strings.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">When rows are shifted, the merged regions now move with them. If a row contains 2 merged cells, the resulting shifted row should have those cells merged as well.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">There were some issues when removing merged
+		    regions (specifically, removing all of them and then adding some more) and have been resolved.</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">When a sheet contained shared formulas (when a formula is
+		    dragged across greater than 6 cells), the clone would fail. We now support cloning of
+		    sheets that contain this Excel optimization. </action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Support added for reading formulas with UnaryPlus and UnaryMinus operators.</action>
+        </release>
+        <release version="2.0-pre1" date="17 May 2003">
+            <action dev="POI-DEVELOPERS" type="add" context="All">Patch applied for deep cloning of worksheets was provided</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Patch applied to allow sheet reordering</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Added additional print area setting methods using row/column numbers</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">HDF:  Negative Array size fix</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added argument pointers to support the IF formula</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Formulas: Added special character support for string literals, specifically for SUMIF formula support and addresses a bug as well</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">BlockingInputStream committed to help ensure reads</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Fixed problem with NaN values differing from the investigated value from file reads in FormulaRecords</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Patch for getColumnWidth in HSSF</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Patch for dealing with mult-level numbered lists in HDF</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Due to named reference work, several named-ranged bugs were closed</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Patch applied to prevent sheet corruption after a template modification</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Shared Formulas now Supported</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added GreaterEqual, LessEqual and NotEqual to Formula Parser</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added GreaterThan and LessThan functionality to formulas</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Patches for i10n</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">POI Build System Updated</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">font names can now be null</action>
+        </release>
+        <release version="1.10-dev" date="19 Feb 2003">
+            <action dev="POI-DEVELOPERS" type="add" context="All">Support for zoom level</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Freeze and split pane support</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Row and column headers on printouts</action>
+        </release>
+        <release version="1.8-dev" date="20 Sep 2002">
+            <action dev="POI-DEVELOPERS" type="add" context="All">Custom Data Format Support</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Enhanced Unicode Support for Russian and Japanese</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Enhanced formula support including read-only for
+                "optimized if" statements.</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Support for cloning objects</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Fixes for header/footer</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Spanish Documentation translations</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Support for preserving VBA macros</action>
+        </release>
+        <release version="1.7-dev" date="???">
+            <action dev="NKB" type="update" context="All">Removed runtime dependency on commons logging.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Formula support</action>
+        </release>
+        <release version="1.5.1" date="16 June 2002">
+            <action dev="GJS" type="update" context="All">Removed depedency on commons logging.  Now define poi.logging system property to enable logging to standard out.</action>
+            <action dev="GJS" type="fix" context="All">Fixed SST string handling so that spreadsheets with rich text or extended text will be read correctly.</action>
+        </release>
+        <release version="1.5" date="06 May 2002">
+            <action dev="NKB" type="update" context="All">New project build.</action>
+            <action dev="NKB" type="update" context="All">New project documentation system based on Cocoon.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Package rename</action>
+            <action dev="POI-DEVELOPERS" type="fix" context="All">Various bug fixes</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Early stages of HSF development (not ready for development)</action>
+            <action dev="POI-DEVELOPERS" type="add" context="All">Initial low level record support for charting (not complete)</action>
+        </release>
+        <release version="1.1.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Created new event model</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Optimizations made to HSSF including aggregate records for
+                values, rows, etc.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">predictive sizing, offset based writing (instead of lots of
+                array copies)</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">minor re-factoring and bug fixes.</action>
+        </release>
+        <release version="1.0.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Minor documentation updates.</action>
+        </release>
+        <release version="0.14.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added DataFormat helper class and exposed set and get format
+                on HSSFCellStyle</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Fixed column width apis (unit wise) and various javadoc on
+                the subject</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Fix for Dimensions record (again)... (one of these days I'll
+                write a unit test for this ;-p).</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Some optimization on sheet creation.</action>
+        </release>
+        <release version="0.13.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Changes not recorded.</action>
+        </release>
+        <release version="0.12.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added MulBlank, Blank, ColInfo</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added log4j facility and removed all sys.out type logging</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added support for adding font's, styles and corresponding
+                high level api for styling cells</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">added support for changing row height, cell width and default
+                row height/cell width.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added fixes for internationalization (UTF-16 should work now
+                from HSSFCell.setStringValue, etc when the encoding is set)</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">added support for adding/removing and naming sheets.</action>
+        </release>
+        <release version="0.11.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Bugfix release. We were throwing an exception when reading
+                RKRecord objects.</action>
+        </release>
+        <release version="0.10.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Got continuation records to work (read/write)</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added various pre-support for formulas</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Massive API reorganization, repackaging.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">BiffViewer class added for validating HSSF &amp; POI and/or
+                HSSF Output.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Better API support for modification.</action>
+        </release>
+        <release version="0.7 (and interim releases)" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Added encoding flag to high and low level api to use utf-16
+                when needed (HSSFCell.setEncoding())</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">added read only support for Label records (which are
+                reinterpreted as LabelSST when written)</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Broken continuation record implementation (oops)</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">BiffViewer class added for validating HSSF &amp; POI and/or
+                HSSF Output.</action>
+        </release>
+        <release version="0.6 (release)" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS" type="update" context="All">Support for read/write and modify.</action>
+            <action dev="POI-DEVELOPERS" type="update" context="All">Read only support for MulRK records (converted to Number when
+                writing)
+            </action>
+        </release>
+
+    </changes>
+
 
     <todo>
-        <title>Things To Do for POI</title>
+<!--        <title>Things To Do for POI</title>-->
 
-        <actions priority="high">
+        <actions context="all" priority="high">
             <action context="code" dev="NKB">
                 Finish HDF
             </action>
@@ -24,7 +224,7 @@
             </action>
         </actions>
 
-        <actions priority="medium">
+        <actions context="all" priority="medium">
             <action context="code" dev="open">
                 Expose functionality in low level records in higher level API
             </action>
@@ -50,103 +250,4 @@
 
     </todo>
 
-    <changes>
-
-        <title>History of Changes</title>
-
-        <release version="1.10-dev" date="19 Feb 2003">
-            <action dev="POI-DEVELOPERS" type="add">Support for zoom level</action>
-            <action dev="POI-DEVELOPERS" type="add">Freeze and split pane support</action>
-            <action dev="POI-DEVELOPERS" type="add">Row and column headers on printouts</action>
-        </release>
-        <release version="1.8-dev" date="20 Sep 2002">
-            <action dev="POI-DEVELOPERS" type="add">Custom Data Format Support</action>
-            <action dev="POI-DEVELOPERS" type="add">Enhanced Unicode Support for Russian and Japanese</action>
-            <action dev="POI-DEVELOPERS" type="add">Enhanced formula support including read-only for
-                "optimized if" statements.</action>
-            <action dev="POI-DEVELOPERS" type="add">Support for cloning objects</action>
-            <action dev="POI-DEVELOPERS" type="add">Fixes for header/footer</action>
-            <action dev="POI-DEVELOPERS" type="add">Spanish Documentation translations</action>
-            <action dev="POI-DEVELOPERS" type="add">Support for preserving VBA macros</action>
-        </release>
-        <release version="1.7-dev" date="???">
-            <action dev="NKB" type="update">Removed runtime dependency on commons logging.</action>
-            <action dev="POI-DEVELOPERS" type="update">Formula support</action>
-        </release>
-        <release version="1.5.1" date="16 June 2002">
-            <action dev="GJS" type="update">Removed depedency on commons logging.  Now define poi.logging system property to enable logging to standard out.</action>
-            <action dev="GJS" type="fix">Fixed SST string handling so that spreadsheets with rich text or extended text will be read correctly.</action>
-        </release>
-        <release version="1.5" date="06 May 2002">
-            <action dev="NKB" type="update">New project build.</action>
-            <action dev="NKB" type="update">New project documentation system based on Cocoon.</action>
-            <action dev="POI-DEVELOPERS" type="update">Package rename</action>
-            <action dev="POI-DEVELOPERS" type="fix">Various bug fixes</action>
-            <action dev="POI-DEVELOPERS" type="add">Early stages of HSF development (not ready for development)</action>
-            <action dev="POI-DEVELOPERS" type="add">Initial low level record support for charting (not complete)</action>
-        </release>
-        <release version="1.1.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Created new event model</action>
-            <action dev="POI-DEVELOPERS">Optimizations made to HSSF including aggregate records for
-                values, rows, etc.</action>
-            <action dev="POI-DEVELOPERS">predictive sizing, offset based writing (instead of lots of
-                array copies)</action>
-            <action dev="POI-DEVELOPERS">minor re-factoring and bug fixes.</action>
-        </release>
-        <release version="1.0.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Minor documentation updates.</action>
-        </release>
-        <release version="0.14.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Added DataFormat helper class and exposed set and get format
-                on HSSFCellStyle</action>
-            <action dev="POI-DEVELOPERS">Fixed column width apis (unit wise) and various javadoc on
-                the subject</action>
-            <action dev="POI-DEVELOPERS">Fix for Dimensions record (again)... (one of these days I'll
-                write a unit test for this ;-p).</action>
-            <action dev="POI-DEVELOPERS">Some optimization on sheet creation.</action>
-        </release>
-        <release version="0.13.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Changes not recorded.</action>
-        </release>
-        <release version="0.12.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Added MulBlank, Blank, ColInfo</action>
-            <action dev="POI-DEVELOPERS">Added log4j facility and removed all sys.out type logging</action>
-            <action dev="POI-DEVELOPERS">Added support for adding font's, styles and corresponding
-                high level api for styling cells</action>
-            <action dev="POI-DEVELOPERS">added support for changing row height, cell width and default
-                row height/cell width.</action>
-            <action dev="POI-DEVELOPERS">Added fixes for internationalization (UTF-16 should work now
-                from HSSFCell.setStringValue, etc when the encoding is set)</action>
-            <action dev="POI-DEVELOPERS">added support for adding/removing and naming sheets.</action>
-        </release>
-        <release version="0.11.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Bugfix release. We were throwing an exception when reading
-                RKRecord objects.</action>
-        </release>
-        <release version="0.10.0" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Got continuation records to work (read/write)</action>
-            <action dev="POI-DEVELOPERS">Added various pre-support for formulas</action>
-            <action dev="POI-DEVELOPERS">Massive API reorganization, repackaging.</action>
-            <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
-                HSSF Output.</action>
-            <action dev="POI-DEVELOPERS">Better API support for modification.</action>
-        </release>
-        <release version="0.7 (and interim releases)" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Added encoding flag to high and low level api to use utf-16
-                when needed (HSSFCell.setEncoding())</action>
-            <action dev="POI-DEVELOPERS">added read only support for Label records (which are
-                reinterpreted as LabelSST when written)</action>
-            <action dev="POI-DEVELOPERS">Broken continuation record implementation (oops)</action>
-            <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
-                HSSF Output.</action>
-        </release>
-        <release version="0.6 (release)" date="Release date not recorded">
-            <action dev="POI-DEVELOPERS">Support for read/write and modify.</action>
-            <action dev="POI-DEVELOPERS">Read only support for MulRK records (converted to Number when
-                writing)
-            </action>
-        </release>
-
-    </changes>
-
 </status>

src/documentation/content/xdocs/tabs.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
 
-<tabs software="MyProj"
-  title="MyProj"
-  copyright="Foo"
+<tabs software="POI"
+  title="POI"
+  copyright="Apache Foundation"
   xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <!-- The rules are:

src/documentation/content/xdocs/todo.xml

@@ -1,51 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 
 <!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.1//EN" "./dtd/todo-v11.dtd">
 
 <todo><title>Things To Do for Poi</title>
 
     <devs>
-        <!-- in strict alphabetical order -->
-        <person id="AO"  name="Andrew C. Oliver"   email="acoliver2@users.sourceforge.net"/>
-        <person id="GS"  name="Glen Stampoultzis"  email="gstamp@iprimus.com.au"/>
+       <person id="AO"  name="Andrew C. Oliver"   email="acoliver@apache.org"/>
+           <person id="GS"  name="Glen Stampoultzis"  email="poi-user@jakarta.apache.org"/>
            <person id="MJ"  name="Marc Johnson"       email="mjohnson at apache dot org"/>
            <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
-        <person id="open" name="Poi Developers"    email="poi-dev@jakarta.apache.org"/>
+   		   <person id="RA" name="Ryan Ackley" email="poi-dev@jakarta.apache.org"/>
+		   <person id="AS" name="Avik Sengupta" email="poi-dev@jakarta.apache.org"/>
+   		   <person id="Everyone" name="POI Developers"    email="poi-dev@jakarta.apache.org"/>
+
     </devs>
 
     <actions priority="high">
-        <action context="code" dev="NKB">
-          Finish HDF
+        <action context="code" dev="RA">
+             Finish HWPF
            </action>
         <action context="code" dev="GS">
           Finish Charts
         </action>
-        <action context="code" dev="open">
-          Finish Formulas.
+     <action context="code" dev="Everyone">
+            Evaluate and bugfix performance code in HEAD
            </action>
     </actions>
 
     <actions priority="medium">
-        <action context="code" dev="open">
+        <action context="code" dev="Everyone">
           Expose functionality in low level records in higher level API
         </action>
-        <action context="code" dev="open">
+        <action context="code" dev="Everyone">
           Implement more record types.
         </action>
-        <action context="code" dev="open">
+        <action context="code" dev="Everyone">
           Add more dummy checks (for when API user's do things they
           &quot;can't&quot; do).  This will involve exploring the various
           upper limits on the things Excel can handle.
         </action>
-        <action context="code" dev="open">
+        <action context="code" dev="GS">
               Add support for embedded graphics and other objects.
         </action>
-        <action context="code" dev="open">
+        <action context="code" dev="Everyone">
           Create new adapter object for handling MulBlank, MulRk, Rk
           records.
         </action>
-        <action context="code" dev="open">
-          Add a way to copy sheets.
+		<action context="code" dev="AS">
+              Improve formulas (Shared Formulas, Unkown PTG's)
         </action>
     </actions>
 

src/documentation/content/xdocs/trans/book.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2004 The Apache Software Foundation. All rights reserved. -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="Poi"