components/tomcat/patches/build.xml.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Thu, 25 Feb 2016 01:05:50 -0800
branchs11u3-sru
changeset 5535 ae5bc52953a4
parent 4134 b1148b9ffd9b
child 7317 bd14d5a59818
permissions -rw-r--r--
22817809 Upgrade Apache Tomcat to version 8.0.32 22824943 Upgrade Apache Tomcat to version 6.0.45 22817436 problem in UTILITY/TOMCAT 22817540 problem in UTILITY/TOMCAT
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4134
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     1
Patch origin: in-house
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     2
Patch status: Solaris-specific; not suitable for upstream
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     3
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     4
Download/use only archives we really need.
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     5
Don't install unnecessary stuff.
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     6
Allow to build it with desired JDK version.
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     7
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     8
--- build.xml
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     9
+++ build.xml
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    10
@@ -515,13 +515,6 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
-            file="${tomcat-native.tar.gz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
-            file="${commons-daemon.native.src.tgz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
     <!-- Copy scripts -->
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
     <copy todir="${tomcat.build}/bin">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
       <fileset dir="bin">
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    24
@@ -956,42 +949,6 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
           description="Download (and build as necessary) dependent components"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
 
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    28
-    <!-- Download Apache Tomcat Native -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    29
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    30
-      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    31
-      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
-
2474
c9068cb41676 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset
    36
-    <antcall target="downloadzip-2">
c9068cb41676 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset
    37
-      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
c9068cb41676 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset
    38
-      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
c9068cb41676 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset
    39
-      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    41
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
-
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    43
-    <!-- Download Apache Commons Daemon -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    44
-    <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    45
-      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    46
-      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    47
-      <param name="destfile" value="${commons-daemon.jar}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    48
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    49
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    50
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    51
-      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    52
-      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    53
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    54
-      <param name="destdir" value="${commons-daemon.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    55
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    56
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    57
-    <antcall target="downloadzip-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    58
-      <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    59
-      <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    60
-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    61
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    62
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    63
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    64
     <!-- Build Tomcat DBCP bundle -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    65
     <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    66
       <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    67
@@ -1003,6 +960,11 @@
2602
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    68
       <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    69
       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    70
     </antcall>
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    71
+    <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    72
+    <exec executable="sh">
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    73
+      <arg value="-c" />
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    74
+      <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    75
+    </exec>
5caab247ea3d 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2474
diff changeset
    76
     <mkdir dir="${tomcat-dbcp.home}"/>
4134
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
    77
     <antcall target="build-tomcat-dbcp" />
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
    78
 
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    79
@@ -1014,29 +976,9 @@
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    80
       <param name="destdir" value="${jdt.home}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    81
     </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    82
 
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    83
-    <!-- Download NSIS (Nullsoft Scriptable Install System) -->
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    84
-    <antcall target="downloadzip">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    85
-      <param name="sourcefile" value="${nsis.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    86
-      <param name="destfile" value="${nsis.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    87
-      <param name="destdir" value="${nsis.home}/.."/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    88
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    89
-
5535
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    90
-    <!-- Libraries used for testing. JUnit, Hamcrest -->
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    91
-    <antcall target="downloadfile">
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    92
-      <param name="sourcefile" value="${junit.loc}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    93
-      <param name="destfile" value="${junit.jar}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    94
-      <param name="destdir" value="${junit.home}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    95
-    </antcall>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    96
-
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    97
-    <antcall target="downloadfile">
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    98
-      <param name="sourcefile" value="${hamcrest.loc}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    99
-      <param name="destfile" value="${hamcrest.jar}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
   100
-      <param name="destdir" value="${hamcrest.home}"/>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
   101
-    </antcall>
ae5bc52953a4 22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
   102
-
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   103
   </target>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   104
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   105
-  <target name="build-tomcat-dbcp" unless="jdk16.present"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   106
+  <target name="build-tomcat-dbcp"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   107
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   108
     <copy todir="${tomcat-dbcp.home}">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
   109
       <fileset dir="${commons-pool.home}">