| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Wed, 06 May 2015 01:49:55 -0700 | |
| branch | s11-update |
| changeset 4282 | fcfeee656fe9 |
| parent 4134 | components/tomcat/patches/build.xml.patch@b1148b9ffd9b |
| child 5149 | 651acf52b7a3 |
| permissions | -rw-r--r-- |
|
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 |
|
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
9 |
@@ -999,13 +999,6 @@ |
|
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"> |
|
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
23 |
@@ -2744,27 +2737,6 @@ |
|
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}"/>
|
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
51 |
@@ -2775,15 +2747,6 @@ |
|
4134
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
52 |
|
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
</target> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
|
|
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
55 |
- <target name="download-npn" |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
56 |
- description="Download optional NPN" > |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
57 |
- <antcall target="downloadfile"> |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
58 |
- <param name="sourcefile" value="${npn.loc}"/>
|
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
59 |
- <param name="destfile" value="${npn.jar}"/>
|
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
60 |
- <param name="destdir" value="${npn.home}"/>
|
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
61 |
- </antcall> |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
62 |
- </target> |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
63 |
- |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
64 |
<target name="download-test-compile" |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
65 |
description="Download additional components for the tests" > |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
66 |