nicolaken 02/03/15 03:55:23
Modified: . build.xml
Added: lib/optional commons-logging-1.0.jar
jakarta-poi-1.5-dev-20020315.jar
legal LICENSE.jakarta-commons-logging
Removed: lib/optional jakarta-poi-20020203.jar log4j.jar
legal LICENSE.jakarta-log4j
Log:
Update Jakarta POI to current developement version: right click bug, and other bugs
fixed
Now it uses commons-logging, and log4j is optional and used for POI development;
hence it has been removed from Cocoon CVS.
To see POI internals logging, put log4j in classpath.
Revision Changes Path
1.185 +11 -11 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- build.xml 14 Mar 2002 19:32:20 -0000 1.184
+++ build.xml 15 Mar 2002 11:55:22 -0000 1.185
@@ -348,19 +348,19 @@
<class-available classpathref="classpath"
property="poi.proper.present"
- classname="org.apache.poi.poifs.common.PoiFSConstants"/>
+ classname="org.apache.poi.poifs.common.POIFSConstants"/>
<class-available classpathref="classpath"
- property="log4j.present"
- classname="org.apache.log4j.Logger"/>
+ property="commons.logging.present"
+ classname="org.apache.commons.logging.LogFactory"/>
<condition property="poi.present">
<and> <!-- with post 1.4.1 Ant use <isset property="poi.proper.present"/> -->
<not>
<equals arg1="${poi.proper.present}" arg2="$${poi.proper.present}" />
</not>
- <not> <!-- with post 1.4.1 Ant use <isset property="log4j.present"/> -->
- <equals arg1="${log4j.present}" arg2="$${log4j.present}" />
+ <not> <!-- with post 1.4.1 Ant use <isset
property="commons.logging.present"/> -->
+ <equals arg1="${commons.logging.present}"
arg2="$${commons.logging.present}" />
</not>
</and>
</condition>
@@ -713,14 +713,14 @@
value="POI is required for the POI sitemap components."/>
</antcall>
</target>
- <target name="log4j-warn" unless="log4j.present" depends="optional-tests"
- description="Outputs a warning if org.apache.log4j.* classes are missing
during compilation">
+ <target name="commons-logging-warn" unless="commons.logging.present"
depends="optional-tests"
+ description="Outputs a warning if org.apache.commons.logging.* classes are
missing during compilation">
<antcall target="op-warning">
- <param name="thing" value="Log4j"/>
+ <param name="thing" value="Jakarta Commons Logging"/>
<param name="recovery"
- value="Get the Log4j package from http://jakarta.apache.org/log4j/ and
place the jar in the lib/optional dir"/>
+ value="Get the Jakarta Commons Logging package from
http://jakarta.apache.org/commons/logging/ and place the jar in the lib/optional dir"/>
<param name="message"
- value="Log4j is required for the POI sitemap components."/>
+ value="The Jakarta Commons Logging package is required for the POI
sitemap components."/>
</antcall>
</target>
@@ -729,7 +729,7 @@
<!-- Print out warnings for optional components -->
<!-- =================================================================== -->
<target name="optional-warnings"
- depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn,
naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, poi-warn,
log4j-warn"
+ depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn,
naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn, poi-warn,
commons-logging-warn"
description="Outputs warnings if some optional jars are missing from the
environment">
</target>
1.1 xml-cocoon2/lib/optional/commons-logging-1.0.jar
<<Binary file>>
1.1 xml-cocoon2/lib/optional/jakarta-poi-1.5-dev-20020315.jar
<<Binary file>>
1.1 xml-cocoon2/legal/LICENSE.jakarta-commons-logging
Index: LICENSE.jakarta-commons-logging
===================================================================
/*
* $Header: /home/cvs/xml-cocoon2/legal/LICENSE.jakarta-commons-logging,v 1.1
2002/03/15 11:55:23 nicolaken Exp $
* $Revision: 1.1 $
* $Date: 2002/03/15 11:55:23 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* 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.
*
* 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", "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 [EMAIL PROTECTED]
*
* 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/>.
*
*/
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
