Make POI use commons.logging, make log4j optional and clean structure…

… to comply with, and use, Krysalis Centipede 2.0.1. git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352212 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 14, 2002 · 55f1c27 · 55f1c27
1 parent fc4b082
commit 55f1c27
Show file tree

Hide file tree

Showing 114 changed files with 726 additions and 5,043 deletions.
diff --git a/build.bat b/build.bat
@@ -1,23 +1,13 @@
 @echo off
-rem ----------------------------------------------------------------------------
-rem build.bat - Win32 Build Script for Apache Cocoon
-rem
-rem $Id$
-rem ----------------------------------------------------------------------------
 
-rem ----- Copy Xalan and Xerces for the build system    ------------------------
-copy lib\optional\xerces*.jar  tools\lib
-copy lib\optional\xalan*.jar   tools\lib
-copy lib\optional\xml-api*.jar tools\lib
-copy lib\optional\jtidy*.jar tools\lib
+set OLD_ANT_HOME=%ANT_HOME%
+set ANT_HOME=tools\ant
 
-rem ----- Verify and Set Required Environment Variables ------------------------
+set OLD_CLASSPATH=%CLASSPATH%
+set CLASSPATH=tools\centipede\lib\xml-apis.jar;tools\centipede\lib\xerces.jar;tools\centipede\lib\xalan.jar;tools\centipede\lib\junit.jar;tools\centipede\lib\jIzPress.jar;tools\centipede\lib\jtidy.jar
 
-REM Commented out so it always uses poi's ant -- gjs -- if not "%ANT_HOME%" == "" goto gotAntHome
-set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools
-:gotAntHome
+call %ANT_HOME%\bin\ant -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-call %ANT_HOME%\bin\ant %1 %2 %3 %4 %5 %6 %7 %8 %9
 set ANT_HOME=%OLD_ANT_HOME%
+set CLASSPATH=%OLD_CLASSPATH%
 
diff --git a/build.sh b/build.sh
@@ -1,24 +1,24 @@
 #!/bin/sh
 
-echo
-echo "POI Build System            "
-echo "----------------------------"
+chmod u+x ./tools/ant/bin/antRun
+chmod u+x ./tools/ant/bin/ant
 
-cp -f ./lib/optional/xalan*.jar ./tools/lib
-cp -f ./lib/optional/xerces*.jar ./tools/lib
-cp -f ./lib/optional/xml-api*.jar ./tools/lib
-cp -f ./lib/optional/jtidy*.jar ./tools/lib
-
-chmod u+x ./tools/bin/antRun
-chmod u+x ./tools/bin/ant
 
+OLD_ANT_HOME=$ANT_HOME
 unset ANT_HOME
 
 CP=$CLASSPATH
 export CP
 unset CLASSPATH
 
-$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@ 
+CLASSPATH="./tools/centipede/lib/xml-apis.jar:./tools/centipede/lib/xerces.jar:./tools/centipede/lib/xalan.jar:./tools/centipede/lib/junit.jar:./tools/centipede/lib/jIzPress.jar:./tools/centipede/lib/jtidy.jar"
+export CLASSPATH
+
+$PWD/./tools/ant/bin/ant -listener org.apache.tools.ant.XmlLogger $@ 
+
+unset CLASSPATH
 
 CLASSPATH=$CP
 export CLASSPATH
+ANT_HOME=OLD_ANT_HOME
+export ANT_HOME
diff --git a/build.xml b/build.xml
@@ -1,20 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE project [
-<!ENTITY preinit-target SYSTEM "./tools/targets/preinit.xtarget"> 
-<!ENTITY init-target SYSTEM "./tools/targets/init.xtarget"> 
-<!ENTITY compile-target SYSTEM "./tools/targets/compile.xtarget"> 
-<!ENTITY interactive-target SYSTEM "./tools/targets/interactive.xtarget"> 
-<!ENTITY scratchpad-target SYSTEM "./tools/targets/scratchpad.xtarget"> 
-<!ENTITY contrib-target SYSTEM "./tools/targets/contrib.xtarget"> 
-<!ENTITY util-target SYSTEM "./tools/targets/util.xtarget"> 
-<!ENTITY dev-target SYSTEM "./tools/targets/dev.xtarget"> 
-<!ENTITY test-target SYSTEM "./tools/targets/test.xtarget"> 
-<!ENTITY robot-target SYSTEM "./tools/targets/robot.xtarget"> 
-<!ENTITY docs-target SYSTEM "./tools/targets/docs.xtarget"> 
-]>
-
-<project default="interactive" basedir="." name="krysalis">
-
 <!-- ===========================================================================
 
 
@@ -24,14 +9,42 @@
                                      by               
 
                    Nicola Ken Barozzi <barozzi@nicolaken.com>
