--- build.xml.orig 2006-07-05 12:47:26.000000000 -0400 +++ build.xml 2006-07-05 12:50:49.000000000 -0400 @@ -144,50 +144,56 @@ <pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar"/> <pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar"/> <pathelement path="../org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar"/> - <pathelement path="catalina.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/catalina.jar"/> - <pathelement path="bootstrap.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/bootstrap.jar"/> - <pathelement path="commons-beanutils.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-beanutils.jar"/> - <pathelement path="commons-collections.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-collections.jar"/> - <pathelement path="commons-digester.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-digester.jar"/> - <pathelement path="commons-logging-api.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-logging-api.jar"/> - <pathelement path="commons-modeler.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-modeler.jar"/> - <pathelement path="jakarta-regexp-1.3.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jakarta-regexp-1.3.jar"/> - <pathelement path="jasper-compiler.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-compiler.jar"/> - <pathelement path="jasper-runtime.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-runtime.jar"/> - <pathelement path="mx4j-jmx.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/mx4j-jmx.jar"/> - <pathelement path="naming-common.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-common.jar"/> - <pathelement path="naming-factory.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-factory.jar"/> - <pathelement path="naming-resources.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-resources.jar"/> - <pathelement path="servlet.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlet.jar"/> - <pathelement path="servlets-common.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-common.jar"/> - <pathelement path="servlets-default.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-default.jar"/> - <pathelement path="servlets-invoker.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-invoker.jar"/> - <pathelement path="servlets-manager.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-manager.jar"/> - <pathelement path="tomcat-coyote.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-coyote.jar"/> - <pathelement path="tomcat-http11.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-http11.jar"/> - <pathelement path="tomcat-util.jar"/> - <pathelement path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-util.jar"/> + <pathelement path="lib/catalina.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/> + <pathelement path="lib/catalina-optional.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina-optional.jar"/> + <pathelement path="lib/commons-beanutils.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-beanutils.jar"/> + <pathelement path="lib/commons-collections.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-collections.jar"/> + <pathelement path="lib/commons-digester.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester.jar"/> + <pathelement path="lib/commons-digester-rss.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester-rss.jar"/> + <pathelement path="lib/commons-el.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-el.jar"/> + <pathelement path="lib/commons-logging-api.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-logging-api.jar"/> + <pathelement path="lib/commons-modeler.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-modeler.jar"/> + <pathelement path="lib/jasper-compiler.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-compiler.jar"/> + <pathelement path="lib/jasper-runtime.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/> + <pathelement path="lib/jmx.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/> + <pathelement path="lib/mx4j.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j.jar"/> + <pathelement path="lib/mx4j-impl.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/> + <pathelement path="lib/mx4j-jmx.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/> + <pathelement path="lib/jspapi.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jspapi.jar"/> + <pathelement path="lib/naming-factory.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/> + <pathelement path="lib/naming-resources.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/> + <pathelement path="lib/regexp.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/> + <pathelement path="lib/servletapi5.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servletapi5.jar"/> + <pathelement path="lib/servlets-default.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/> + <pathelement path="lib/tomcat-coyote.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-coyote.jar"/> + <pathelement path="lib/tomcat-http.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-http.jar"/> + <pathelement path="lib/tomcat-util.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/> + <pathelement path="lib/servlets-invoker.jar"/> + <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/> </path> <!-- compile the source code --> <javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >