1 |
commit: e976224a98d374714bf21108b29dcffdd26a03a7 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 13 17:22:48 2018 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 13 17:23:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e976224a |
7 |
|
8 |
www-servers/tomcat: version bump for slot 8.5 and 9 |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
www-servers/tomcat/Manifest | 2 + |
13 |
.../tomcat/files/tomcat-8.5.28-build.xml.patch | 258 +++++++++++++++++++++ |
14 |
.../tomcat/files/tomcat-9.0.5-build.xml.patch | 258 +++++++++++++++++++++ |
15 |
www-servers/tomcat/tomcat-8.5.28.ebuild | 157 +++++++++++++ |
16 |
www-servers/tomcat/tomcat-9.0.5.ebuild | 157 +++++++++++++ |
17 |
5 files changed, 832 insertions(+) |
18 |
|
19 |
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest |
20 |
index d464d1d02c2..7dff47cf2b3 100644 |
21 |
--- a/www-servers/tomcat/Manifest |
22 |
+++ b/www-servers/tomcat/Manifest |
23 |
@@ -4,4 +4,6 @@ DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197 |
24 |
DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 |
25 |
DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc |
26 |
DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab |
27 |
+DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5 |
28 |
DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557 |
29 |
+DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84 |
30 |
|
31 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..e08dd17c6cc |
34 |
--- /dev/null |
35 |
+++ b/www-servers/tomcat/files/tomcat-8.5.28-build.xml.patch |
36 |
@@ -0,0 +1,258 @@ |
37 |
+diff --git a/build.xml b/build.xml |
38 |
+index 2b3c7cf..b8e57e0 100644 |
39 |
+--- a/build.xml |
40 |
++++ b/build.xml |
41 |
+@@ -717,24 +717,29 @@ |
42 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
43 |
+ |
44 |
+ <!-- Servlet 3.1 Implementation JAR File --> |
45 |
++<!-- |
46 |
+ <jarIt jarfile="${servlet-api.jar}" |
47 |
+ filesDir="${tomcat.classes}" |
48 |
+ filesId="files.servlet-api" |
49 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
50 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
51 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
52 |
+- |
53 |
++--> |
54 |
+ <!-- JSP 2.3 Implementation JAR File --> |
55 |
++<!-- |
56 |
+ <jarIt jarfile="${jsp-api.jar}" |
57 |
+ filesDir="${tomcat.classes}" |
58 |
+ filesId="files.jsp-api" |
59 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
60 |
++--> |
61 |
+ |
62 |
+ <!-- EL 3.0 Implementation JAR File --> |
63 |
++<!-- |
64 |
+ <jarIt jarfile="${el-api.jar}" |
65 |
+ filesDir="${tomcat.classes}" |
66 |
+ filesId="files.el-api" |
67 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
68 |
++--> |
69 |
+ |
70 |
+ <!-- WebSocket 1.1 API JAR File --> |
71 |
+ <jarIt jarfile="${websocket-api.jar}" |
72 |
+@@ -1010,9 +1015,9 @@ |
73 |
+ |
74 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
75 |
+ description="Default. Builds a working Tomcat instance"> |
76 |
+- |
77 |
++<!-- |
78 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
79 |
+- |
80 |
++--> |
81 |
+ <!-- Copy scripts --> |
82 |
+ <copy todir="${tomcat.build}/bin"> |
83 |
+ <fileset dir="bin"> |
84 |
+@@ -1072,7 +1077,7 @@ |
85 |
+ <exclude name="${jdt.jar.filename}"/> |
86 |
+ </fileset> |
87 |
+ </delete> |
88 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
89 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
90 |
+ |
91 |
+ <!-- Add sources for examples --> |
92 |
+ <antcall target="examples-sources" /> |
93 |
+@@ -1106,7 +1111,7 @@ |
94 |
+ </javac> |
95 |
+ </target> |
96 |
+ |
97 |
+- <target name="build-tomcat-jdbc" depends="package"> |
98 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
99 |
+ <!-- build the jdbc-pool jar and source jar--> |
100 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
101 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
102 |
+@@ -1121,7 +1126,7 @@ |
103 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
104 |
+ </target> |
105 |
+ |
106 |
+- <target name="build-tomcat-jdbc-src"> |
107 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
108 |
+ <!-- build the jdbc-pool source jar--> |
109 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
110 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
111 |
+@@ -1225,9 +1230,11 @@ |
112 |
+ |
113 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
114 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
115 |
++<!-- |
116 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
117 |
+ failonerror="false"/> |
118 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
119 |
++--> |
120 |
+ <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
121 |
+ |
122 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
123 |
+@@ -1610,7 +1617,7 @@ |
124 |
+ |
125 |
+ <target name="extras-webservices-prepare" |
126 |
+ depends="extras-prepare" |
127 |
+- description="Prepare to build web services extras package"> |
128 |
++ description="Prepare to build web services extras package" unless="noget"> |
129 |
+ |
130 |
+ <antcall target="downloadfile"> |
131 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
132 |
+@@ -1750,11 +1757,12 @@ |
133 |
+ </copy> |
134 |
+ |
135 |
+ <!-- Source bundles for native components --> |
136 |
++<!-- |
137 |
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
138 |
+ file="${tomcat-native.tar.gz}" /> |
139 |
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
140 |
+ file="${commons-daemon.native.src.tgz}" /> |
141 |
+- |
142 |
++--> |
143 |
+ <!-- platform README files --> |
144 |
+ <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
145 |
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
146 |
+@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
147 |
+ |
148 |
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
149 |
+ description="Create the Tomcat javadoc" > |
150 |
++<!-- |
151 |
+ <javadoc packagenames="javax.servlet.*" |
152 |
+ excludepackagenames="javax.servlet.jsp.*" |
153 |
+ sourcepath="${tomcat.dist}/src/java" |
154 |
+@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
155 |
+ <path location="${ant.core.lib}"/> |
156 |
+ </classpath> |
157 |
+ </javadoc> |
158 |
++--> |
159 |
+ <javadoc packagenames="javax.websocket.*" |
160 |
+ sourcepath="${tomcat.dist}/src/java" |
161 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
162 |
+@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
163 |
+ <path refid="tomcat.webservices.classpath"/> |
164 |
+ <path location="${ant.core.lib}"/> |
165 |
+ </classpath> |
166 |
++<!-- |
167 |
+ <link href="../servletapi"/> |
168 |
+ <link href="../jspapi"/> |
169 |
+ <link href="../elapi"/> |
170 |
++--> |
171 |
+ <link href="../websocketapi"/> |
172 |
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
173 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
174 |
+@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" /> |
175 |
+ </target> |
176 |
+ |
177 |
+ <target name="download-compile" |
178 |
+- description="Download (and build) components necessary to compile" > |
179 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
180 |
+ |
181 |
+ <!-- Download Commons Daemon --> |
182 |
+ <antcall target="downloadgz-2"> |
183 |
+@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" /> |
184 |
+ </target> |
185 |
+ |
186 |
+ <target name="download-test-compile" |
187 |
+- description="Download additional components for the tests" > |
188 |
++ description="Download additional components for the tests" unless="noget"> |
189 |
+ |
190 |
+ <antcall target="downloadfile"> |
191 |
+ <param name="sourcefile" value="${junit.loc}"/> |
192 |
+@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" /> |
193 |
+ </target> |
194 |
+ |
195 |
+ <target name="download-dist" |
196 |
+- description="Download additional components for a distribution" > |
197 |
++ description="Download additional components for a distribution" unless="noget"> |
198 |
+ |
199 |
+ <antcall target="downloadfile-2"> |
200 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
201 |
+@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" /> |
202 |
+ |
203 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
204 |
+ |
205 |
+- <target name="setproxy" if="${proxy.use}"> |
206 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
207 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
208 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
209 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
210 |
+ </target> |
211 |
+ |
212 |
+- <target name="testexist"> |
213 |
++ <target name="testexist" unless="noget"> |
214 |
+ <echo message="Testing for ${destfile}"/> |
215 |
+ <available file="${destfile}" property="exist"/> |
216 |
+ </target> |
217 |
+ |
218 |
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
219 |
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
220 |
+ <!-- Download and extract the package --> |
221 |
+ <local name="temp.file"/> |
222 |
+ <mkdir dir="${base.path}"/> |
223 |
+@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" /> |
224 |
+ <delete file="${temp.file}.tar.gz"/> |
225 |
+ </target> |
226 |
+ |
227 |
+- <target name="downloadgz-2" unless="exist" depends="testexist"> |
228 |
++ <target name="downloadgz-2" unless="noget" depends="testexist"> |
229 |
+ <!-- Download and extract the package from the two alternative locations --> |
230 |
+ <local name="temp.file"/> |
231 |
+ <mkdir dir="${base.path}"/> |
232 |
+@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" /> |
233 |
+ <delete file="${temp.file}.tar.gz"/> |
234 |
+ </target> |
235 |
+ |
236 |
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
237 |
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
238 |
+ <!-- Download and extract the package --> |
239 |
+ <local name="temp.file"/> |
240 |
+ <mkdir dir="${base.path}"/> |
241 |
+@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" /> |
242 |
+ <delete file="${temp.file}"/> |
243 |
+ </target> |
244 |
+ |
245 |
+- <target name="downloadzip-2" unless="exist" depends="testexist"> |
246 |
++ <target name="downloadzip-2" unless="noget" depends="testexist"> |
247 |
+ <!-- Download and extract the package from the two alternative locations --> |
248 |
+ <local name="temp.file"/> |
249 |
+ <mkdir dir="${base.path}"/> |
250 |
+@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" /> |
251 |
+ <delete file="${temp.file}"/> |
252 |
+ </target> |
253 |
+ |
254 |
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
255 |
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
256 |
+ <!-- Download the file --> |
257 |
+ <local name="temp.file"/> |
258 |
+ <mkdir dir="${base.path}"/> |
259 |
+@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" /> |
260 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
261 |
+ </target> |
262 |
+ |
263 |
+- <target name="downloadfile-2" unless="exist" depends="testexist"> |
264 |
++ <target name="downloadfile-2" unless="noget" depends="testexist"> |
265 |
+ <!-- Download the file from the two alternative locations --> |
266 |
+ <local name="temp.file"/> |
267 |
+ <mkdir dir="${base.path}"/> |
268 |
+@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" /> |
269 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
270 |
+ </target> |
271 |
+ |
272 |
+- <target name="trydownload.check" depends="setproxy"> |
273 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
274 |
+ <condition property="trydownload.run"> |
275 |
+ <and> |
276 |
+ <not> |
277 |
+@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" /> |
278 |
+ </condition> |
279 |
+ </target> |
280 |
+ |
281 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
282 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
283 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
284 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
285 |
+ </target> |
286 |
+@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" /> |
287 |
+ |
288 |
+ <target name="ide-eclipse" |
289 |
+ depends="download-compile, extras-webservices-prepare, download-test-compile" |
290 |
+- description="Prepares the source tree to be built in Eclipse"> |
291 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
292 |
+ |
293 |
+ <!-- Copy the sample project files into the root directory --> |
294 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
295 |
|
296 |
diff --git a/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch |
297 |
new file mode 100644 |
298 |
index 00000000000..87f869dd4c0 |
299 |
--- /dev/null |
300 |
+++ b/www-servers/tomcat/files/tomcat-9.0.5-build.xml.patch |
301 |
@@ -0,0 +1,258 @@ |
302 |
+diff --git a/build.xml b/build.xml |
303 |
+index c1331c9..b664cc3 100644 |
304 |
+--- a/build.xml |
305 |
++++ b/build.xml |
306 |
+@@ -719,24 +719,30 @@ |
307 |
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
308 |
+ |
309 |
+ <!-- Servlet 4.0 Implementation JAR File --> |
310 |
++<!-- |
311 |
+ <jarIt jarfile="${servlet-api.jar}" |
312 |
+ filesDir="${tomcat.classes}" |
313 |
+ filesId="files.servlet-api" |
314 |
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
315 |
+ notice="${tomcat.manifests}/servlet-api.jar.notice" |
316 |
+ license="${tomcat.manifests}/servlet-api.jar.license" /> |
317 |
++--> |
318 |
+ |
319 |
+ <!-- JSP 2.3 Implementation JAR File --> |
320 |
++<!-- |
321 |
+ <jarIt jarfile="${jsp-api.jar}" |
322 |
+ filesDir="${tomcat.classes}" |
323 |
+ filesId="files.jsp-api" |
324 |
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
325 |
++--> |
326 |
+ |
327 |
+ <!-- EL 3.0 Implementation JAR File --> |
328 |
++<!-- |
329 |
+ <jarIt jarfile="${el-api.jar}" |
330 |
+ filesDir="${tomcat.classes}" |
331 |
+ filesId="files.el-api" |
332 |
+ manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
333 |
++--> |
334 |
+ |
335 |
+ <!-- WebSocket 1.1 API JAR File --> |
336 |
+ <jarIt jarfile="${websocket-api.jar}" |
337 |
+@@ -1012,9 +1018,9 @@ |
338 |
+ |
339 |
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
340 |
+ description="Default. Builds a working Tomcat instance"> |
341 |
+- |
342 |
++<!-- |
343 |
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
344 |
+- |
345 |
++--> |
346 |
+ <!-- Copy scripts --> |
347 |
+ <copy todir="${tomcat.build}/bin"> |
348 |
+ <fileset dir="bin"> |
349 |
+@@ -1074,7 +1080,7 @@ |
350 |
+ <exclude name="${jdt.jar.filename}"/> |
351 |
+ </fileset> |
352 |
+ </delete> |
353 |
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
354 |
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
355 |
+ |
356 |
+ <!-- Add sources for examples --> |
357 |
+ <antcall target="examples-sources" /> |
358 |
+@@ -1108,7 +1114,7 @@ |
359 |
+ </javac> |
360 |
+ </target> |
361 |
+ |
362 |
+- <target name="build-tomcat-jdbc" depends="package"> |
363 |
++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
364 |
+ <!-- build the jdbc-pool jar and source jar--> |
365 |
+ <echo message="Building Tomcat JDBC pool libraries"/> |
366 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
367 |
+@@ -1123,7 +1129,7 @@ |
368 |
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
369 |
+ </target> |
370 |
+ |
371 |
+- <target name="build-tomcat-jdbc-src"> |
372 |
++ <target name="build-tomcat-jdbc-src" unless="noget"> |
373 |
+ <!-- build the jdbc-pool source jar--> |
374 |
+ <echo message="Building Tomcat JDBC pool src JAR"/> |
375 |
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
376 |
+@@ -1227,9 +1233,11 @@ |
377 |
+ |
378 |
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
379 |
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
380 |
++<!-- |
381 |
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
382 |
+ failonerror="false"/> |
383 |
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
384 |
++--> |
385 |
+ <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
386 |
+ |
387 |
+ <!-- Note the meta-inf below will work as long as there is only one JAR |
388 |
+@@ -1612,7 +1620,7 @@ |
389 |
+ |
390 |
+ <target name="extras-webservices-prepare" |
391 |
+ depends="extras-prepare" |
392 |
+- description="Prepare to build web services extras package"> |
393 |
++ description="Prepare to build web services extras package" unless="noget"> |
394 |
+ |
395 |
+ <antcall target="downloadfile"> |
396 |
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
397 |
+@@ -1752,11 +1760,12 @@ |
398 |
+ </copy> |
399 |
+ |
400 |
+ <!-- Source bundles for native components --> |
401 |
++<!-- |
402 |
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
403 |
+ file="${tomcat-native.tar.gz}" /> |
404 |
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
405 |
+ file="${commons-daemon.native.src.tgz}" /> |
406 |
+- |
407 |
++--> |
408 |
+ <!-- platform README files --> |
409 |
+ <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
410 |
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
411 |
+@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
412 |
+ |
413 |
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
414 |
+ description="Create the Tomcat javadoc" > |
415 |
++<!-- |
416 |
+ <javadoc packagenames="javax.servlet.*" |
417 |
+ excludepackagenames="javax.servlet.jsp.*" |
418 |
+ sourcepath="${tomcat.dist}/src/java" |
419 |
+@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
420 |
+ <path location="${ant.core.lib}"/> |
421 |
+ </classpath> |
422 |
+ </javadoc> |
423 |
++--> |
424 |
+ <javadoc packagenames="javax.websocket.*" |
425 |
+ sourcepath="${tomcat.dist}/src/java" |
426 |
+ destdir="${tomcat.dist}/webapps/docs/websocketapi" |
427 |
+@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
428 |
+ <path refid="tomcat.webservices.classpath"/> |
429 |
+ <path location="${ant.core.lib}"/> |
430 |
+ </classpath> |
431 |
++<!-- |
432 |
+ <link href="../servletapi"/> |
433 |
+ <link href="../jspapi"/> |
434 |
+ <link href="../elapi"/> |
435 |
++--> |
436 |
+ <link href="../websocketapi"/> |
437 |
+ <link href="http://docs.oracle.com/javase/8/docs/api/"/> |
438 |
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
439 |
+@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" /> |
440 |
+ </target> |
441 |
+ |
442 |
+ <target name="download-compile" |
443 |
+- description="Download (and build) components necessary to compile" > |
444 |
++ description="Download (and build) components necessary to compile" unless="noget"> |
445 |
+ |
446 |
+ <!-- Download Commons Daemon --> |
447 |
+ <antcall target="downloadgz-2"> |
448 |
+@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" /> |
449 |
+ </target> |
450 |
+ |
451 |
+ <target name="download-test-compile" |
452 |
+- description="Download additional components for the tests" > |
453 |
++ description="Download additional components for the tests" unless="noget"> |
454 |
+ |
455 |
+ <antcall target="downloadfile"> |
456 |
+ <param name="sourcefile" value="${junit.loc}"/> |
457 |
+@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" /> |
458 |
+ </target> |
459 |
+ |
460 |
+ <target name="download-dist" |
461 |
+- description="Download additional components for a distribution" > |
462 |
++ description="Download additional components for a distribution" unless="noget"> |
463 |
+ |
464 |
+ <antcall target="downloadfile-2"> |
465 |
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
466 |
+@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" /> |
467 |
+ |
468 |
+ <!-- =============== Utility Targets to support downloads ================ --> |
469 |
+ |
470 |
+- <target name="setproxy" if="${proxy.use}"> |
471 |
++ <target name="setproxy" if="${proxy.use}" unless="noget"> |
472 |
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
473 |
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
474 |
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
475 |
+ </target> |
476 |
+ |
477 |
+- <target name="testexist"> |
478 |
++ <target name="testexist" unless="noget"> |
479 |
+ <echo message="Testing for ${destfile}"/> |
480 |
+ <available file="${destfile}" property="exist"/> |
481 |
+ </target> |
482 |
+ |
483 |
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
484 |
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
485 |
+ <!-- Download and extract the package --> |
486 |
+ <local name="temp.file"/> |
487 |
+ <mkdir dir="${base.path}"/> |
488 |
+@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" /> |
489 |
+ <delete file="${temp.file}.tar.gz"/> |
490 |
+ </target> |
491 |
+ |
492 |
+- <target name="downloadgz-2" unless="exist" depends="testexist"> |
493 |
++ <target name="downloadgz-2" unless="noget" depends="testexist"> |
494 |
+ <!-- Download and extract the package from the two alternative locations --> |
495 |
+ <local name="temp.file"/> |
496 |
+ <mkdir dir="${base.path}"/> |
497 |
+@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" /> |
498 |
+ <delete file="${temp.file}.tar.gz"/> |
499 |
+ </target> |
500 |
+ |
501 |
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
502 |
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
503 |
+ <!-- Download and extract the package --> |
504 |
+ <local name="temp.file"/> |
505 |
+ <mkdir dir="${base.path}"/> |
506 |
+@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" /> |
507 |
+ <delete file="${temp.file}"/> |
508 |
+ </target> |
509 |
+ |
510 |
+- <target name="downloadzip-2" unless="exist" depends="testexist"> |
511 |
++ <target name="downloadzip-2" unless="noget" depends="testexist"> |
512 |
+ <!-- Download and extract the package from the two alternative locations --> |
513 |
+ <local name="temp.file"/> |
514 |
+ <mkdir dir="${base.path}"/> |
515 |
+@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" /> |
516 |
+ <delete file="${temp.file}"/> |
517 |
+ </target> |
518 |
+ |
519 |
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
520 |
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
521 |
+ <!-- Download the file --> |
522 |
+ <local name="temp.file"/> |
523 |
+ <mkdir dir="${base.path}"/> |
524 |
+@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" /> |
525 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
526 |
+ </target> |
527 |
+ |
528 |
+- <target name="downloadfile-2" unless="exist" depends="testexist"> |
529 |
++ <target name="downloadfile-2" unless="noget" depends="testexist"> |
530 |
+ <!-- Download the file from the two alternative locations --> |
531 |
+ <local name="temp.file"/> |
532 |
+ <mkdir dir="${base.path}"/> |
533 |
+@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" /> |
534 |
+ <move file="${temp.file}" tofile="${destfile}"/> |
535 |
+ </target> |
536 |
+ |
537 |
+- <target name="trydownload.check" depends="setproxy"> |
538 |
++ <target name="trydownload.check" depends="setproxy" unless="noget"> |
539 |
+ <condition property="trydownload.run"> |
540 |
+ <and> |
541 |
+ <not> |
542 |
+@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" /> |
543 |
+ </condition> |
544 |
+ </target> |
545 |
+ |
546 |
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
547 |
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
548 |
+ <!-- Downloads a file if not yet downloaded and the source URL is available --> |
549 |
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
550 |
+ </target> |
551 |
+@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" /> |
552 |
+ |
553 |
+ <target name="ide-eclipse" |
554 |
+ depends="download-compile, extras-webservices-prepare, download-test-compile" |
555 |
+- description="Prepares the source tree to be built in Eclipse"> |
556 |
++ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
557 |
+ |
558 |
+ <!-- Copy the sample project files into the root directory --> |
559 |
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
560 |
|
561 |
diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild |
562 |
new file mode 100644 |
563 |
index 00000000000..17a74d0fb02 |
564 |
--- /dev/null |
565 |
+++ b/www-servers/tomcat/tomcat-8.5.28.ebuild |
566 |
@@ -0,0 +1,157 @@ |
567 |
+# Copyright 1999-2018 Gentoo Foundation |
568 |
+# Distributed under the terms of the GNU General Public License v2 |
569 |
+ |
570 |
+EAPI=6 |
571 |
+ |
572 |
+JAVA_PKG_IUSE="doc source test" |
573 |
+ |
574 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
575 |
+ |
576 |
+MY_P="apache-${P}-src" |
577 |
+ |
578 |
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" |
579 |
+HOMEPAGE="https://tomcat.apache.org/" |
580 |
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
581 |
+ |
582 |
+LICENSE="Apache-2.0" |
583 |
+SLOT="8.5" |
584 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
585 |
+IUSE="extra-webapps" |
586 |
+ |
587 |
+RESTRICT="test" # can we run them on a production system? |
588 |
+ |
589 |
+ECJ_SLOT="4.5" |
590 |
+SAPI_SLOT="3.1" |
591 |
+ |
592 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
593 |
+ >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" |
594 |
+RDEPEND="${COMMON_DEP} |
595 |
+ !<dev-java/tomcat-native-1.1.24 |
596 |
+ >=virtual/jre-1.7" |
597 |
+DEPEND="${COMMON_DEP} |
598 |
+ app-admin/pwgen |
599 |
+ >=virtual/jdk-1.7 |
600 |
+ test? ( |
601 |
+ >=dev-java/ant-junit-1.9:0 |
602 |
+ dev-java/easymock:3.2 |
603 |
+ )" |
604 |
+ |
605 |
+S=${WORKDIR}/${MY_P} |
606 |
+ |
607 |
+pkg_setup() { |
608 |
+ java-pkg-2_pkg_setup |
609 |
+ enewgroup tomcat 265 |
610 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
611 |
+} |
612 |
+ |
613 |
+src_prepare() { |
614 |
+ default |
615 |
+ |
616 |
+ find -name '*.jar' -type f -delete -print || die |
617 |
+ |
618 |
+ # Remove bundled servlet-api |
619 |
+ rm -rv java/javax/{el,servlet} || die |
620 |
+ |
621 |
+ epatch "${FILESDIR}/${P}-build.xml.patch" |
622 |
+ |
623 |
+ # For use of catalina.sh in netbeans |
624 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
625 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
626 |
+ bin/catalina.sh || die |
627 |
+ |
628 |
+ java-pkg-2_src_prepare |
629 |
+} |
630 |
+ |
631 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
632 |
+ |
633 |
+EANT_BUILD_TARGET="deploy" |
634 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
635 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
636 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
637 |
+EANT_NEEDS_TOOLS="true" |
638 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" |
639 |
+ |
640 |
+# revisions of the scripts |
641 |
+IM_REV="-r2" |
642 |
+INIT_REV="-r1" |
643 |
+ |
644 |
+src_compile() { |
645 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
646 |
+ java-pkg-2_src_compile |
647 |
+} |
648 |
+ |
649 |
+src_test() { |
650 |
+ java-pkg-2_src_test |
651 |
+} |
652 |
+ |
653 |
+src_install() { |
654 |
+ local dest="/usr/share/${PN}-${SLOT}" |
655 |
+ |
656 |
+ java-pkg_jarinto "${dest}"/bin |
657 |
+ java-pkg_dojar output/build/bin/*.jar |
658 |
+ exeinto "${dest}"/bin |
659 |
+ doexe output/build/bin/*.sh |
660 |
+ |
661 |
+ java-pkg_jarinto "${dest}"/lib |
662 |
+ java-pkg_dojar output/build/lib/*.jar |
663 |
+ |
664 |
+ dodoc RELEASE-NOTES RUNNING.txt |
665 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
666 |
+ use source && java-pkg_dosrc java/* |
667 |
+ |
668 |
+ ### Webapps ### |
669 |
+ |
670 |
+ # add missing docBase |
671 |
+ local apps="host-manager manager" |
672 |
+ for app in ${apps}; do |
673 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
674 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
675 |
+ done |
676 |
+ |
677 |
+ insinto "${dest}"/webapps |
678 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
679 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
680 |
+ |
681 |
+ ### Config ### |
682 |
+ |
683 |
+ # create "logs" directory in $CATALINA_BASE |
684 |
+ # and set correct perms, see #458890 |
685 |
+ dodir "${dest}"/logs |
686 |
+ fperms 0750 "${dest}"/logs |
687 |
+ |
688 |
+ # replace the default pw with a random one, see #92281 |
689 |
+ local randpw="$(pwgen -s -B 15 1)" |
690 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
691 |
+ |
692 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
693 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
694 |
+ |
695 |
+ insinto "${dest}" |
696 |
+ doins -r output/build/conf |
697 |
+ |
698 |
+ ### rc ### |
699 |
+ |
700 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
701 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
702 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
703 |
+ |
704 |
+ insinto "${dest}"/gentoo |
705 |
+ doins "${T}"/tomcat.conf |
706 |
+ exeinto "${dest}"/gentoo |
707 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
708 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
709 |
+} |
710 |
+ |
711 |
+pkg_postinst() { |
712 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
713 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
714 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
715 |
+ |
716 |
+ elog "To manage Tomcat instances, run:" |
717 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
718 |
+ |
719 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
720 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
721 |
+ |
722 |
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
723 |
+} |
724 |
|
725 |
diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild |
726 |
new file mode 100644 |
727 |
index 00000000000..bb86ba9675b |
728 |
--- /dev/null |
729 |
+++ b/www-servers/tomcat/tomcat-9.0.5.ebuild |
730 |
@@ -0,0 +1,157 @@ |
731 |
+# Copyright 1999-2018 Gentoo Foundation |
732 |
+# Distributed under the terms of the GNU General Public License v2 |
733 |
+ |
734 |
+EAPI=6 |
735 |
+ |
736 |
+JAVA_PKG_IUSE="doc source test" |
737 |
+ |
738 |
+inherit eutils java-pkg-2 java-ant-2 prefix user |
739 |
+ |
740 |
+MY_P="apache-${PN}-${PV}-src" |
741 |
+ |
742 |
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" |
743 |
+HOMEPAGE="https://tomcat.apache.org/" |
744 |
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" |
745 |
+ |
746 |
+LICENSE="Apache-2.0" |
747 |
+SLOT="9" |
748 |
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
749 |
+IUSE="extra-webapps" |
750 |
+ |
751 |
+RESTRICT="test" # can we run them on a production system? |
752 |
+ |
753 |
+ECJ_SLOT="4.5" |
754 |
+SAPI_SLOT="4.0" |
755 |
+ |
756 |
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} |
757 |
+ =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" |
758 |
+RDEPEND="${COMMON_DEP} |
759 |
+ !<dev-java/tomcat-native-1.1.24 |
760 |
+ >=virtual/jre-1.8" |
761 |
+DEPEND="${COMMON_DEP} |
762 |
+ app-admin/pwgen |
763 |
+ >=virtual/jdk-1.8 |
764 |
+ test? ( |
765 |
+ >=dev-java/ant-junit-1.9:0 |
766 |
+ dev-java/easymock:3.2 |
767 |
+ )" |
768 |
+ |
769 |
+S=${WORKDIR}/${MY_P} |
770 |
+ |
771 |
+pkg_setup() { |
772 |
+ java-pkg-2_pkg_setup |
773 |
+ enewgroup tomcat 265 |
774 |
+ enewuser tomcat 265 -1 /dev/null tomcat |
775 |
+} |
776 |
+ |
777 |
+src_prepare() { |
778 |
+ default |
779 |
+ |
780 |
+ find -name '*.jar' -type f -delete -print || die |
781 |
+ |
782 |
+ # Remove bundled servlet-api |
783 |
+ rm -rv java/javax/{el,servlet} || die |
784 |
+ |
785 |
+ epatch "${FILESDIR}/${P}-build.xml.patch" |
786 |
+ |
787 |
+ # For use of catalina.sh in netbeans |
788 |
+ sed -i -e "/^# ----- Execute The Requested Command/ a\ |
789 |
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ |
790 |
+ bin/catalina.sh || die |
791 |
+ |
792 |
+ java-pkg-2_src_prepare |
793 |
+} |
794 |
+ |
795 |
+JAVA_ANT_REWRITE_CLASSPATH="true" |
796 |
+ |
797 |
+EANT_BUILD_TARGET="deploy" |
798 |
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" |
799 |
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" |
800 |
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" |
801 |
+EANT_NEEDS_TOOLS="true" |
802 |
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" |
803 |
+ |
804 |
+# revisions of the scripts |
805 |
+IM_REV="-r2" |
806 |
+INIT_REV="-r1" |
807 |
+ |
808 |
+src_compile() { |
809 |
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" |
810 |
+ java-pkg-2_src_compile |
811 |
+} |
812 |
+ |
813 |
+src_test() { |
814 |
+ java-pkg-2_src_test |
815 |
+} |
816 |
+ |
817 |
+src_install() { |
818 |
+ local dest="/usr/share/${PN}-${SLOT}" |
819 |
+ |
820 |
+ java-pkg_jarinto "${dest}"/bin |
821 |
+ java-pkg_dojar output/build/bin/*.jar |
822 |
+ exeinto "${dest}"/bin |
823 |
+ doexe output/build/bin/*.sh |
824 |
+ |
825 |
+ java-pkg_jarinto "${dest}"/lib |
826 |
+ java-pkg_dojar output/build/lib/*.jar |
827 |
+ |
828 |
+ dodoc RELEASE-NOTES RUNNING.txt |
829 |
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api |
830 |
+ use source && java-pkg_dosrc java/* |
831 |
+ |
832 |
+ ### Webapps ### |
833 |
+ |
834 |
+ # add missing docBase |
835 |
+ local apps="host-manager manager" |
836 |
+ for app in ${apps}; do |
837 |
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ |
838 |
+ output/build/webapps/${app}/META-INF/context.xml || die |
839 |
+ done |
840 |
+ |
841 |
+ insinto "${dest}"/webapps |
842 |
+ doins -r output/build/webapps/{host-manager,manager,ROOT} |
843 |
+ use extra-webapps && doins -r output/build/webapps/{docs,examples} |
844 |
+ |
845 |
+ ### Config ### |
846 |
+ |
847 |
+ # create "logs" directory in $CATALINA_BASE |
848 |
+ # and set correct perms, see #458890 |
849 |
+ dodir "${dest}"/logs |
850 |
+ fperms 0750 "${dest}"/logs |
851 |
+ |
852 |
+ # replace the default pw with a random one, see #92281 |
853 |
+ local randpw="$(pwgen -s -B 15 1)" |
854 |
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die |
855 |
+ |
856 |
+ # prepend gentoo.classpath to common.loader, see #453212 |
857 |
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die |
858 |
+ |
859 |
+ insinto "${dest}" |
860 |
+ doins -r output/build/conf |
861 |
+ |
862 |
+ ### rc ### |
863 |
+ |
864 |
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die |
865 |
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} |
866 |
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die |
867 |
+ |
868 |
+ insinto "${dest}"/gentoo |
869 |
+ doins "${T}"/tomcat.conf |
870 |
+ exeinto "${dest}"/gentoo |
871 |
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init |
872 |
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash |
873 |
+} |
874 |
+ |
875 |
+pkg_postinst() { |
876 |
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" |
877 |
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." |
878 |
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" |
879 |
+ |
880 |
+ elog "To manage Tomcat instances, run:" |
881 |
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" |
882 |
+ |
883 |
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" |
884 |
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276" |
885 |
+ |
886 |
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." |
887 |
+} |