Bumped 5.5 to latest release, removed pre-release version

Package-Manager: portage-2.1.2.1

9 files changed, 661 insertions, 52 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 190cc0b68822..bd1b8fd753d7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -86,46 +86,38 @@ AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06
 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470
-AUX 5.5.22/catalinabuild-xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
-MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5.22/catalinabuild-xml.patch 1149
-RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5.22/catalinabuild-xml.patch 1149
-SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5.22/catalinabuild-xml.patch 1149
-AUX 5.5.22/jasperbuild-xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714
-MD5 0139160e01d9f8c37007e700adc14edd files/5.5.22/jasperbuild-xml.patch 463
-RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5.22/jasperbuild-xml.patch 463
-SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5.22/jasperbuild-xml.patch 463
-AUX 5.5.22/jsr152_examples_build-xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e SHA1 d8d596ce643a30429194f0003d1847c9565059c5 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d
-MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5.22/jsr152_examples_build-xml.patch 403
-RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5.22/jsr152_examples_build-xml.patch 403
-SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5.22/jsr152_examples_build-xml.patch 403
-AUX 5.5.22/jsr152build-xml-examples.patch 812 RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e SHA1 5455201aba4cca42b000477375516a45c380c766 SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0
-MD5 4c33bf7e8bd654980a11408211768a2e files/5.5.22/jsr152build-xml-examples.patch 812
-RMD160 e9449414ef88de3e2b54c094c898d75f13e4c74e files/5.5.22/jsr152build-xml-examples.patch 812
-SHA256 36b91bb7ccb67ca31db41a8217c6762b1aff88b0611319aded08421401d7f9b0 files/5.5.22/jsr152build-xml-examples.patch 812
-AUX 5.5.22/jsr154_examples_build-xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b
-MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5.22/jsr154_examples_build-xml.patch 406
-RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5.22/jsr154_examples_build-xml.patch 406
-SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b files/5.5.22/jsr154_examples_build-xml.patch 406
-AUX 5.5.22/jsr154build-xml-examples.patch 836 RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 SHA1 29a59f40743784327d8be9307c40c291141fa5bf SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191
-MD5 e715be19acef459dbe33804fc0d8b35c files/5.5.22/jsr154build-xml-examples.patch 836
-RMD160 5a0cf4831345c904b5f9b3f89bcbbc0243e676e6 files/5.5.22/jsr154build-xml-examples.patch 836
-SHA256 84a82ef51e8cd0470ea3f388c16f3323024e87b74212ffab65977b5d9792a191 files/5.5.22/jsr154build-xml-examples.patch 836
-AUX 5.5.22/mainbuild-xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa SHA1 225f24dc6acadf6c1d0547feb24b0a227b1b225f SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e
-MD5 ac639b069df018dc62fa4ca532696102 files/5.5.22/mainbuild-xml.patch 892
-RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa files/5.5.22/mainbuild-xml.patch 892
-SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e files/5.5.22/mainbuild-xml.patch 892
-AUX 5.5.22/tomcat.conf 2689 RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 SHA1 a0a7d729d9663af0cd88b89daf39642fcb7c55b8 SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a
-MD5 ab94d0fdf14e7f47df0cb8a64e89f0a2 files/5.5.22/tomcat.conf 2689
-RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 files/5.5.22/tomcat.conf 2689
-SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a files/5.5.22/tomcat.conf 2689
-AUX 5.5.22/tomcat.init 3379 RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 SHA1 e39fc98d9b2ebe73fe7beb429167859fc0f6bf32 SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37
-MD5 d19efb9ba652b5c441913707972e6ed4 files/5.5.22/tomcat.init 3379
-RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 files/5.5.22/tomcat.init 3379
-SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37 files/5.5.22/tomcat.init 3379
-AUX 5.5.22/tomcatbuild-xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9
-MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5.22/tomcatbuild-xml.patch 13828
-RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5.22/tomcatbuild-xml.patch 13828
-SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5.22/tomcatbuild-xml.patch 13828
+AUX 5.5/catalina_build_xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
+MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5/catalina_build_xml.patch 1149
+RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5/catalina_build_xml.patch 1149
+SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e files/5.5/catalina_build_xml.patch 1149
+AUX 5.5/jasper_build_xml.patch 463 RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 SHA1 f168e9ff231e1ccd727367a03f0fdefde3c36a1a SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714
+MD5 0139160e01d9f8c37007e700adc14edd files/5.5/jasper_build_xml.patch 463
+RMD160 d042043acbaafa7b2be42f071846d5fbe970fa62 files/5.5/jasper_build_xml.patch 463
+SHA256 8c0758f6f2e556d317087389b7649bc709d738679be7965a50329b724c6e8714 files/5.5/jasper_build_xml.patch 463
+AUX 5.5/jsr152_examples_build_xml.patch 403 RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e SHA1 d8d596ce643a30429194f0003d1847c9565059c5 SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d
+MD5 345c4483f94ba70ccd6170ee50bdabbd files/5.5/jsr152_examples_build_xml.patch 403
+RMD160 bb9bbb7fe9656ed9b3f4f18bc8e59db0360fe56e files/5.5/jsr152_examples_build_xml.patch 403
+SHA256 481da3d09b32a3ed1da938df1e9b2a3273ff84b10dfb9a4467de614ed8dd847d files/5.5/jsr152_examples_build_xml.patch 403
+AUX 5.5/jsr154_examples_build_xml.patch 406 RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 SHA1 1bfb15ad4eaec80f16a51f2e1bf0bed31792da38 SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b
+MD5 4834c2eada7c9c01cf69d9d5637eae62 files/5.5/jsr154_examples_build_xml.patch 406
+RMD160 7e2c286db8b0bd4df722507c889f7e2deff65302 files/5.5/jsr154_examples_build_xml.patch 406
+SHA256 4e98264fb26027fbae39e8c44e44bb1151a84dc3defe6373ded0fd50e6bfd98b files/5.5/jsr154_examples_build_xml.patch 406
+AUX 5.5/main_build_xml.patch 892 RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa SHA1 225f24dc6acadf6c1d0547feb24b0a227b1b225f SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e
+MD5 ac639b069df018dc62fa4ca532696102 files/5.5/main_build_xml.patch 892
+RMD160 597cf8a0322a56543b51951807ec1c266ae8faaa files/5.5/main_build_xml.patch 892
+SHA256 f3e13d19c04bd6d27f6d52d4a04cd311892dd334ebfca9c443bc6daf09abcc6e files/5.5/main_build_xml.patch 892
+AUX 5.5/tomcat.conf 2689 RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 SHA1 a0a7d729d9663af0cd88b89daf39642fcb7c55b8 SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a
+MD5 ab94d0fdf14e7f47df0cb8a64e89f0a2 files/5.5/tomcat.conf 2689
+RMD160 ef44b2f2af2d32dad82e3346727455b99e1a8c12 files/5.5/tomcat.conf 2689
+SHA256 afd4615e8a4a65f77702fcbe920ee1828ef7d572f9fb76edfecc2307264d759a files/5.5/tomcat.conf 2689
+AUX 5.5/tomcat.init 3379 RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 SHA1 e39fc98d9b2ebe73fe7beb429167859fc0f6bf32 SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37
+MD5 d19efb9ba652b5c441913707972e6ed4 files/5.5/tomcat.init 3379
+RMD160 f6324e13cec0f26e8972ef079d92fb7924d175f8 files/5.5/tomcat.init 3379
+SHA256 fcc0ad7d3f21c5d6c74d20763beb8af3759ed08af3eb09624e6b57d18fe5ed37 files/5.5/tomcat.init 3379
+AUX 5.5/tomcat_build_xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 SHA1 3a8ae3d686046f1938c71bd790d6f9ecf4339556 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9
+MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5/tomcat_build_xml.patch 13828
+RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5/tomcat_build_xml.patch 13828
+SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5/tomcat_build_xml.patch 13828
 AUX 6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d SHA1 a41e61f07453d14904d1f4b59c71e577840a9b01 SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6
 MD5 8533b95643881c578f24e30098d3d178 files/6/build-xml.patch 2611
 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d files/6/build-xml.patch 2611
