blob: 743065130f078306cb21c939b55ceee57c996529 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml
--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100
+++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100
@@ -159,12 +159,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>
+ -->
</target>
@@ -307,19 +309,25 @@
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
<!-- Servlet 2.5 Implementation JAR File -->
+<!--
<jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
license="${tomcat.manifests}/servlet-api.jar.license"
notice="${tomcat.manifests}/servlet-api.jar.notice" />
+-->
<!-- JSP 2.1 Implementation JAR File -->
+<!--
<jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+-->
<!-- JSP 2.1 EL Implementation JAR File -->
+<!--
<jarIt jarfile="${el-api.jar}" filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-->
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
@@ -492,12 +500,14 @@
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
+<!--
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
file="${commons-daemon.native.src.tgz}" />
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-->
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
@@ -649,9 +659,11 @@
</fileset>
</txt2html>
+<!--
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
failonerror="false"/>
<copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
+-->
</target>
|
GitWeb
