Return-Path: 
 <commons-dev-return-55051-apmail-jakarta-commons-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org
Received: (qmail 6799 invoked from network); 5 Jul 2004 21:01:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 5 Jul 2004 21:01:22 -0000
Received: (qmail 42868 invoked by uid 500); 5 Jul 2004 21:01:27 -0000
Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org
Received: (qmail 42835 invoked by uid 500); 5 Jul 2004 21:01:26 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 42812 invoked by uid 500); 5 Jul 2004 21:01:26 -0000
Received: (qmail 42802 invoked by uid 99); 5 Jul 2004 21:01:25 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Mon, 05 Jul 2004 14:01:25 -0700
Received: (qmail 6710 invoked by uid 1059); 5 Jul 2004 21:01:14 -0000
Date: 5 Jul 2004 21:01:14 -0000
Message-ID: <20040705210114.6709.qmail@minotaur.apache.org>
From: craigmcc@apache.org
To: jakarta-commons-cvs@apache.org
Subject: cvs commit: jakarta-commons/el build.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

craigmcc    2004/07/05 14:01:14

  Modified:    el       build.xml
  Log:
  Avoid problems if "commons-el.jar" is predefined, and use
  canonical property name "commons-logging.jar" for consistency.
  
  Revision  Changes    Path
  1.11      +6 -7      jakarta-commons/el/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/el/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	27 Feb 2004 23:17:53 -0000	1.10
  +++ build.xml	5 Jul 2004 21:01:14 -0000	1.11
  @@ -25,9 +25,9 @@
   <!-- ========== Initialize Properties ===================================== -->
   
   
  -  <property file="${user.home}/build.properties"/>   <!-- User local        -->
     <property file="build.properties"/>                <!-- Component local   -->
     <property file="../build.properties"/>             <!-- Commons local     -->
  +  <property file="${user.home}/build.properties"/>   <!-- User local        -->
   
   
   <!-- ========== External Dependencies ===================================== -->
  @@ -35,7 +35,7 @@
   
     <!-- The home directory for the Servlet 2.4 and JSP 2.0 classes
          distribution -->
  -  <property name="api.home" value="../jakarta-servletapi-5"/>
  +  <property name="api.home" value="../../jakarta-servletapi-5"/>
   
     <!-- The directory containing your binary distribution of JUnit,
          version 3.7 or later -->
  @@ -85,7 +85,6 @@
     <!-- The base directory for unit test sources -->
     <property name="test.home"               value="src/test"/>
   
  -  <property name="commons-el.jar" value="${dist.home}/commons-${component.name}.jar" />
   
   <!-- ========== Compiler Defaults ========================================= -->
   
  @@ -104,7 +103,7 @@
       <pathelement location="${build.home}/classes"/>
       <pathelement location="${servlet-api.jar}"/>
       <pathelement location="${jsp-api.jar}"/>
  -    <pathelement location="${commons.logging.jar}"/>
  +    <pathelement location="${commons-logging.jar}"/>
     </path>
   
   
  @@ -264,7 +263,7 @@
                tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
       <copy      file="NOTICE.txt"
                tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
  -    <jar    jarfile="${commons-el.jar}"
  +    <jar    jarfile="${dist.home}/commons-${component.name}.jar"
              manifest="${build.home}/conf/MANIFEST.MF">
        <fileset dir="${build.home}/classes" includes="org/apache/commons/el/**" />
        <fileset dir="${build.home}/classes" includes="META-INF/LICENSE.txt" />
  @@ -281,7 +280,7 @@
                tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
       <copy      file="NOTICE.txt"
                tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
  -    <jar    jarfile="${commons-el.jar}"
  +    <jar    jarfile="${dist.home}/commons-${component.name}.jar"
              manifest="${build.home}/classes/META-INF/MANIFEST.MF">
        <fileset dir="${build.home}/classes" includes="org/apache/commons/el/**" />
        <fileset dir="${build.home}/classes" includes="META-INF/LICENSE.txt" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org