@@ -139,7 +131,7 @@ MD5 f6cfbfe83a55a5700ad52d43483be852 files/6/tomcat.init 3291
 RMD160 b6bac4cf4ce2bac5aa0bd9dec28fa88a39c42570 files/6/tomcat.init 3291
 SHA256 5f06449e261300a0f6ba6cb67f0908ddceb8c0ea06178ac41c791055068ec72b files/6/tomcat.init 3291
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST apache-tomcat-5.5.22-src.tar.gz 4888257 RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db SHA1 9b9ad830c4db0f0668aa2500cc1d954c1bf95b96 SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a
+DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
 EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 e88ac9bae92fc262ad9b7c37ef692629943167d9 SHA1 ce01158f8823dd521a5a4fadc7cfbd09e4f59a97 SHA256 b92c98a7411e5c80ea220a9245727c528440670fa7c29a025f71b18f97529c49
@@ -154,18 +146,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10296 RMD160 d745378ce830fbdc415f0f2de81e976cbff9
 MD5 57d15320f6132d2222e2c9036c583f18 tomcat-5.5.20-r8.ebuild 10296
 RMD160 d745378ce830fbdc415f0f2de81e976cbff91993 tomcat-5.5.20-r8.ebuild 10296
 SHA256 72b899ccde992f7248ff3ce20b9274327c45790c94a4b924d4c09e8dd5528035 tomcat-5.5.20-r8.ebuild 10296
