--- catalina/build.xml.orig	Tue Sep 11 00:05:17 2001
+++ catalina/build.xml	Tue Sep 11 13:20:36 2001
@@ -25,14 +25,18 @@
   <property name="activation.jar"  value="${activation.home}/activation.jar"/>
   <property name="jaxp.jar"        value="${catalina.jaxp.home}/jaxp.jar"/>
   <property name="parser.jar"      value="${catalina.jaxp.home}/${catalina.jaxp.parser.jar}"/>
-  <property name="jcert.jar"       value="${jsse.home}/lib/jcert.jar"/>
-  <property name="jndi.jar"        value="${jndi.home}/lib/jndi.jar"/>
-  <property name="jnet.jar"        value="${jsse.home}/lib/jnet.jar"/>
-  <property name="jsse.jar"        value="${jsse.home}/lib/jsse.jar"/>
-  <property name="jmxri.jar"       value="${jmx.home}/lib/jmxri.jar"/>
+  <property name="jsse.lib"        value="${jsse.home}/lib/"/>
+  <property name="jmx.lib"         value="${jmx.home}/lib/"/>
+  <property name="jndi.lib"        value="${jndi.home}/lib/"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="jcert.jar"       value="${jsse.lib}/jcert.jar"/>
+  <property name="jndi.jar"        value="${jndi.lib}/jndi.jar"/>
+  <property name="jnet.jar"        value="${jsse.lib}/jnet.jar"/>
+  <property name="jsse.jar"        value="${jsse.lib}/jsse.jar"/>
+  <property name="jmxri.jar"       value="${jmx.lib}/jmxri.jar"/>
   <property name="mail.jar"        value="${mail.home}/mail.jar"/>
   <property name="regexp.jar"      value="${regexp.home}/jakarta-regexp-1.2.jar"/>
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
   <!-- Construct Catalina classpath -->
   <path id="catalina.classpath">
--- webapps/examples/build.xml.orig	Mon Sep 10 21:03:01 2001
+++ webapps/examples/build.xml	Tue Sep 11 13:26:51 2001
@@ -16,10 +16,12 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="jndi.lib"        value="${jndi.home}/lib/"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
   <property name="mail.jar"        value="${mail.home}/mail.jar"/>
   <property name="activation.jar"  value="${activation.home}/activation.jar"/>
-  <property name="jndi.jar"        value="${jndi.home}/lib/jndi.jar"/>
+  <property name="jndi.jar"        value="${jndi.lib}/jndi.jar"/>
 
 
   <!-- =================== BUILD: Create Directories ====================== -->
--- webapps/webdav/build.xml.orig	Tue May 22 01:36:13 2001
+++ webapps/webdav/build.xml	Tue Sep 11 13:29:30 2001
@@ -16,7 +16,8 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
 
   <!-- =================== BUILD: Create Directories ====================== -->
--- jasper/build.xml.orig	Tue Sep 11 00:05:28 2001
+++ jasper/build.xml	Tue Sep 11 13:32:13 2001
@@ -20,9 +20,10 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
   <property name="jaxp.jar"        value="${jasper.jaxp.home}/jaxp.jar"/>
   <property name="parser.jar"      value="${jasper.jaxp.home}/${jasper.jaxp.parser.jar}"/>
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
   <property name="tools.jar"       value="${java.home}/lib/tools.jar"/>
 
 
--- webapps/build.xml.orig	Mon Sep 10 11:18:34 2001
+++ webapps/build.xml	Tue Sep 11 14:05:31 2001
@@ -16,7 +16,8 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
 
   <!-- =================== BUILD: Create Directories ====================== -->
--- tester/build.xml.org	Mon Aug 20 11:32:38 2001
+++ tester/build.xml	Tue Sep 11 14:09:07 2001
@@ -15,8 +15,10 @@
   <property name="xerces.home"     value="../../xerces-1_3_0"/>
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="ant.jar"         value="${ant.home}/lib/ant.jar"/>
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="antlib.lib"      value="${ant.home}/lib/"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="ant.jar"         value="${ant.lib}/ant.jar"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
   <property name="xerces.jar"      value="${xerces.home}/xerces.jar"/>
 
   <!-- =================== BUILD: Create Directories ====================== -->
--- webapps/manager/build.xml.orig	Tue May 22 01:36:10 2001
+++ webapps/manager/build.xml	Tue Sep 11 14:12:40 2001
@@ -16,7 +16,8 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
 
   <!-- =================== BUILD: Create Directories ====================== -->
--- webapps/ROOT/build.xml.orig	Mon Sep 10 11:18:34 2001
+++ webapps/ROOT/build.xml	Tue Sep 11 14:13:57 2001
@@ -16,7 +16,8 @@
 
 
   <!-- ================== Derived Property Values ========================= -->
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servletapi.lib"  value="${servletapi.home}/lib/"/>
+  <property name="servlet.jar"     value="${servletapi.lib}/servlet.jar"/>
 
 
   <!-- =================== BUILD: Create Directories ====================== -->