--- tools/ant/properties/extrapath.properties.sav	2006-09-07 10:50:45.000000000 +0200

+++ tools/ant/properties/extrapath.properties	2006-09-07 10:54:08.000000000 +0200

@@ -1,15 +1,15 @@

 #

 # Extra jars/zips/classes

 #

-jndi=${javatools.dir}/jndi/jndi.jar;${javatools.dir}/jndi/providerutil.jar;${javatools.dir}/jndi/ldap.jar

-oro=${javatools.dir}/jakarta-oro-2.0.8.jar

-servlet24=${javatools.dir}/geronimo-spec-servlet-2.4-rc4.jar

+jndi=${j14lib}/rt.jar

+oro=${javatools.dir}/oro.jar

+servlet24=${javatools.dir}/servletapi5.jar

 jcc=${javatools.dir}/db2jcc.jar

 jcc_l=${javatools.dir}/db2jcc_license_c.jar

 osgi=${javatools.dir}/osgi.jar

-xercesImpl=${javatools.dir}/xslt4j-2_5_0/xercesImpl.jar

-xml-apis=${javatools.dir}/xslt4j-2_5_0/xml-apis.jar

-xalan=${javatools.dir}/xslt4j-2_5_0/xalan.jar

+xercesImpl=${javatools.dir}/xerces-j2.jar

+xml-apis=${javatools.dir}/xml-commons-apis.jar

+xalan=${javatools.dir}/xalan-j2.jar

 javacc=${javatools.dir}/javacc.jar

 #