-		           Marc Johnson <mjohnson at apache dot org>       
+                   Marc Johnson <mjohnson at apache dot org>       
 
                    extends the Apache Cocoon Build System 
                        (http://xml.apache.org/cocoon/)
                                      by
                    Stefano Mazzocchi <stefano@apache.org>
                    Carsten Ziegeler <cziegeler@apache.org>
 
+-->    
+<!-- =================  Main project targets and info =================  -->
+<!ENTITY project-target     SYSTEM "./src/targets/project.xtarget"> 
+<!ENTITY interactive-target SYSTEM "./src/targets/interactive.xtarget"> 
+<!-- =================================================================== -->
+
+<!-- ======================  Scratchpad targets =======================  -->
+<!ENTITY scratchpad-target SYSTEM "./src/scratchpad/targets/scratchpad.xtarget"> 
+<!-- =================================================================== -->
+
+<!-- ========================  Contrib targets ========================  --> 
+<!ENTITY contrib-target SYSTEM "./src/contrib/targets/contrib.xtarget">
+<!-- =================================================================== -->
+
+<!-- ==================  Krysalis Centipede targets ===================  --> 
+<!ENTITY preinit-target SYSTEM "./tools/centipede/targets/preinit.xtarget"> 
+<!ENTITY init-target    SYSTEM "./tools/centipede/targets/init.xtarget"> 
+<!ENTITY compile-target SYSTEM "./tools/centipede/targets/compile.xtarget"> 
+<!ENTITY util-target    SYSTEM "./tools/centipede/targets/util.xtarget"> 
+<!ENTITY dev-target     SYSTEM "./tools/centipede/targets/dev.xtarget"> 
+<!ENTITY test-target    SYSTEM "./tools/centipede/targets/test.xtarget"> 
+<!ENTITY robot-target   SYSTEM "./tools/centipede/targets/robot.xtarget"> 
+<!ENTITY docs-target    SYSTEM "./tools/centipede/targets/docs.xtarget"> 
+<!-- =================================================================== -->
+]>
+
+<project default="interactive" basedir="." name="krysalis">
+<!--
 
 Installing the build tools
 ==========================
@@ -141,10 +154,13 @@ or
 
 
   <!-- =================================================================== -->
-  <!-- external reference are relative to to tools/targets/*.xtarget       -->
-  <!-- =================================================================== -->
+  <!-- external reference are relative to to **/*.xtarget;                 -->
+  <!-- see entity decalrations at the start of this file                   -->
+  <!-- =================================================================== -->  
   <!-- Pre Initialization      -->  &preinit-target;  
   <!-- =================================================================== -->  
+  <!-- Project targets         -->  &project-target;    
+  <!-- =================================================================== -->
   <!-- Initialization targets  -->  &init-target;  
   <!-- =================================================================== -->
   <!-- Compile targets         -->  &compile-target;  

diff --git a/src/java/org/apache/poi/hssf/HSSFLog.java → legal/LICENSE.commons-logging b/src/java/org/apache/poi/hssf/HSSFLog.java → legal/LICENSE.commons-logging
@@ -1,37 +1,42 @@
-
-/* ====================================================================
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ * 
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 1999-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.
+ *    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
+ * 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 acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements 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.
+ * 4. The names "The Jakarta Project", "Commons", 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",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
+ * 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
@@ -51,46 +56,10 @@
  * individuals on behalf of the Apache Software Foundation.  For more
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
- */
-
-/*
- * HSSFLog.java
  *
- * Created on December 3, 2001, 2:30 PM
- */
-package org.apache.poi.hssf;
+ */ 
 
-import org.apache.poi.util.POILogFactory;
-import org.apache.poi.util.POILogger;
-
-/**
- * Provides logging to HSSF without it having to mess with
- * configuration/initialization.
- *
- * @author Andrew C. Oliver (acoliver at apache dot org)
- * @author Marc Johnson (mjohnson at apache dot org)
- */
 
-public class HSSFLog
-    extends POILogFactory
-{
-    private static HSSFLog _the_instance = null;
 
-    /**
-     * Create a new instance of HSSFLog
-     */
 
-    private HSSFLog()
-    {
-        super("hssflog.properties", "HSSF.log");
-    }
 
-    public static POILogger getPOILogger(final Class theclass)
-    {
-        if (_the_instance == null)
-        {
-            _the_instance = new HSSFLog();
-        }
-        return _the_instance.getLogger(theclass);
-    }
-}
diff --git a/lib/core/commons-logging-1.0.jar b/lib/core/commons-logging-1.0.jar
diff --git a/lib/core/log4j-1.2beta4.jar b/lib/core/log4j-1.2beta4.jar
diff --git a/lib/optional/cocoon-dev-20020129-nooptional.jar b/lib/optional/cocoon-dev-20020129-nooptional.jar
diff --git a/lib/optional/log4j-core.jar b/lib/optional/log4j-core.jar
diff --git a/lib/optional/logkit-20011212.jar b/lib/optional/logkit-20011212.jar
diff --git a/lib/optional/resolver.jar b/lib/optional/resolver.jar
diff --git a/lib/optional/xerces-1.4.4.jar b/lib/optional/xerces-1.4.4.jar
diff --git a/lib/optional/xml-apis.jar b/lib/optional/xml-apis.jar
diff --git a/src/contrib/builds/poibrowser.xml b/src/contrib/builds/poibrowser.xml
diff --git a/tools/resources/Release-Checklist.txt → src/documentation/Release-Checklist.txt b/tools/resources/Release-Checklist.txt → src/documentation/Release-Checklist.txt