--- container/catalina/build.xml.old	2009-11-09 23:56:00.957502006 +0200
+++ container/catalina/build.xml	2009-11-09 23:56:18.278516198 +0200
@@ -59,7 +59,7 @@
   <property name="tomcat-http11.jar"
            value="${tomcat-http11.home}/build/lib/tomcat-http11.jar"/>
   <property name="tomcat-dbcp.jar" 
-           value="${base.path}/tomcat-deps/naming-factory-dbcp.jar"/>
+           value="${base.path}/commons-dbcp.jar"/>
   <!-- Construct Catalina classpath -->
   <path id="catalina.classpath">
     <pathelement location="${activation.jar}"/>
--- container/modules/cluster/build.xml.old	2009-11-09 23:56:39.966376844 +0200
+++ container/modules/cluster/build.xml	2009-11-09 23:56:56.992748938 +0200
@@ -37,7 +37,7 @@
     <pathelement location="${commons-modeler.jar}"/>
     <pathelement location="${commons-logging.jar}"/>
     <pathelement location="${jmx.jar}"/>
-    <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
+    <pathelement location="${servlet-api.jar}"/>
   </path>
 
     <!-- Source path -->