From: (no author) <(no author)@unknown>
Date: Sat, 17 May 2003 05:43:08 +0000 (+0000)
Subject: This commit was manufactured by cvs2svn to create tag 'REL_2_0_PRE1'.
X-Git-Tag: REL_2_0_PRE1~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d66dbf88efa4b55a015794df9dfc1e10954cd934;p=poi.git

This commit was manufactured by cvs2svn to create tag 'REL_2_0_PRE1'.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/tags/REL_2_0_PRE1@353103 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index 926bdd21e5..0ed314e0bf 100644
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,9 @@
     xerces          http://www.ibiblio.org/maven/xerces/jars/
     jdepend         http://www.ibiblio.org/maven/jdepend/jars/
 
+    The ant jar "optional.jar" should also be available otherwise the
+    build will fail.
+
     To build the documentation you will need to install forrest and set
     the FORREST_HOME environment variable.
 
@@ -79,7 +82,7 @@
     <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="1.10.0-dev"/>
+    <property name="version.id" value="2.0-pre1"/>
     <property name="halt.on.test.failure" value="true"/>
 
     <path id="main.classpath">
@@ -525,9 +528,10 @@
 
         <zip destfile="${dist.dir}/${jar.name}-bin-${version.id}-${DSTAMP}.zip">
             <zipfileset dir="${build.site}" prefix="docs"/>
-            <zipfileset file="${dist.dir}/${jar.name}-${version.id}.jar"/>
-            <zipfileset file="${dist.dir}/${jar.name}-contrib-${version.id}.jar"/>
-            <zipfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"/>
+            <zipfileset file="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"/>
+            <zipfileset file="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"/>
+            <zipfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"/>
+            <zipfileset dir="legal" prefix="legal"/>
         </zip>
 
         <zip destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.zip">
@@ -546,6 +550,7 @@
             <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 dir="legal" prefix="legal"/>
         </tar>
 
         <tar destfile="${dist.dir}/${jar.name}-src-${version.id}-${DSTAMP}.tar.gz" compression="gzip">
diff --git a/gump.xml b/gump.xml
deleted file mode 100644
index 4e11735239..0000000000
--- a/gump.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<module name="jakarta-poi">
-    <description>POI</description>
-    <url href="http://jakarta.apache.org/poi/">
-    </url>
-    <cvs module="jakarta-poi" repository="jakarta">
-    </cvs>
-    <project name="jakarta-poi">
-        <ant buildfile="build.xml" target="dist">
-        </ant>
-        <package>org.apache.poi</package>
-        <depend project="commons-logging"/>
-        <depend project="commons-beanutils"/>
-        <depend project="commons-collections"/>
-        <depend project="commons-lang"/>
-        <depend project="junit"/>
-        <depend project="xml-xerces"/>
-        <work nested="build/classes"/>
-        <work nested="build/contrib-classes"/>
-        <work nested="build/scratchpad-classes"/>
-        <home nested="build/dist"/>
-        <jar name="build/dist/poi-1.10.0-dev-@@DATE@@.jar"/>
-        <jar name="build/dist/poi-contrib-1.10.0-dev-@@DATE@@.jar"/>
-        <jar name="build/dist/poi-scratchpad-1.10.0-dev-@@DATE@@.jar"/>
-        <javadoc module="jakarta-poi" nested="build/tmp/site/build/site/apidocs"/>
-
-        <nag to="poi-dev@jakarta.apache.org"
-            from="&quot;Gump :-(&quot; &lt;gump@jakarta.apache.org&gt;"/>
-    </project>
-</module>
\ No newline at end of file
diff --git a/legal/LICENSE.krysalis b/legal/LICENSE.krysalis
deleted file mode 100644
index c2b2d7a935..0000000000
--- a/legal/LICENSE.krysalis
+++ /dev/null
@@ -1,52 +0,0 @@
-The Krysalis Patchy Software License, Version 1.1_01
-Copyright (c) 2002 Nicola Ken Barozzi.  All rights reserved.
-
-This Licence is compatible with the BSD licence as described and 
-approved by http://www.opensource.org/, and is based on the
-Apache Software Licence Version 1.1.
-
-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 for project 
-       Krysalis (http://www.krysalis.org/)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Krysalis" and "Nicola Ken Barozzi" and
-   "Krysalis Centipede" must not be used to endorse or promote products
-   derived from this software without prior written permission. For
-   written permission, please contact krysalis@nicolaken.org.
-   
-5. Products derived from this software may not be called "Krysalis",
-   "Krysalis Centipede", nor may "Krysalis" appear in their name,
-   without prior written permission of Nicola Ken Barozzi.
-
-6. This software may contain voluntary contributions made by many 
-   individuals, who decided to donate the code to this project in
-   respect of this licence.
-
-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 KRYSALIS PROJECT 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.
-====================================================================