You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by Glen Daniels <gd...@macromedia.com> on 2002/03/12 19:09:56 UTC

RE: cvs commit: xml-axis/java/lib excalibur-cli.LICENSE excalibur -cli.jar clutil.LICENSE clutil.jar

ARGH!

Can we leave this for the beta???  This is going to really screw things up for anyone who puts things in their classpaths, copies jars, etc. etc.

I vote we make this change after the beta, please.

--Glen

> -----Original Message-----
> From: butek@apache.org [mailto:butek@apache.org]
> Sent: Tuesday, March 12, 2002 12:44 PM
> To: xml-axis-cvs@apache.org
> Subject: cvs commit: xml-axis/java/lib excalibur-cli.LICENSE
> excalibur-cli.jar clutil.LICENSE clutil.jar
> 
> 
> butek       02/03/12 09:44:16
> 
>   Modified:    java     axis.properties build.xml
>                java/docs developers-guide.html user-guide.html
>   Added:       java/lib excalibur-cli.LICENSE excalibur-cli.jar
>   Removed:     java/lib clutil.LICENSE clutil.jar
>   Log:
>   Excalibur changed their clutil.jar to excalibur-cli.jar.  
> We need to be consistent.
>   So I've done the same.  I'm committing an excalibur-cli.jar 
> with code from the
>   official excalibur release (Jan 30).  Some docs also needed 
> to change.
>   
>   Revision  Changes    Path
>   1.2       +1 -1      xml-axis/java/axis.properties
>   
>   Index: axis.properties
>   ===================================================================
>   RCS file: /home/cvs/xml-axis/java/axis.properties,v
>   retrieving revision 1.1
>   retrieving revision 1.2
>   diff -u -r1.1 -r1.2
>   --- axis.properties	22 Feb 2002 05:38:50 -0000	1.1
>   +++ axis.properties	12 Mar 2002 17:44:16 -0000	1.2
>   @@ -17,7 +17,7 @@
>    wsdl4j.jar=lib/wsdl4j.jar
>    commons-logging.jar=lib/commons-logging.jar
>    log4j-core.jar=lib/log4j-core.jar
>   -clutil.jar=lib/clutil.jar
>   +excalibur-cli.jar=lib/excalibur-cli.jar
>    tt-bytecode.jar=lib/tt-bytecode.jar
>    
>    junit.jar=lib/junit.jar
>   
>   
>   
>   1.122     +5 -5      xml-axis/java/build.xml
>   
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/xml-axis/java/build.xml,v
>   retrieving revision 1.121
>   retrieving revision 1.122
>   diff -u -r1.121 -r1.122
>   --- build.xml	11 Mar 2002 15:38:24 -0000	1.121
>   +++ build.xml	12 Mar 2002 17:44:16 -0000	1.122
>   @@ -81,7 +81,7 @@
>      <property name="wsdl4j.jar" value="lib/wsdl4j.jar"/>
>      <property name="commons-logging.jar" 
> value="lib/commons-logging.jar"/>
>      <property name="log4j-core.jar" value="lib/log4j-core.jar"/>
>   -  <property name="clutil.jar" value="lib/clutil.jar"/>
>   +  <property name="excalibur-cli.jar" 
> value="lib/excalibur-cli.jar"/>
>      <property name="tt-bytecode.jar" value="lib/tt-bytecode.jar"/>
>    
>      <property name="regexp.jar" 
> value="test/lib/jakarta-oro-2.0.5.jar"/>
>   @@ -109,7 +109,7 @@
>      <!-- Determine what dependencies are present             
>                 -->
>      <!-- 
> ==============================================================
> ===== -->
>      <path id="classpath">
>   -    <pathelement location="${clutil.jar}"/>
>   +    <pathelement location="${excalibur-cli.jar}"/>
>        <pathelement location="${xerces.jar}"/>
>        <pathelement location="${regexp.jar}"/>
>        <pathelement location="${junit.jar}"/>
>   @@ -149,7 +149,7 @@
>          classname="org.apache.log4j.Category"
>          classpathref="classpath"/>
>    
>   -    <available property="clutil.present"
>   +    <available property="excalibur-cli.present"
>          classname="org.apache.avalon.excalibur.cli.CLUtil"
>          classpathref="classpath"/>
>          
>   @@ -194,7 +194,7 @@
>        <echo message="wsdl4j.present=${wsdl4j.present}" />
>        <echo 
> message="commons-logging.present=${commons-logging.present}" />
>        <echo message="log4j.present=${log4j.present}" />
>   -    <echo message="clutil.present=${clutil.present}" />
>   +    <echo 
> message="excalibur-cli.present=${excalibur-cli.present}" />
>        <echo message="tt-bytecode.present=${tt-bytecode.present}" />
>        <echo message=""/>
>        <echo message="--- Optional Libraries ---" />
>   @@ -275,7 +275,7 @@
>        <copy file="${wsdl4j.jar}" toDir="${build.lib}"/>
>        <copy file="${commons-logging.jar}" toDir="${build.lib}"/>
>        <copy file="${log4j-core.jar}" toDir="${build.lib}"/>
>   -    <copy file="${clutil.jar}" toDir="${build.lib}"/>
>   +    <copy file="${excalibur-cli.jar}" toDir="${build.lib}"/>
>        <copy file="${tt-bytecode.jar}" toDir="${build.lib}"/>
>        <antcall target="post-compile"/>
>      </target>
>   
>   
>   
>   1.11      +1 -1      xml-axis/java/docs/developers-guide.html
>   
>   Index: developers-guide.html
>   ===================================================================
>   RCS file: /home/cvs/xml-axis/java/docs/developers-guide.html,v
>   retrieving revision 1.10
>   retrieving revision 1.11
>   diff -u -r1.10 -r1.11
>   --- developers-guide.html	22 Feb 2002 19:48:26 -0000	1.10
>   +++ developers-guide.html	12 Mar 2002 17:44:16 -0000	1.11
>   @@ -92,7 +92,7 @@
>    <br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\lib\\wsdl4j.jar</font></tt>
>    <br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\lib\\axis.jar</font></tt>
>    <br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\lib\\log4j-core.jar
> </font></tt>
>   -<br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\lib\\clutil.jar</font></tt>
>   +<br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\lib\\excalibur-cli.
> jar</font></tt>
>    <br><tt><font 
> color="#009900">G:\\xml-axis\\java\\build\\classes</font></tt>
> </blockquote>
>    </blockquote>
>    If you access the internet via a proxy server, you'll need 
> to set an environment
>   
>   
>   
>   1.42      +1 -1      xml-axis/java/docs/user-guide.html
>   
>   Index: user-guide.html
>   ===================================================================
>   RCS file: /home/cvs/xml-axis/java/docs/user-guide.html,v
>   retrieving revision 1.41
>   retrieving revision 1.42
>   diff -u -r1.41 -r1.42
>   --- user-guide.html	11 Mar 2002 14:51:36 -0000	1.41
>   +++ user-guide.html	12 Mar 2002 17:44:16 -0000	1.42
>   @@ -208,7 +208,7 @@
>    that your CLASSPATH includes (note:  if you build axis 
> from a CVS checkout, these will be in xml-axis/java/build/lib 
> instead of xml-axis-beta1/lib):
>    <ul>
>    <li>xml-axis-beta1/lib/axis.jar</li>
>   -<li>xml-axis-beta1/lib/clutil.jar</li>
>   +<li>xml-axis-beta1/lib/excalibur-cli.jar</li>
>    <li>xml-axis-beta1/lib/commons-logging.jar</li>
>    <li>xml-axis-beta1/lib/tt-bytecode.jar</li>
>    <li>xml-axis-beta1/lib/wsdl4j.jar</li>
>   
>   
>   
>   1.1                  xml-axis/java/lib/excalibur-cli.LICENSE
>   
>   Index: excalibur-cli.LICENSE
>   ===================================================================
>   /*
>   
>    
> ==============================================================
> ==============
>                      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 "Jakarta", "Avalon", "Excalibur" 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  <st...@apache.org>. For more  information on the Apache 
   Software Foundation, please see <http://www.apache.org/>.
   
  */
  
  
  
  1.1                  xml-axis/java/lib/excalibur-cli.jar
  
  	<<Binary file>>