You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
164 lines
5.8 KiB
164 lines
5.8 KiB
diff --git a/build.xml b/build.xml
|
|
index dbad7cb..101bc57 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -715,12 +715,14 @@
|
|
</fileset>
|
|
</copy>
|
|
<!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
|
|
+<!--
|
|
<copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
|
|
<fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
|
|
<include name="*" />
|
|
<exclude name="jspxml*" />
|
|
</fileset>
|
|
</copy>
|
|
+-->
|
|
|
|
<!-- Convert the message files from UTF-8 to ASCII. This can be removed
|
|
after upgrading to Java 9+ as the minimum JRE and specifying the encoding
|
|
@@ -776,26 +778,32 @@
|
|
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
|
|
|
|
<!-- Servlet 3.0 Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${servlet-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.servlet-api"
|
|
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
|
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
|
license="${tomcat.manifests}/servlet-api.jar.license" />
|
|
+-->
|
|
|
|
<!-- JSP 2.2 Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${jsp-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.jsp-api"
|
|
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
|
|
notice="${tomcat.manifests}/jsp-api.jar.notice"
|
|
license="${tomcat.manifests}/jsp-api.jar.license" />
|
|
+-->
|
|
|
|
<!-- JSP 2.2 EL Implementation JAR File -->
|
|
+<!--
|
|
<jarIt jarfile="${el-api.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
filesId="files.el-api"
|
|
manifest="${tomcat.manifests}/el-api.jar.manifest" />
|
|
+-->
|
|
|
|
<!-- Bootstrap JAR File -->
|
|
<jarIt jarfile="${bootstrap.jar}"
|
|
@@ -854,9 +862,9 @@
|
|
filesId="files.jasper-el" />
|
|
|
|
<!-- Re-packaged Apache Commons DBCP 1-->
|
|
- <jarIt jarfile="${tomcat-dbcp.jar}"
|
|
+<!-- <jarIt jarfile="${tomcat-dbcp.jar}"
|
|
filesDir="${tomcat.classes}"
|
|
- filesId="files.tomcat-dbcp" />
|
|
+ filesId="files.tomcat-dbcp" /> -->
|
|
|
|
<!-- i18n JARs -->
|
|
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
|
|
@@ -1087,9 +1095,9 @@
|
|
|
|
<target name="deploy" depends="package,build-docs,compile-webapp-examples"
|
|
description="Default. Builds a working Tomcat instance">
|
|
-
|
|
+<!--
|
|
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
|
|
-
|
|
+-->
|
|
<!-- Copy scripts -->
|
|
<copy todir="${tomcat.build}/bin">
|
|
<fileset dir="bin">
|
|
@@ -1149,7 +1157,7 @@
|
|
<exclude name="${jdt.jar.filename}"/>
|
|
</fileset>
|
|
</delete>
|
|
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
|
|
+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
|
|
|
|
<!-- Add sources for examples -->
|
|
<antcall target="examples-sources" />
|
|
@@ -1839,7 +1847,7 @@
|
|
|
|
<target name="extras-webservices-prepare"
|
|
depends="extras-prepare"
|
|
- description="Prepare to build web services extras package">
|
|
+ description="Prepare to build web services extras package" unless="noget">
|
|
|
|
<antcall target="downloadfile">
|
|
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
|
|
@@ -2034,11 +2042,12 @@
|
|
</copy>
|
|
|
|
<!-- Source bundles for native components -->
|
|
+<!--
|
|
<copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
|
|
file="${tomcat-native.tar.gz}" />
|
|
<copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
|
|
file="${commons-daemon.native.src.tgz}" />
|
|
-
|
|
+-->
|
|
<!-- platform README files -->
|
|
<echo append="false" file="${tomcat.dist}/bin/x64/README">
|
|
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
<path location="${ant.core.lib}"/>
|
|
</classpath>
|
|
</javadoc>
|
|
+<!--
|
|
<javadoc packagenames="javax.servlet.*"
|
|
excludepackagenames="javax.servlet.jsp.*"
|
|
sourcepath="${tomcat.dist}/src/java"
|
|
@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
<path location="${ant.core.lib}"/>
|
|
</classpath>
|
|
</javadoc>
|
|
+-->
|
|
<javadoc packagenames="javax.websocket.*"
|
|
sourcepath="${tomcat.dist}/src/java"
|
|
destdir="${tomcat.dist}/webapps/docs/websocketapi"
|
|
@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
|
|
<path location="${ant.core.lib}"/>
|
|
</classpath>
|
|
<link href="../annotationapi"/>
|
|
+<!--
|
|
<link href="../servletapi"/>
|
|
<link href="../jspapi"/>
|
|
<link href="../elapi"/>
|
|
+-->
|
|
<link href="../websocketapi"/>
|
|
<link href="https://docs.oracle.com/javase/7/docs/api/"/>
|
|
<link href="https://docs.oracle.com/javaee/6/api/"/>
|
|
@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
|
|
</target>
|
|
|
|
<target name="download-compile"
|
|
- description="Download components necessary to compile" >
|
|
+ description="Download components necessary to compile" unless="noget" >
|
|
|
|
<!-- Download Commons Daemon -->
|
|
<antcall target="downloadgz-2">
|
|
@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
|
|
</target>
|
|
|
|
<target name="download-test-compile"
|
|
- description="Download additional components for the tests" >
|
|
+ description="Download additional components for the tests" unless="noget">
|
|
|
|
<antcall target="downloadfile">
|
|
<param name="sourcefile" value="${junit.loc}"/>
|
|
@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" />
|
|
</target>
|
|
|
|
<target name="download-dist"
|
|
- description="Download additional components for a distribution" >
|
|
+ description="Download additional components for a distribution" unless="noget">
|
|
|
|
<antcall target="downloadfile-2">
|
|
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|