components/tomcat-8/patches/build.xml.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Tue, 29 Dec 2015 08:23:34 -0800
branchs11u3-sru
changeset 5318 efa7f7393e63
parent 4282 fcfeee656fe9
child 5506 8288047a41d7
permissions -rw-r--r--
22363179 Upgrade Apache Tomcat to version 8.0.30
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
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     7
--- build.xml
b1148b9ffd9b 20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents: 2602
diff changeset
     8
+++ build.xml
5318
efa7f7393e63 22363179 Upgrade Apache Tomcat to version 8.0.30
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4282
diff changeset
     9
@@ -988,13 +988,6 @@
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    10
   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    11
           description="Default. Builds a working Tomcat instance">
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
 
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
-            file="${tomcat-native.tar.gz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
-    <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
    16
-            file="${commons-daemon.native.src.tgz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
-    <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
    19
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
     <!-- Copy scripts -->
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
     <copy todir="${tomcat.build}/bin">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
       <fileset dir="bin">
5318
efa7f7393e63 22363179 Upgrade Apache Tomcat to version 8.0.30
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4282
diff changeset
    23
@@ -2796,27 +2789,6 @@
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    24
   <target name="download-compile"
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    25
           description="Download (and build) components necessary to compile" >
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
 
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    27
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    28
-      <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
    29
-      <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
    30
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
-    <!-- Download Commons Daemon -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    35
-    <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    36
-      <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
    37
-      <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
    38
-      <param name="destfile" value="${commons-daemon.jar}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    41
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset
    42
-      <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
    43
-      <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
    44
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    45
-      <param name="destdir" value="${commons-daemon.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    46
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    47
-
4282
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    48
     <!-- Download JDT (Eclipse compiler) -->
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    49
     <antcall target="downloadfile-2">
fcfeee656fe9 PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4134
diff changeset
    50
       <param name="sourcefile.1" value="${jdt.loc.1}"/>