--- container/catalina/build.xml.sav 2006-03-23 16:46:37.000000000 +0100 +++ container/catalina/build.xml 2006-03-23 16:47:44.000000000 +0100 @@ -42,7 +42,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.sav 2006-03-23 16:49:04.000000000 +0100 +++ container/modules/cluster/build.xml 2006-03-23 16:49:54.000000000 +0100 @@ -20,7 +20,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 -->