-EBUILD tomcat-5.5.22_pre-r1.ebuild 10715 RMD160 bc361580d3815f1a32228d729eac0b614b7a3a54 SHA1 776fe965312bd6ab1d835b279d6ab9376f4b22d2 SHA256 f779c14cbc5bdb7816007794d9eebc7e66c0d608d64eb720f7e2631093d6b228
-MD5 8fc346bc15c953061b52717b9eedc70d tomcat-5.5.22_pre-r1.ebuild 10715
-RMD160 bc361580d3815f1a32228d729eac0b614b7a3a54 tomcat-5.5.22_pre-r1.ebuild 10715
-SHA256 f779c14cbc5bdb7816007794d9eebc7e66c0d608d64eb720f7e2631093d6b228 tomcat-5.5.22_pre-r1.ebuild 10715
+EBUILD tomcat-5.5.23.ebuild 10592 RMD160 fbac9491d5360a83f93a395e1c0a678b1f974e6d SHA1 520b9c55550800eb57ea5ccd1ce5c46980b2d140 SHA256 cd5d8110e1340766abf9b0def10559597e5ef70b8a65620c5f1de13d24faf1aa
+MD5 fb65d8a21826c2263a97bbb1645f355c tomcat-5.5.23.ebuild 10592
+RMD160 fbac9491d5360a83f93a395e1c0a678b1f974e6d tomcat-5.5.23.ebuild 10592
+SHA256 cd5d8110e1340766abf9b0def10559597e5ef70b8a65620c5f1de13d24faf1aa tomcat-5.5.23.ebuild 10592
 EBUILD tomcat-6.0.10.ebuild 5000 RMD160 562e6ed3a081dd40b388f0882f382b6a69531b3a SHA1 573541582db37c7a49d758ac5b0ea7dc0a0ca20c SHA256 e4607fa447547219d4b4d003cf02285e21c9e3c8a1c3401b518f97e72b21e2b0
 MD5 bc93471a11d7e21bc1191e7fee70a429 tomcat-6.0.10.ebuild 5000
 RMD160 562e6ed3a081dd40b388f0882f382b6a69531b3a tomcat-6.0.10.ebuild 5000
 SHA256 e4607fa447547219d4b4d003cf02285e21c9e3c8a1c3401b518f97e72b21e2b0 tomcat-6.0.10.ebuild 5000
-MISC ChangeLog 1598 RMD160 94f995f6f9c63378c2a30d842ed90917caba0194 SHA1 0ba42343aee5eb053d2180e55623c7d4786ff2e9 SHA256 11b3ef5cd229e42c6f48b7e3de375d6ea20d235992506c5a37c090fb14900e7c
-MD5 313df09d42139f122ee0dbd1c102fdda ChangeLog 1598
-RMD160 94f995f6f9c63378c2a30d842ed90917caba0194 ChangeLog 1598
-SHA256 11b3ef5cd229e42c6f48b7e3de375d6ea20d235992506c5a37c090fb14900e7c ChangeLog 1598
+MISC ChangeLog 2493 RMD160 a3f7054981417211b320233569413359187cd10a SHA1 415b3aa6a66bb759ec20ef62b3b757408a1d6b14 SHA256 2231f07b3fdc0255b65bc49c4928eca08c0761bf6f0cc0c67c7d65ecd9d59c6a
+MD5 16a9160834137d6bacb3afd8dcfa57d0 ChangeLog 2493
+RMD160 a3f7054981417211b320233569413359187cd10a ChangeLog 2493
+SHA256 2231f07b3fdc0255b65bc49c4928eca08c0761bf6f0cc0c67c7d65ecd9d59c6a ChangeLog 2493
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -179,9 +171,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-5.5.22_pre-r1 277
-RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-5.5.22_pre-r1 277
-SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-5.5.22_pre-r1 277
+MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23 277
+RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23 277
+SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23 277
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10 277
diff --git a/www-servers/tomcat/files/5.5/catalina_build_xml.patch b/www-servers/tomcat/files/5.5/catalina_build_xml.patch
new file mode 100644
index 000000000000..da6b96901aab
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/catalina_build_xml.patch
@@ -0,0 +1,30 @@
+--- apache-tomcat-5.5.15-src/container/catalina/build.xml	2006-01-03 10:15:07.000000000 -0500
++++ container/catalina/build.xml	2006-01-28 11:57:25.000000000 -0500
+@@ -60,6 +60,7 @@
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${javagroups.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jmx-remote.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+@@ -91,6 +92,7 @@
+     <pathelement location="${commons-modeler.jar}"/>
+     <pathelement location="${jaas.jar}"/>
+     <pathelement location="${jcert.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${jmx.jar}"/>
+     <pathelement location="${jndi.jar}"/>
+     <pathelement location="${jnet.jar}"/>
+@@ -548,9 +550,10 @@
+ <!--
+     <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+ -->
++    <!--
+     <copy todir="${catalina.build}/common/lib"
+            file="${tomcat-dbcp.jar}" />
+-
++    -->
+     <!-- Configuration Files -->
+     <copy todir="${catalina.build}/conf">
+       <fileset dir="src/conf">
diff --git a/www-servers/tomcat/files/5.5/jasper_build_xml.patch b/www-servers/tomcat/files/5.5/jasper_build_xml.patch
new file mode 100644
index 000000000000..1f0de5f8a04f
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/jasper_build_xml.patch
@@ -0,0 +1,10 @@
+--- jasper/build.xml	2005-02-13 19:28:36.000000000 +0100
++++ jasper/build.xml	2005-02-13 20:46:15.554972064 +0100
+@@ -30,6 +30,7 @@
+     <pathelement location="${jsp-api.jar}"/>
+     <pathelement location="${tools.jar}"/>
+     <pathelement location="${jasper-compiler-jdt.jar}"/>
++    <pathelement location="${jdt.jar}"/>
+     <pathelement location="${xerces.jar}"/>
+     <pathelement location="${xercesImpl.jar}"/>
+     <pathelement location="${xml-apis.jar}"/>
diff --git a/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch b/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch
new file mode 100644
index 000000000000..1e4e013b741d
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/jsr152_examples_build_xml.patch
@@ -0,0 +1,10 @@
+--- apache-tomcat-5.5.20-src/servletapi/jsr152/build.xml	2007-01-27 00:02:27.000000000 -0500
++++ build.xml	2007-01-27 00:02:44.000000000 -0500
+@@ -20,6 +20,7 @@
+ 
+   <path id="examples.classpath">
+     <pathelement location="${jsp-api.build}/classes"/>
++    <pathelement location="${jsp-api.jar}"/>
+     <pathelement location="${servlet-api.jar}"/>
+     <pathelement location="${mail.jar}"/>
+   </path>
diff --git a/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch b/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch
new file mode 100644
index 000000000000..9c7b417a3b1f
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/jsr154_examples_build_xml.patch
@@ -0,0 +1,10 @@
+--- apache-tomcat-5.5.20-src/servletapi/jsr154/build.xml	2007-01-26 23:50:15.000000000 -0500
++++ build.xml	2007-01-26 23:56:03.000000000 -0500
+@@ -17,6 +17,7 @@
+   <property name="servlet-api.jar" value="${servlet-api.dist}/lib/servlet-api.jar"/>
+   <path id="examples.classpath">
+     <pathelement location="${servlet-api.build}/classes"/>
++    <pathelement location="${servlet-api.jar}"/>
+   </path>
+ 
+ 
diff --git a/www-servers/tomcat/files/5.5/main_build_xml.patch b/www-servers/tomcat/files/5.5/main_build_xml.patch
new file mode 100644
index 000000000000..07c58ea73c09
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/main_build_xml.patch
@@ -0,0 +1,24 @@
+--- build.xml.orig	2007-02-13 13:17:34.000000000 -0500
++++ build.xml	2007-02-13 16:57:38.000000000 -0500
+@@ -66,12 +66,10 @@
+   <target name="checkout"
+           description="Update or checkout required sources from SVN">
+ 
++    <!--
+     <echo level="info"
+           message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
+ 
+-    <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
+-    <!--  hackish: inputstring="t${line.separator}" is t+<enter> for svn         -->
+-    <!--  to temporarily accept the certificate of svn.apache.org.               -->
+     <exec dir="${basedir}"
+           executable="svn"
+           inputstring="t${line.separator}"
+@@ -80,6 +78,7 @@
+       <arg value="${svnroot}/${current.loc}" />
+       <arg value="${basedir}" />
+     </exec>
++    -->
+ 
+   </target>
+ 
diff --git a/www-servers/tomcat/files/5.5/tomcat.conf b/www-servers/tomcat/files/5.5/tomcat.conf
new file mode 100644
index 000000000000..1a35df1e87f7
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/tomcat.conf
@@ -0,0 +1,75 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.conf,v 1.1 2007/03/09 17:33:15 wltjr Exp $
+
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+#
+# You can override this value with whatever path you wish.  
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.2.05
+
+JAVA_HOME=`java-config --jre-home`
+
+# (Optional) Java runtime options used when the "start", "stop", or "run"
+# commands are executed.
+# JAVA_OPTS=""
+
+# Where your web applications are located
+CATALINA_HOME=/usr/share/tomcat-5.5/
+CATALINA_BASE=/var/lib/tomcat-5.5/
+
+# Tomcat's User/Group
+# Change these at your own risk!!! These are not supported so if it 
+# breaks something, you are on your own.
+CATALINA_USER=tomcat
+CATALINA_GROUP=tomcat
+
+# Location of the Tomcat JARs and classes
+CATALINA_LIBDIR=/usr/share/tomcat-5.5/server/lib/
+
+# The CLASSPATH for Tomcat to use, plus any others you need.
+CLASSPATH=${CATALINA_LIBDIR}
+
+# (Optional) Directory path location of temporary directory the JVM should 
+# use (java.io.tmpdir).  Defaults to $CATALINA_BASE/temp.
+CATALINA_TMPDIR="/var/tmp/tomcat-5.5/"
+
+# TOMCAT STARTUP/SHUTDOWN
+# 	debug             Start Catalina in a debugger
+# 	debug -security   Debug Catalina with a security manager
+# 	jpda start        Start Catalina under JPDA debugger
+# 	start             Start Catalina in a separate window
+# 	start -security   Start in a separate window with security manager
+# 	stop              Stop Catalina"
+#
+# NOTE: -security requires JSSE (see below)
+# NOTE: jpda requires JPDA (see below)
+TOMCAT_START="start"
+TOMCAT_STOP="stop"
+
+# (Optional) Java runtime options used when the "start", "stop", or "run" 
+# commands are executed.
+# CATALINA_OPTS=""
+
+# Java Platform Debugger Architecture (JPDA)
+# http://java.sun.com/products/jpda/
+# Included with Java SDK 1.3 and later.  No need to specify location.
+#
+#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
+#                   command is executed. The default is "dt_socket".
+#
+#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
+#                   command is executed. The default is 8000.
+#
+# JPDA_TRANSPORT="dt_socket"
+# JPDA_ADDRESS="8000"
+
+# Java Secure Socket Extension (JSSE)
+# http://java.sun.com/products/jsse/
+# Included with Java SDK 1.4 and later.
+#
+#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
+#                   (JSSE) installation, whose JAR files will be added to the
+#                   system class path used to start Tomcat.
+#
+# JSSE_HOME="/opt/sun-jdk-1.4.1.02/jre/lib/"
diff --git a/www-servers/tomcat/files/5.5/tomcat.init b/www-servers/tomcat/files/5.5/tomcat.init
new file mode 100755
index 000000000000..95e2d8cc26fb
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/tomcat.init
@@ -0,0 +1,91 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5/tomcat.init,v 1.1 2007/03/09 17:33:15 wltjr Exp $
+
+init_env_vars() {
+	# Set some sane defaults
+	if [ -z "${CATALINA_TMPDIR}" ] ; then
+		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
+	fi
+	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
+	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
+	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
+
+	# Activate Logging
+	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then
+		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
+	fi
+
+	# Populate the classpath
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar"
+	if [[ -n "${JSSE_HOME}" ]]; then
+		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
+	fi
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/commons-logging-api.jar"
+
+	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} \
+			 -Djava.endorsed.dirs=${CATALINA_HOME}/common/endorsed \
+			 -classpath ${CLASSPATH}"
+
+	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
+				   -Dcatalina.home=${CATALINA_HOME} \
+				   -Djava.io.tmpdir=${CATALINA_TMPDIR} \
+				   org.apache.catalina.startup.Bootstrap "
+
+	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
+		touch "${CATALINA_BASE}logs/catalina.out"
+		chown tomcat:tomcat "${CATALINA_BASE}logs/catalina.out"
+	fi
+}
+
+start-helper() {
+	local executor=${1}
+	shift
+	local arguments="--start --quiet --background --chuid ${CATALINA_USER}:${CATALINA_GROUP} \
+		--make-pidfile --pidfile /var/run/tomcat.pid"
+	start-stop-daemon ${arguments} --exec ${executor} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START} >> "$CATALINA_BASE"/logs/catalina.out 2>&1
+	return $?
+}
+
+depend() {
+	use dns logger net
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	init_env_vars
+	# Figure out what arguments to pass start-helper based on TOMCAT_START
+	if [[ "${TOMCAT_START}" == "debug" ]] ; then
+		start-helper ${JAVA_HOME}/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
+	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then
+		start-helper ${JAVA_HOME}/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
+			-Djava.security.manager \
+			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
+	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then
+		start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
+	elif [[ "${TOMCAT_START}" == "start" ]] ; then
+		start-helper ${JAVA_HOME}/bin/java
+	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then
+		start-helper ${JAVA_HOME}/bin/java \
+			-Djava.security.manager \
+			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
+	else
+		eerror "Invalid TOMCAT_START variable value, or one is not set"
+		eerror "Please see /etc/conf.d/tomcat-5.5 for more information"
+		eend 1
+	fi
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Tomcat"
+	init_env_vars
+	start-stop-daemon --stop --quiet \
+	       	--make-pidfile --pidfile /var/run/tomcat.pid \
+			--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} ${STD_OUT} stop
+	eend $?
+}
diff --git a/www-servers/tomcat/files/5.5/tomcat_build_xml.patch b/www-servers/tomcat/files/5.5/tomcat_build_xml.patch
new file mode 100644
index 000000000000..109caf67af37
--- /dev/null
+++ b/www-servers/tomcat/files/5.5/tomcat_build_xml.patch
@@ -0,0 +1,367 @@
+--- apache-tomcat-5.5.20-src/build/build.xml	2007-01-26 19:10:26.000000000 -0500
++++ build.xml	2007-01-26 19:31:49.000000000 -0500
+@@ -143,6 +143,7 @@
+ 
+   <!-- ====================== DEPLOY: Copy Static Files =================== -->
+   <target name="deploy-static" depends="init">
++  <!--
+     <copy file="${jsp-api.jar}"  todir="${tomcat.build}/common/lib"/>
+     <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+ 
+@@ -161,9 +162,9 @@
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+ 
+-    <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+-    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++    <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
+     <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++    -->
+   </target>
+ 
+   <!-- ====================== Build all components =================== -->
+@@ -395,15 +396,14 @@
+   <target name="build-webapps-precompile"
+           depends="init" description="Precompile webapps" >
+ 
++    <antcall target="build-webapp-precompile-admin" />
++    <antcall target="build-webapp-precompile-examples" />
++
+     <!-- JSPC -->
+-    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
+     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
+-    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
+ 
+-    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
+     <mkdir dir="${ROOT.base}/WEB-INF/src" />
+     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
+-    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
+ 
+     <path id="jspc.classpath">
+       <pathelement location="${java.home}/../lib/tools.jar"/>
+@@ -437,23 +437,6 @@
+              addWebXmlMappings="true"
+              outputDir="${ROOT.base}/WEB-INF/src" />
+ 
+-    <jasper2
+-             compile="false"
+-             validateXml="false"
+-             uriroot="${jsp-examples.base}"
+-         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+-             addWebXmlMappings="true"
+-             outputDir="${jsp-examples.base}/WEB-INF/src" />
+-
+-    <jasper2
+-             package="admin"
+-             compile="false"
+-             validateXml="false"
+-             uriroot="${admin.base}"
+-             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
+-             addWebXmlMappings="true"
+-             outputDir="${admin.base}/WEB-INF/src/admin" />
+-
+     <javac destdir="${ROOT.base}/WEB-INF/classes"
+            optimize="off"
+            debug="${compile.debug}"
+@@ -475,61 +458,90 @@
+       <include name="**" />
+     </javac>
+ 
+-    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
+-    <copy todir="${jsp-examples.base}/WEB-INF/classes">
+-      <fileset dir="${jsp-examples.base}/WEB-INF/src">
+-        <include name="**/*.class" />
+-      </fileset>
+-    </copy>
++  </target>
+ 
+-    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
++  <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
++    <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
++    <mkdir dir="${admin.base}/WEB-INF/src/admin" />
++    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
++      <classpath refid="jspc.classpath"/>
++    </taskdef>
++    <jasper2
++             package="admin"
++             compile="false"
++             validateXml="false"
++             uriroot="${admin.base}"
++             webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
++             addWebXmlMappings="true"
++             outputDir="${admin.base}/WEB-INF/src/admin" />
++    <javac destdir="${admin.base}/WEB-INF/classes"
+            optimize="off"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+            source="${compile.source}"
+            failonerror="false"
+-           srcdir="${jsp-examples.base}/WEB-INF/src"
++           srcdir="${admin.base}/WEB-INF/src"
+        excludes="**/*.smap">
+       <classpath>
+         <pathelement location="${java.home}/../lib/tools.jar"/>
+         <fileset dir="${tomcat.build}/server/lib">
+           <include name="*.jar"/>
+         </fileset>
+-        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
++        <fileset dir="${admin.base}/WEB-INF/lib">
+           <include name="*.jar"/>
+         </fileset>
+         <fileset dir="${tomcat.build}/common/lib">
+           <include name="*.jar"/>
+         </fileset>
+         <pathelement location="${tomcat.build}/classes"/>
+-        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
+       </classpath>
+-      <include name="**" />
+-      <exclude name="tags/**" />
++      <include name="admin/**" />
+     </javac>
+-
+-    <javac destdir="${admin.base}/WEB-INF/classes"
++  </target>
++  
++  <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
++    <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
++    <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
++    <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
++      <classpath refid="jspc.classpath"/>
++    </taskdef>
++    <jasper2
++             compile="false"
++             validateXml="false"
++             uriroot="${jsp-examples.base}"
++         webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
++             addWebXmlMappings="true"
++             outputDir="${jsp-examples.base}/WEB-INF/src" />
++    <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
++    <copy todir="${jsp-examples.base}/WEB-INF/classes">
++      <fileset dir="${jsp-examples.base}/WEB-INF/src">
++        <include name="**/*.class" />
++      </fileset>
++    </copy>
++    <javac destdir="${jsp-examples.base}/WEB-INF/classes"
+            optimize="off"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+            source="${compile.source}"
+            failonerror="false"
+-           srcdir="${admin.base}/WEB-INF/src"
++           srcdir="${jsp-examples.base}/WEB-INF/src"
+        excludes="**/*.smap">
+       <classpath>
+         <pathelement location="${java.home}/../lib/tools.jar"/>
+         <fileset dir="${tomcat.build}/server/lib">
+           <include name="*.jar"/>
+         </fileset>
+-        <fileset dir="${admin.base}/WEB-INF/lib">
++        <fileset dir="${jsp-examples.base}/WEB-INF/lib">
+           <include name="*.jar"/>
+         </fileset>
+         <fileset dir="${tomcat.build}/common/lib">
+           <include name="*.jar"/>
+         </fileset>
+         <pathelement location="${tomcat.build}/classes"/>
++        <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
+       </classpath>
+-      <include name="admin/**" />
++      <include name="**" />
++      <exclude name="tags/**" />
+     </javac>
+   </target>
+ 
+@@ -653,28 +665,8 @@
+ 
+     <!-- <antcall target="build-commons-modeler" /> -->
+     <!-- <antcall target="build-commons-daemon"  /> -->
+-
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-collections-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-pool-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+-      <param name="destfile" value="${tomcat-dbcp.jar}" />
+-    </antcall>
+-
+-    <antcall target="build-tomcat-dbcp" />
+-
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${jdt.loc}"/>
+-      <param name="destfile" value="${jdt.jar}"/>
+-      <param name="destdir" value="${base.path}"/>
+-    </antcall>
+-    <antcall target="build-jasper-compiler-jdt" />
++    <!-- <antcall target="build-tomcat-dbcp" /> -->
++    <!-- <antcall target="build-jasper-compiler-jdt" /> -->
+   </target>
+ 
+   <target name="build-tomcat-dbcp">
+@@ -754,19 +746,11 @@
+         </jar>
+       </target>
+ 
+-  <target name="build-webapps" depends="init"
+-          description="build  webapps">
+-
+-    <echo>========== Building: webapps </echo>
+-
+-    <mkdir dir="${tomcat.build}/webapps" />
+-    <mkdir dir="${tomcat.build}/server/webapps" />
++  <target name="build-examples" unless="examples.build.notrequired">
+ 
+     <!-- The build files are far too difficult to hack - just build it and copy -->
+-    <ant dir="${api.home}/jsr154" target="dist">
+-    </ant>
+-    <ant dir="${api.home}/jsr152" target="dist">
+-    </ant>
++    <ant dir="${api.home}/jsr154" target="examples" />
++    <ant dir="${api.home}/jsr152" target="examples" />
+ 
+     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
+     <copy todir="${tomcat.build}/webapps/servlets-examples">
+@@ -779,6 +763,18 @@
+         <exclude name="WEB-INF/tagPlugins.xml" />
+       </fileset>
+     </copy>
++    
++  </target>
++
++  <target name="build-webapps" depends="init"
++          description="build  webapps">
++
++    <echo>========== Building: webapps </echo>
++
++    <mkdir dir="${tomcat.build}/webapps" />
++    <mkdir dir="${tomcat.build}/server/webapps" />
++
++	<antcall target="build-examples" />
+ 
+     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
+         <property name="webapps.build" value="${tomcat.build}/webapps" />
+@@ -850,14 +846,7 @@
+         filtering="true" />
+ 
+     <!-- Build JARs for webapps classes -->
+-    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
+-    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
+-         index="true">
+-       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
+-          <include name="**/*.class" />
+-          <include name="**/*.properties" />
+-       </fileset>
+-    </jar>
++    <antcall target="fix-admin-webapp" />
+     <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
+     <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
+          index="true">
+@@ -896,9 +885,20 @@
+          todir="${tomcat.build}/conf/Catalina/localhost" />
+     <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
+          todir="${tomcat.build}/conf/Catalina/localhost" />
++
++  </target>
++
++  <target name="fix-admin-webapp" unless="admin.build.notrequired">
++    <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
++    <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
++         index="true">
++       <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
++          <include name="**/*.class" />
++          <include name="**/*.properties" />
++       </fileset>
++    </jar>
+     <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
+          todir="${tomcat.build}/conf/Catalina/localhost" />
+-
+   </target>
+ 
+   <!-- ====================== Embed target =================== -->
+@@ -1041,11 +1041,11 @@
+   <!-- ====================== Compat target =================== -->
+ 
+   <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
+-
++    <!--
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
+     <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
+-
++    -->
+   </target>
+ 
+   <!-- ====================== DEPLOY: Deploy Components =================== -->
+@@ -1092,8 +1092,9 @@
+     <!-- Copy Unix JSVC from commons-daemon -->
+     <copy file="${commons-daemon.jsvc.tar.gz}"
+         tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
++    <!--
+     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+-
++    -->
+     <echo>Target: Webapps precompilation ...</echo>
+ 
+     <antcall target="build-admin"/>
+@@ -1188,10 +1189,11 @@
+    description="Catalina Tests" depends="dist-tester">
+ 
+     <!-- For Java 1.4 -->
++    <!--
+     <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+     <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
+     <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
+-
++    -->
+     <parallel>
+ 
+         <java classname="LauncherBootstrap" fork="yes">
+@@ -1871,10 +1873,10 @@
+ 
+     <!-- commons-digester needs ../LICENSE -->
+     <!-- That is ugly XXX needs a review -->
++    <!--
+     <copy file="LICENSE" tofile="../LICENSE"/>
+     <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+ 
+-    <!-- Downdown any sub package or tools needed. -->
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-beanutils.loc}"/>
+       <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1916,7 +1918,6 @@
+     </antcall>
+ 
+     <antcall target="downloadgz">
+-      <!-- xerces2 brings 2 files, test for one of them -->
+       <param name="sourcefile" value="${xerces.loc}"/>
+       <param name="destfile" value="${xml-apis.jar}"/>
+     </antcall>
+@@ -1937,7 +1938,6 @@
+       <param name="destfile" value="${commons-launcher.jar}"/>
+     </antcall>
+ 
+-    <!--
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-pool.loc}"/>
+       <param name="destfile" value="${commons-pool.jar}"/>
+@@ -1948,7 +1948,6 @@
+       <param name="destfile" value="${commons-dbcp.jar}"/>
+       <param name="destdir" value="${base.path}"/>
+     </antcall>
+-    -->
+ 
+     <antcall target="downloadgz">
+       <param name="sourcefile" value="${commons-httpclient.loc}"/>
+@@ -1976,7 +1975,7 @@
+       <param name="destfile" value="${tomcat-native.tar.gz}"/>
+       <param name="destdir" value="${tomcat-native.home}"/>
+     </antcall>
+-
++    -->
+     <!-- Build the dependencies that are not yet released -->
+     <antcall target="build-depends"/>
+