Author: remm Date: Fri Jul 7 15:37:03 2006 New Revision: 420004 URL: http://svn.apache.org/viewvc?rev=420004&view=rev Log: - Start work on a dist script (that I will keep separate to avoid having a bloated main script).
Added: tomcat/tc6.0.x/trunk/KEYS (with props) tomcat/tc6.0.x/trunk/RELEASE-NOTES tomcat/tc6.0.x/trunk/dist.xml (with props) Added: tomcat/tc6.0.x/trunk/KEYS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/KEYS?rev=420004&view=auto ============================================================================== --- tomcat/tc6.0.x/trunk/KEYS (added) +++ tomcat/tc6.0.x/trunk/KEYS Fri Jul 7 15:37:03 2006 @@ -0,0 +1,294 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: + (pgpk -ll <your name> && pgpk -xa <your name>) >> this file. + or + (gpg --fingerprint --list-sigs <your name> + && gpg --armor --export <your name>) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +Type Bits/KeyID Date User ID +pub 2048/F22C4FED 2001/07/02 Andy Armstrong <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: PGPfreeware 7.0.3 for non-commercial use <http://www.pgp.com> + +mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij +gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N +I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm +bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS +B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz +gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU +9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID +nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb +0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z +dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC +GQEFGwMAAAAACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz +x+r2ANe8/0e+u5ZcYtSaSry+uQINBDtAWuUQCAD2Qle3CH8IF3KiutapQvMF6PlT +ETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZ +X9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56N +oKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kj +wEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obE +AxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAIC +B/0eHkYQ0Rv6s21TgpOzRBon+rQAv9ka0PlC7bj2eYWsCOBib8K7qO8hND0sW59p +0uFQ01X7kC7L/4Ls1HTk0chEZMV0UrGAOKXHY1QFlxrNtFi5U3pTPITXDDfy+g/G +6FTX3PLnGGvwXbtaiAq5UjQ6iXm03lh0BW6Q+kPtm8swPPfqfjYv0rrT+I8Ic3p2 +HplWKR2bpi3wqCSKB/AaTQJwTbh2x2+2cPVONPodgjZSJ9eQkErejkNSvqbumlTx +dB81eoGa0Lo2xE7N+DNlCnILGE0X4hPMdj+N5fmyEbyx0WOB8crvCuODGGEQnXs/ +zbVO7FP+rj7YWjRh5pVD3bGiiQBMBBgRAgAMBQI7QFrlBRsMAAAAAAoJEGo60/Ty +LE/tj/QAoOFNFa7rbAy+eT6mRNb7XztfcAbWAKD6Gd6S/7lEJU0k2TS5tozt4jMl +vw== +=/91Q +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits/KeyID Date User ID +pub 1024D/86867BA6 2001-11-22 Jean-Frederic Clere (jfclere) <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.5 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBDv9Gx8RBADclmKwDLcibNVipQnhYW+bFIpuQjQnRrqRwn3gXM+/luzzJYJ4 +bbWpw13zjX0EkrAJ8qH2A/d0EIU1eZ0zHrLgRvMUfLGFUX7FFFw18JKFLTVGhG4/ +8sSl3ydHSA2Kd1PF6xjBP7iM7sg5dJfEkyMzvK5H4F0ZpTqy3087wsg1wwCgitRy +Zg4x3lWZSkOwBj472qaO9GkD/2q6kyWfAK6XFe3GuB5AAs3poMfN1eqW+duM4TA8 +zUiWK0Wxx4JXJbL7n0i4d+JdXJsrjSjF++KKfelcxsrSxoUIBegez25MUSvHe09D +R3nqkY8CVO+viEtzRBqkSgCMbUjAtfkQ+vp2jDnWSmmkNfY0OYAzt+KRyJKcjUSJ +gvOOA/45+DN9wuTELoFTvsXh1JgOL/QvW1fmQ2HrcQk94BkzIsfVGWClCiig5gNw +LCxTbfgA5htpI8U7vPR9/5gH7U8Wy3HR6xQUZxcbttMeYit2VbDEJzF5r5S0pJvD +vyk3n1kiKU7r49sjhxGgE8J/VvDpO6YcIsDs8LoULwuJTg0DTrRDSmVhbi1GcmVk +ZXJpYyBDbGVyZSAoamZjbGVyZSkgPEpGcmVkZXJpYy5DbGVyZUBmdWppdHN1LXNp +ZW1lbnMuY29tPohXBBMRAgAXBQI7/RsfBQsHCgMEAxUDAgMWAgECF4AACgkQ0+/m +toaGe6amGQCeJU5VZ8QCi8+PY0QJHPA63e5uPyoAmgOWIwFm8A/xmW8qjEvVAWtb +TjZxuQENBDv9GyMQBACCbFlSF+udW/Qz2oknDen8Hoql4Q1Q7CUQTbPjoQAcYgZg +LrsR6hc9aCIf3Kt4qZBgQ1Oe9M/AemOFhU04UNp3dgHk91EYRvx80Rua992p/8V7 +QOhwIBVb2XE8as5nL2j8w6Jz7eSs/bivxm9yD0AH/I5H01RAJivRbOTsUgSkDwAD +BQP5ARlW2Nqc0U17asQsmMYvT1UMiOiyBwUD/DIEG2Xy1hlEvdljg8WU26jcjpGq +MrT69T4Z+eZ2oVyiRQTW4qMUBKc0Nbz89hL0qv9K41ExxxH+JgE1csRVvmwAT8Iy +lnhof7TJLRBtvan3+p21Kxl1uQ7MbmLT875u+vc+J098fIiIRgQYEQIABgUCO/0b +IwAKCRDT7+a2hoZ7pn9UAJ9f0TK0QQOtjQBvxAissopYhDKHGACePZg0k9sj69yw +nVWrBS9fvFC9jcA= +=BTiM +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits/KeyID Date User ID +pub 1024D/E86E29AC 2002-02-13 kevin seguin <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.6 (MingW32) +Comment: For info see http://www.gnupg.org + +mQGiBDxqtR8RBACbySxGrtf+flbowryS1Hj4z3zzEXD4CAEq6RjSGMtIraCDRJfp +6Gexs+lQ6IhpdC4GfX70SUMjXXvT5suhXYeGOM4iJHqUsksgzEKjUqcfj1l3qmOs +/doE8lcGGHcYbMplBcfuop+shZYiv9GEJ3gutwn/dNnhs/QA9bCdIj03lwCgvAcy +QpT5JdTym2p2icd5e91mGIUEAJMw6JHTTcCiyoTRy7k8Cf65d8S7bTDLr6pqJVE2 +XU41CvW/pgL31akYAxpeZJJnsBaLaUiqh6K0qgfEMlDwDeC6gVogHBxWkEXdK1dr +tGL4GIUcxQ1+ZvQhGg7dtjanmfMlylVgS+C48awJySkinRmaQDbQ0MKdFchLc/y1 +OR3IA/0VkIvlidehMPbZCalqhS9AEsDiFq5/u5AsQzDEp2nmTGlmBqjhc39kEnu4 +qKq08az1Gt6Q7sxXbjH/jYtDgd49FW5Yg4k5B3hpTgnbyRE6SGlKksu8qTmYkDve +4rej6pvJRHwp6hDKxDG8qQoLWIgOfVC8960nurqx56QdV9YMsLQga2V2aW4gc2Vn +dWluIDxzZWd1aW5AYXBhY2hlLm9yZz6IVwQTEQIAFwUCPGq1HwULBwoDBAMVAwID +FgIBAheAAAoJEKy3f8Lobims3E0An0x3rrUMIijUMFoqnoT7muNGwmAzAJ990TWj +dZO4ayh1M+cWhjaw9W+44bkBDQQ8arUkEAQApaMm5HUB1Yk2x5MavAs/O4zfWnOx +YFOeXIPfGvhlhF2/Lrjs9icaa/tOM/CTCes19nDWP5Fc+pQxmgSPrgt3fsShwZJe +p3iYodLbM76uXEgSvI4Wh6kwViHbN4V1GxJAd2ZPVb1v+lauGUCOgPFGw99UV9sO +tTRXSbFS6AgqQzMAAwUD/jq6boxlnab/GUmKrILeLkv1X0G2/AEXEGRmG0nkhVdj +OShoqtPr4y/UhMzJUOequs2CdvRlTIyAyZqN7A0Qp4mFfmsvp0dYYssTtE4bCzZe +WxSKgjtBWBHXnH+Qzjb5R2Tz28kAxNY+dt7yxC+CkXWDZq/rsPgsXNbWXT49FnF8 +iEYEGBECAAYFAjxqtSQACgkQrLd/wuhuKazl7QCfQkz5t/3T6EtXZCcXz/hlswyI +z30AoLr/7hwXgedEepBk/Gm9HUsbMnM8 +=S1mb +-----END PGP PUBLIC KEY BLOCK----- + + +Type bits keyID Date User ID +pub 1024D/307A10A5 2002-07-18 Henri Gomez *** RPM SIGNING KEY *** + <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.6 (GNU/Linux) +Comment: For info see http://www.gnupg.org + +mQGiBD02vbERBAC1v8fR6gjERpaz4UMfdy0hRVWCPSbOdF+Swm/IenjVzErco6zb +MTa13umUNrDPBy/tTWiCCZrOnqi7fgDzWqPEqrXJjKAFVLEWE6MmKylPPEPG1/bm +idkNGERSAZduvhKv777PzvEJJ/8eGe3wy/O8NbgIjCPtr4UklwCZS8cFuwCg8oMO +UdT8qZRtzdxdAyu1m5fUb+MD/3IKJYWXsdtb6iBphCU4f/BoyjVC9EZJ1ywLuiVM +siKbuaDUaXU9nWcbNKv+fx8uZ1NaadpfLokqqhnWcpnSiqw8HNR7SwsF1D33rkXK +O4FSuVss/tIoqGdWFcJyPkP4yP5shxqR335narVw2vDa0+BiWkALbA2qVsSIdZDB +LeFZA/47AMBS0U2BRk2rQT8LmMuFl7mR+wNBM4n7FUGdxsGn3TcYd4pXTNrEQPrV +YNdooKlikgGk4hgFnIFX09Spmimqgq0goFue81rttVdZZ4uep8dTghY6gwmvcOxX +jATbhWStBhdu9B35kzfHc+1QihD5Z94u4uyWIVBIzikcdiY8LbQqSGVucmkgR29t +ZXogPGhnb21lekB1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+iFcEExECABcFAj02vbEF +CwcKAwQDFQMCAxYCAQIXgAAKCRAZMdaEMHoQpYijAKCCP68ndU/kTXR9XAKLvibC +3S8+1QCfUFQYte3Jo+MHKaWjsu9JGptRzo+5Ag0EPTa93RAIAKlsRJ5gOGTFsmaR +W9k6MIh4c/MCy7J7HUxT5xTdHROa+3zUh+FAE/JaOx9ZtZtH863DFHA8cP4L+tpi +PjBT6g2E94dwGcuH/OiSSCT4JSBukbGbOuLLdmFXqUl8+4gsL90Xal67FtNLwyLG +1n7geLir0byD+OT7VLA5w+6G0NOpJEveV/FIa2qLgdRZ8vz73ybgMh18hBUrUmro +jncp0rln2VU7VCH1C2aClKm7kK4mGAjIFIzKbguK+kM3b8NDHmXKpT6syyCtIM3h +prkV1TUCAFqLI32aSdlTN79lpeA2zDga9k4/4X/RDHsFpRN2neRFGTNUtuUgYpQQ +E5zWBmMAAwUH/RiGxyeBsad923IwE1+GAjxFl2tqF9xWk0J6yTnSK4nfhYAE9evV +jwDEok9jRl4ILCcXx6YN/d/lWNuSbARKHz/3hLiTouPpwd3SSJ8is2x9PgpJz5JX +cD0y1SkbPLvs3jH3ZmdcxZpuAmJeI/typqFKK5pWP44oXIH+XH/8nWDtmLEBkgKQ +/ATQWenMTmZ6MIJ6aWKWGkO9QS6iYRz3PPPGQ1O8W02CeprM2wBtlb8J1Z3RxNhM +rZcg/1Qi3V3D1HI4zw6tAFmDeBb8J4PaBQzqlhzx2EBTbfwNPhV8AlPvpxHEeGGn +v+O1yhZr33SnyZdINNoNDn+owVMdmkobe9GIRgQYEQIABgUCPTa93QAKCRAZMdaE +MHoQpRsTAJ4qst3MhLm48fBAEnzuzi/BIKr+AgCfYaCB/AvPoncQbHc8BcNGRimR +P9A= +=hQhz +-----END PGP PUBLIC KEY BLOCK----- + +Type bits keyID Date User ID +DSS 3072/1024 0xA01422B5 2001/10/09 *** DEFAULT SIGNING KEY *** + Remy Maucherat <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: PGP 6.5.8 + +mQGiBDvDY+ERBADJ+GZ2SSlHMb0wRjfsHdJbb4zrRfHn4McEkYGUXyLtZJquAj3V +8/JxrL3+wiBuXFQitf5qYXLDlRH+F1iFT17kqalFTvxZMA3Hg2kLB6ZUvIP8sTrD +b8WJU18Lu2GwPMEUT1ito2eG3PDzgIVRwA0c5btLOhkwoRT+5bEl4ad8KwCg/0XV +CEchMuZtOdJi6WOf8hfwF+cD/iTdfkuxGZEn6fK9erJb5GCr1v/0l83qKU36r8DX +3kGpR6yac/2xv7+NEaKS1t9k/0seRsFQ/gWZA192HpsRhhe4C2lWmTh+YI7jS7mB +Bw8dY304yhwPZuUYw86cLMpG5PXz9519kkDFGHlLG6MaxHnhfe0dXWzs/yv4uSsm +35QfBACUx677GL4pEFJq2pP30aWhxc1but0ncLh5WDCael7wVuTGVSk8TorWoteM +GcQkmDLo+my7xettXUTssijSn+NVRsFjcgMEpAWeJTBtfDRCyf312ECx7BM5G9oh +HxtzMW4ZJYY4M1+3qklgpZaEYx1J8g8bIBv661vunbbcj1/OrLQgUmVteSBNYXVj +aGVyYXQgPHJlbW1AYXBhY2hlLm9yZz6JAE4EEBECAA4FAjvDY+EECwMBAgIZAQAK +CRB7QXnboBQitdfbAKD8zt0jeFHIlX6awuu9atxWyWaB3ACfb08JdEElpF7cTZhx +yRpnKZDUvpa5Aw0EO8Nj5RAMAMwdd1ckOErixPDojhNnl06SE2H22+slDhf99pj3 +yHx5sHIdOHX79sFzxIMRJitDYMPj6NYK/aEoJguuqa6zZQ+iAFMBoHzWq6MSHvoP +Ks4fdIRPyvMX86RA6dfSd7ZCLQI2wSbLaF6dfJgJCo1+Le3kXXn11JJPmxiO/Cqn +S3wy9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV89AHxstD +qZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50T8X8dryD +xUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknbzSC0neSR +BzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdXQ6MdGGze +MyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbTCD1mpF1B +n5x8vYlLIhkmuquiXsNV6UwybwACAgwAkwuQXCs1OPX398vydLxtt6AX9KreX4wm +ykMG+hjgNUsUhYbi03fInYtqTd0TS9qtvSyFUP1aahoY7xKDECI8fyN20Xphb2ih +fgipT6lBFH1tYX4cS1NHcQEdPU3b96Uat6cy7bma0/kUr3EZuxQlc6UVvsxD+lsT +HsSqymY3om8Jx2yaDB58yK/VRUMs7/GPaqe/jQiHxbwyS7sWqhew7uNp+wJL5lEx +x5PkbKj/eA2pKUpMrPKVJfK3E4nq5Q9feBgukhMCADxon2KYa4z4orU3EkM7I3sn +wujj9dnCkoK2+P6/WvhNhR6q9fbdTHQqtDi4zSwip90m4CPWX/26RrEw2Lax1vC9 +LNJu5olQORxWvaDEoPFkU23kohGe9Qtxozqjn2Sya8VQoq1X5IMrQoCrf3MUWGrJ ++UzABENqSj4mM5XSGazkzTsx59hQMLEz/zKsFlQqTSaZ88VXNoRjj3Hm7b8KQeDE +nTVtyjsrfoYjqPLSdhypI6HyNbUZ4mDJiQBGBBgRAgAGBQI7w2PlAAoJEHtBedug +FCK1DkkAoJpMzhUJ2LrraHk7ALnqEeOlPnusAKCQ0vyLlJGktTxwzZ6yv2xwSj6O +XQ== +=1Jv0 +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits/KeyID Date User ID +pub 1024D/564C17A3 2003-01-11 Mladen Turk <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.0.6 (MingW32) + +mQGiBD4fwXIRBAC7WRS8PYxi2YH0T1mX4HCYsF8aHoqxBzMnyFR4J896m1s96vGM +BTSAwH2NKbiVqtfLokTbQkUVxtrgrF2HMB5NfYBg/JzT7pZL/Q2ThWUS7SJQQA4f +a7/DpiLiHalp6iX45om6JTdIWEyXv26csIVhmtlkGBEPRhNRX8X4//BM0wCg7wcA +yQ7c5NmoOJLVs+uHsRrnHo0D/R/dMyuWt7/o0eGIEuRlDl2q+YL8xLuVyJMXQBnd +jo7jKpQ+Q1zl93aVTzsJa7mP2zZ7jqaJ855sdz6rvwyhGF1/qYMtm6zrmgBy2XPm +J+57sfwSZr0bhIeMpCWjIw98z9sObq0v2r2oA3+J9E3Na/BZsCVTZVb3ew7ILmEp +F5D7A/4zvjY41dakCAJsD1Xo8TS6hSqJf4zq9vX3ayJVvUjeo8n4sHNOwcbEnnui +9zZaUH3F0x+3cDo7mS1Y4pD8THuqCZoSbSkiHnlved6nLXsKbqvVrVo+esEhfZCn +Iji3gp+2TVNwdHXGM+4BAzMJCLsdXjByO6SNzB9a+H8RsRlZKrQ8TWxhZGVuIFR1 +cmsgKCoqKiBERUZBVUxUIFNJR05JTkcgS0VZICoqKikgPG10dXJrQGFwYWNoZS5v +cmc+iF0EExECAB0FAj4fwXIFCRLP94AFCwcKAwQDFQMCAxYCAQIXgAAKCRAcUGQH +VkwXo0jxAKCgHzXPIB4IAgoD7GMAohPQfX7j2QCeL6pAsf4pPufmPvbrrpDp6rQH +GOS5Ag0EPh/BhhAIAKWzq7+/+nNYGpc7sXGkDNo9xncxcx/KbbJVT0rBteuaonQ4 +vYar1ITjIhOPmF9yPmpUddNrqgQTSO+Or+ZrVOndn+qC1gdY3qpKIN3KTjXloW38 +0Y84ezwdRLznQNkhgXwNcB55l/Z9kLaW2MS8CJzOuYSQT1CYbXg7XP3684ZmV1KC +cGgcUt9VkIGqwsa2RFDNGvMbySedSkJ/70Q+PJlkXN+W86f8hi3HTjw2MCkNa5NL ++Byg8FEAm95YWrO6kCY3qaJYV7NRt9oVd+2V/NNzwYp3Or/QoYofvfNerupfwBmU +GEXPyZCqqNH6nDv6chscsWvEA9KzhsWnsdKhmHsAAwUH/R6LwfWgtpaO42dQI4ZS +VRBmCeWrXCuyVk0d13Yz0xLi5Z5m4g3MON3d+cRVUiyNX+hbDGpi2mkbsnL559Ef +iqmzDmSz5GQHDutolhOPtLxLrC537ODn2q7hnYQwIQYYIUtYD5sYlzfGYC8olGCB +IcKIdlGRWcxxiFCIJm5CX/jnSBsyDRpanlSrdkxhzAGsifqj4NQ19ayoeNoZg2ZP +9SLIY7vbmOxJeHEYkx8AG25xOY1PLotb/0buSXPB8e71zb/DCV1rAhhUxAr/2JOQ +RqlZBq6PfcHKLRitXRCeVvfldRxuWBIzhuTLUfRPYR6phjP50EzZPlbJzIvGwsOI +RheITAQYEQIADAUCPh/BhgUJEs/3gAAKCRAcUGQHVkwXoy0JAJ9WTfqfYzW/F6qi +5MxmqDnU9/G+6ACfQVmhZNnGTSfcwQCttwCaW3CRhDY= +=MWUr +-----END PGP PUBLIC KEY BLOCK----- + +Type bits keyID Date User ID +DSS 3072/1024 0x7C037D42 2003/08/05 *** DEFAULT SIGNING KEY *** + Yoav Shapira <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: PGP 6.5.8 + +mQGiBD8u/mgRBAD5WKD5xF3CLrnABeS1DvQQhYH+tJjvAmyZgFkYwaQT7eiiOzLa +PC5knbcBC4nuw+8OOPDFw0Ghb2MFogQzRxD6gpPH2t9eEUsrkPFax2Kw2vNTHRrQ +RGAastmi+EYJsQAoktX2dPseTdrkeJBk240Bfj08ZUFg4uPuho9C45ND6QCg/6SO +FMuan62QE+DwlUiMDo4ZcU0EAMDS8k6Dhb5m/0njO6w9OLTEyzohlsM9AP+4mfgB +NOJYhrzfkFoElOcWSA/V3nmYn2VS0oIYDDtBnjXVWZidzTAWKsbT9/AepS3/P2tG +KMhlXhas+uAiAbMpOglz8fdQ76ivQqyRdS99t4iy/cP2ZC3ShAqZQCacfWY5ZQ8Q +kTILBADvp/eayw8fvtfWQXJ9EjBRbhO4THmP6z8J+4ypG6l0V/RBjDWZybrqibO9 +ejnOjQYJNCnfrfpzQ5l6dHyy86zLyg+bkFxeId4jp/IfDfJX90sGbuQahNYYwqTp +SFiDMI3KN5ZhzhGnx+pKQh59pcux3HyKmcpPa4oB0CT828lWuLQfWW9hdiBTaGFw +aXJhIDx5b2F2c0BhcGFjaGUub3JnPokATgQQEQIADgUCPy7+aAQLAwECAhkBAAoJ +ECZhkcN8A31CGLkAoPRDGtLRwjkzS2F/OBPkRHKF9/atAKCIh3Fmcr2Cdn05P4qF +kBe3QeWVt7kDDQQ/Lv5qEAwAzB13VyQ4SuLE8OiOE2eXTpITYfbb6yUOF/32mPfI +fHmwch04dfv2wXPEgxEmK0Ngw+Po1gr9oSgmC66prrNlD6IAUwGgfNaroxIe+g8q +zh90hE/K8xfzpEDp19J3tkItAjbBJstoXp18mAkKjX4t7eRdefXUkk+bGI78KqdL +fDL2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0Op +lK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPF +RzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEH +NmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4z +ISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGf +nHy9iUsiGSa6q6Jew1XpTDJvAAICC/4iJF383WNktP9/SxeGVIV74r7C7q5Cxr4a +Liy7pEYs52DEft3JzTCLI5O4+NjOw+hEd3QiIytUJRW66V6zd50h4x9lBfK+eMYz +GKNN7kd3aBmH/vXEsG9m9bK1ExwyWq4uyf76nRx1Ya9YthNWmxPUHQnSrOYNPU0/ +beA87ouZG4RL9tYqdu3NKJ4g/DYiaw+twvhSoCUkBEFHFfKLDlv8zyQvPTaPUSAM +Ha5/G2Dj1D5RluMSCEMG1V8+YcYAFh63WEP7Afye0mR1LMJvmlba67ogh0ZSfR+I +ju3lhJ9XOp/2W372F9ZbRJofgofVwHQV6INB5uX7KHAdXtPTss+l1nTmydLhsiPC +5oh99ITPdOm8gRzrP10aFwCnwsqXvr+b7fX/CywpuCOQMIr4sbhbYTTClwDo6E0U +TQ+Nb7PWE+8KuJuobTvMUqDQSQaQBnkpLcvRt3cPppANtkaADAeNf0RqKxxLlym4 +AltN8G8IMLtSJoH9xlQHTQA4tEUeKOeJAEYEGBECAAYFAj8u/moACgkQJmGRw3wD +fUJh7ACdE7QuMkzSbxEzTXnbkS61AUPy06QAoI5b613vrWeqg5Gz9C7TzG+FEEoh +=O17Z +-----END PGP PUBLIC KEY BLOCK----- + +pub 1024D/33C60243 2004-09-12 Mark E D Thomas <[EMAIL PROTECTED]> + Key fingerprint = DCFD 35E0 BF8C A734 4752 DE8B 6FB2 1E89 33C6 0243 +sig 33C60243 2004-09-12 Mark E D Thomas <[EMAIL PROTECTED]> +sub 2048g/0BECE548 2004-09-12 +sig 33C60243 2004-09-12 Mark E D Thomas <[EMAIL PROTECTED]> + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.1 (MingW32) + +mQGiBEFEjegRBADocGttfROvtLGrTOW3xRqZHmFWybmEaI6jmnRdN/1gGXmb3wQL +rHsS3fLFIIOYLPph0Kov9q4qNq36LekShIvjMBDFoj2/wRxaUtFq81asaRZg8Mcw +4kVeIoe8OIOuWmvYhU8SH2jJNUnVVrpTPAa6QWquTmseNi6UJMjLxuL7DwCg//9u +k2yj0vk6e4WSO6Fe5+EkQDED/AjQsy0kj9TpNHkKSSUR2evRlWPYA0YtxBSbsgON +tT0cYipAp5IcYt6Zq5QzHiZreyQXLAjItDS2oGCIXfNbTYJ3kxxJTCU/3wlefVdq +LBh4ttm7gmWaiTDTgG4axLF5oMpAb3m4v6s1KvXVVj2pqkhBknfuoRh1wPqbtwks +7HOIBADVezl1/vny5YzdoqsDx1ByXMLi7CuMexQPllhRbdN+an+ZiJ5YP8J9rPdl +NCELsCCcDKLGLjlp43XfMxsgYAPEZNG2ObjKTarhk3uGYN3aJrx7s+G+c2bu8o2n +SyAFQ1iDsjS87PgSPCONA2/36ZShmv1OjLWz5Vo7hGSPcW4ZdLQiTWFyayBFIEQg +VGhvbWFzIDxtYXJrdEBhcGFjaGUub3JnPohdBBARAgAdBQJBRI3oBwsJCAcDAgoC +GQEFGwMAAAAFHgEAAAAACgkQb7IeiTPGAkOkvgCg0AcTAfe8m2ZSWkbsoqplLDsM +0+oAoNl4EjXT+T2j2z8jdUYPaA8LztJguQINBEFEjekQCAD2Qle3CH8IF3Kiutap +QvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfU +odNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7H +AarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxb +LY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyE +pwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1Xp +Mgs7AAICCACuLSE3vBSOeTMM04ezuPt4zZUp0PFQGQL3bzuZp24f18S8P3BemGAk +2V3HZYJmzmNgd4L0vIC9xyFduICFgbiV9uyzKPwHvCgQwaupFvFLGn7Q9LJ0nlaw +GN7Km13vJTG3rrT/UMKwLTk+IMEYQwUgBht6HTnBaM+UqVx/eB4PHobimt5Redz9 +CnT4DrlA0M6Oh3ePWBD69Nnhwo2AN42dX/W2KcnDe2iRNu/JEbOYsssj0e3VmHwE +mwa064TpQpw1fClyW7sf4aWOcQvcT12R0hNvRhTR1TV0pzjIMkbRPkRezhIY55AT +TIfcaZrw+Yubmmw/pp/1wIDRzHexOq9riEwEGBECAAwFAkFEjekFGwwAAAAACgkQ +b7IeiTPGAkN8ogCg4tHmgylXw4Y3ujF+J4cf2ollGa0AnRkyX8X+u/NrMi2g2xhE +vpsTbAGW +=r1gT +-----END PGP PUBLIC KEY BLOCK----- Propchange: tomcat/tc6.0.x/trunk/KEYS ------------------------------------------------------------------------------ svn:eol-style = native Added: tomcat/tc6.0.x/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?rev=420004&view=auto ============================================================================== --- tomcat/tc6.0.x/trunk/RELEASE-NOTES (added) +++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Fri Jul 7 15:37:03 2006 @@ -0,0 +1,174 @@ + + + Apache Tomcat Version @VERSION@ + Release Notes + + +$Id: RELEASE-NOTES 351503 2005-12-01 22:12:48Z keith $ + + +============================= +KNOWN ISSUES IN THIS RELEASE: +============================= + +* Dependency Changes +* JNI Based Applications +* Bundled APIs +* Web application reloading and static fields in shared libraries +* Tomcat on Linux +* Enabling SSI and CGI Support +* Security manager URLs +* Symlinking static resources +* Enabling invoker servlet +* Viewing the Tomcat Change Log +* When all else fails + + +=================== +Dependency Changes: +=================== +Tomcat 5.5 is designed to run on J2SE 5.0 and later, and requires +configuration to run on J2SE 1.4. Make sure to read the "RUNNING.txt" +file in the fulldocs downloadable file(s) if you are using J2SE 1.4. + +In addition, Tomcat 5.5 uses the Eclipse JDT Java compiler for compiling +JSP pages. This means you no longer need to have the complete +Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment +(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the +binary Tomcat distributions. Tomcat can also be configured to use the +compiler from the JDK to compile JSPs, or any other Java compiler supported +by Apache Ant. + + +======================= +JNI Based Applications: +======================= +Applications that require native libraries must ensure that the libraries have +been loaded prior to use. Typically, this is done with a call like: + + static { + System.loadLibrary("path-to-library-file"); + } + +in some class. However, the application must also ensure that the library is +not loaded more than once. If the above code were placed in a class inside +the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the +application were reloaded, the loadLibrary() call would be attempted a second +time. + +To avoid this problem, place classes that load native libraries outside of the +web application, and ensure that the loadLibrary() call is executed only once +during the lifetime of a particular JVM. + + +============= +Bundled APIs: +============= +A standard installation of Tomcat 5.5 makes all of the following APIs available +for use by web applications (by placing them in "common/lib" or "shared/lib"): +* commons-el.jar (Commons Expression Language 1.0) +* commons-logging-api.jar (Commons Logging API 1.0.x) +* jasper-compiler.jar (Jasper 2 Compiler) +* jasper-compiler-jdt.jar (Eclipse JDT Java compiler) +* jasper-runtime.jar (Jasper 2 Runtime) +* jsp-api.jar (JSP 2.0 API) +* naming-common.jar (JNDI Context implementation) +* naming-factory.jar (JNDI object factories for J2EE ENC support) +* naming-factory-dbcp.jar (DataSource implementation based on commons-dbcp) +* naming-resources.jar (JNDI DirContext implementations) +* servlet-api.jar (Servlet 2.4 API) + +Installing the compatibility package will add the following to the list, which are +needed when running on J2SE 1.4: +* jmx.jar (Java Management Extensions API 1.2 or later) +* xercesImpl.jar (Xerces XML Parser, version 2.6.2 or later) + +You can make additional APIs available to all of your web applications by +putting unpacked classes into a "classes" directory (not created by default), +or by placing them in JAR files in the "lib" directory. + +To override the XML parser implementation or interfaces, use the endorsed +mechanism of the JVM. The default configuration defines JARs located in +"common/endorsed" as endorsed. + + +================================================================ +Web application reloading and static fields in shared libraries: +================================================================ +Some shared libraries (many are part of the JDK) keep references to objects +instantiated by the web application. To avoid class loading related problems +(ClassCastExceptions, messages indicating that the classloader +is stopped, etc.), the shared libraries state should be reinitialized. + +Something which might help is to avoid putting classes which would be +referenced by a shared static field in the web application classloader, +and putting them in the shared classloader instead (JARs should be put in the +"lib" folder, and classes should be put in the "classes" folder). + + +================ +Tomcat on Linux: +================ +GLIBC 2.2 / Linux 2.4 users should define an environment variable: +export LD_ASSUME_KERNEL=2.2.5 + +Redhat Linux 9.0 users should use the following setting to avoid +stability problems: +export LD_ASSUME_KERNEL=2.4.1 + + +============================= +Enabling SSI and CGI Support: +============================= +Because of the security risks associated with CGI and SSI available +to web applications, these features are disabled by default. + +To enable and configure CGI support, please see the cgi-howto.html page. + +To enable and configue SSI support, please see the ssi-howto.html page. + + +====================== +Security manager URLs: +====================== +In order to grant security permissions to JARs located inside the +web application repository, use URLs of of the following format +in your policy file: + +file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar + + +============================ +Symlinking static resources: +============================ +By default, Unix symlinks will not work when used in a web application to link +resources located outside the web application root directory. + +This behavior is optional, and the "allowLinking" flag may be used to disable +the check. + + +========================= +Enabling invoker servlet: +========================= +Starting with Tomcat 4.1.12, the invoker servlet is no longer available by +default in all webapps. Enabling it for all webapps is possible by editing +$CATALINA_HOME/conf/web.xml to uncomment the "/servlet/*" servlet-mapping +definition. + +Using the invoker servlet in a production environment is not recommended and +is unsupported. More details are available on the Tomcat FAQ at +http://tomcat.apache.org/faq/misc.html#invoker. + + +============================== +Viewing the Tomcat Change Log: +============================== +See changelog.html in this directory. + + +==================== +When all else fails: +==================== +See the FAQ +http://tomcat.apache.org/faq/ Added: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=420004&view=auto ============================================================================== --- tomcat/tc6.0.x/trunk/dist.xml (added) +++ tomcat/tc6.0.x/trunk/dist.xml Fri Jul 7 15:37:03 2006 @@ -0,0 +1,766 @@ +<project name="Tomcat 6.0" default="release" basedir="."> + + + <!-- ===================== Initialize Property Values =================== --> + + <!-- See "build.properties.sample" in the top level directory for all --> + <!-- property values you must customize for successful building!!! --> + <property file="${user.home}/build.properties"/> + <property file="build.properties"/> + + <property file="build.properties.default"/> + + <!-- Project Properties --> + <property name="name" value="Apache Tomcat" /> + <property name="year" value="2005" /> + <property name="version.major" value="6" /> + <property name="version.minor" value="0" /> + <property name="version.build" value="0" /> + <property name="version.patch" value="0" /> + <property name="version" value="6.0.0-dev" /> + <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" /> + + <property name="project" value="apache-tomcat" /> + <property name="final.name" value="${project}-${version}" /> + <property name="final-src.name" value="${project}-${version}-src" /> + + <!-- Build Defaults --> + <property name="tomcat.build" value="${basedir}/build"/> + <property name="tomcat.classes" value="${basedir}/classes"/> + <property name="tomcat.dist" value="${basedir}/dist"/> + <property name="tomcat.deployer" value="${basedir}/deployer"/> + <property name="tomcat.release" value="${basedir}/release"/> + <property name="test.failonerror" value="true"/> + <property name="test.runner" value="junit.textui.TestRunner"/> + + <!-- Can't be lower - jsp uses templates --> + <property name="compile.source" value="1.5"/> + + <!-- JAR artifacts --> + <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/> + + <property name="annotations-api.jar" value="${tomcat.build}/lib/annotations-api.jar"/> + <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/> + <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/> + <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> + <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> + <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> + <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> + <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> + + <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> + <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper-el.jar"/> + + <property name="tomcat-dbcp.home" value="${base.path}/tomcat6-deps/dbcp" /> + <property name="jasper-jdt.home" value="${base.path}/tomcat6-deps/jdt" /> + <property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/> + <property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/> + + + <target name="build-webapps-precompile" description="Precompile webapps" > + + <!-- 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"/> + <pathelement location="${commons-logging-api.jar}"/> + <fileset dir="${tomcat.build}/lib"> + <include name="*.jar"/> + </fileset> + <pathelement location="${tomcat.build}/classes"/> + </path> + + <taskdef classname="org.apache.jasper.JspC" name="jasper2" > + <classpath refid="jspc.classpath"/> + </taskdef> + + <jasper2 + compile="false" + validateXml="false" + uriroot="${ROOT.base}" + webXmlFragment="${ROOT.base}/WEB-INF/generated_web.xml" + 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}" + deprecation="${compile.deprecation}" + source="${compile.source}" + failonerror="false" + srcdir="${ROOT.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="${tomcat.build}/common/lib"> + <include name="*.jar"/> + </fileset> + <pathelement location="${tomcat.build}/classes"/> + </classpath> + <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> + + <javac destdir="${jsp-examples.base}/WEB-INF/classes" + optimize="off" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + source="${compile.source}" + failonerror="false" + 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="${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="**" /> + <exclude name="tags/**" /> + </javac> + + <javac destdir="${admin.base}/WEB-INF/classes" + optimize="off" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + source="${compile.source}" + failonerror="false" + 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="${admin.base}/WEB-INF/lib"> + <include name="*.jar"/> + </fileset> + <fileset dir="${tomcat.build}/common/lib"> + <include name="*.jar"/> + </fileset> + <pathelement location="${tomcat.build}/classes"/> + </classpath> + <include name="admin/**" /> + </javac> + </target> + + <target name="fix-webapps"> + <!-- Extra build steps for webapps --> + + <filter token="VERSION" value="${version}"/> + + <!-- Add release notes to the root webapp --> + <copy file="${basedir}/RELEASE-NOTES" + tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" + filtering="true" /> + + <!-- Add documents to the tomcat-docs webapp --> + <copy file="${basedir}/resources/build.xml" + todir="${tomcat.build}/webapps/tomcat-docs" /> + <copy file="./RELEASE-NOTES" + tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt" + 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> + <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"> + <fileset dir="${tomcat.build}/server/webapps/manager/WEB-INF/classes"> + <include name="**/*.class" /> + <include name="**/*.properties" /> + </fileset> + </jar> + <mkdir dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib" /> + <jar jarfile="${tomcat.build}/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar" + index="true"> + <fileset dir="${tomcat.build}/server/webapps/host-manager/WEB-INF/classes"> + <include name="**/*.class" /> + <include name="**/*.properties" /> + </fileset> + </jar> + <mkdir dir="${tomcat.build}/webapps/balancer/WEB-INF/lib" /> + <jar jarfile="${tomcat.build}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar" + index="true"> + <fileset dir="${tomcat.build}/webapps/balancer/WEB-INF/classes"> + <include name="**/*.class" /> + <include name="**/*.properties" /> + </fileset> + </jar> + <mkdir dir="${tomcat.build}/webapps/ROOT/WEB-INF/lib" /> + <jar jarfile="${tomcat.build}/webapps/ROOT/WEB-INF/lib/catalina-root.jar" + index="true"> + <fileset dir="${tomcat.build}/webapps/ROOT/WEB-INF/classes"> + <include name="**/*.class" /> + <include name="**/*.properties" /> + </fileset> + </jar> + + <!-- Add XML declarations for admin, manager and balancer --> + <copy file="${tomcat.build}/server/webapps/manager/manager.xml" + todir="${tomcat.build}/conf/Catalina/localhost" /> + <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml" + todir="${tomcat.build}/conf/Catalina/localhost" /> + <copy file="${tomcat.build}/server/webapps/admin/admin.xml" + todir="${tomcat.build}/conf/Catalina/localhost" /> + + </target> + + <!-- ====================== Deployer target =================== --> + + <target name="deployer" description="Create the Tomcat deployer binary" > + + <!-- Servlet and JSP --> + <copy todir="${tomcat.deployer}/lib"> + <fileset dir="${tomcat.build}/lib"> + <include name="el-api.jar"/> + <include name="jasper-el.jar"/> + <include name="jsp-api.jar"/> + <include name="jasper.jar"/> + <include name="servlet-api.jar"/> + </fileset> + </copy> + + <!-- Digester and dependencies --> + <copy todir="${tomcat.deployer}/lib" + file="${tomcat.build}/lib/catalina-ant.jar"/> + <copy todir="${tomcat.deployer}/lib" file="${commons-logging-api.jar}"/> + <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"> + <fileset dir="${tomcat.build}/classes"> + <include name="org/apache/catalina/startup/DigesterFactory.class" /> + <include name="org/apache/catalina/util/SchemaResolver.class" /> + <include name="org/apache/catalina/util/StringManager.class" /> + <include name="org/apache/tomcat/util/*" /> + <include name="org/apache/tomcat/util/digester/*" /> + <exclude name="**/package.html" /> + <exclude name="**/LocalStrings_*" /> + </fileset> + </jar> + + <!-- Main build script --> + <copy todir="${tomcat.deployer}"> + <fileset dir="${basedir}/res/deployer" /> + </copy> + + <!-- Copy deployer documentation --> + <copy todir="${tomcat.deployer}"> + <fileset dir="${tomcat.build}/webapps/docs"> + <include name="images/jakarta-logo.gif" /> + <include name="images/tomcat.gif" /> + </fileset> + </copy> + <copy tofile="${tomcat.deployer}/docs/manual.html" + file="${tomcat.build}/webapps/docs/printer/deployer-howto.html" /> + + </target> + + <!-- ====================== COMBO: Clean All Directories ================ --> + <target name="clean" + description="Clean all components"> + + <delete dir="${tomcat.deployer}"/> + <delete dir="${tomcat.dist}" failonerror="false"/> + + </target> + + + <!-- ====================== DIST: Create Directories ==================== --> + <target name="dist-prepare"> + <mkdir dir="${tomcat.dist}"/> + <mkdir dir="${tomcat.dist}/bin"/> + <mkdir dir="${tomcat.dist}/conf"/> + <mkdir dir="${tomcat.dist}/lib"/> + <mkdir dir="${tomcat.dist}/logs"/> + <mkdir dir="${tomcat.dist}/temp"/> + <mkdir dir="${tomcat.dist}/webapps"/> + <mkdir dir="${tomcat.dist}/work"/> + </target> + + + <!-- ====================== DIST: Copy Static Files ===================== --> + <target name="dist-static" depends="dist-prepare"> + + <!-- Copy the top-level documentation files --> + <copy todir="${tomcat.dist}"> + <fileset dir="."> + <include name="INSTALLING.txt"/> + <include name="LICENSE"/> + <include name="NOTICE"/> + <include name="README.txt"/> + <include name="RELEASE*"/> + <include name="RUNNING.txt"/> + </fileset> + </copy> + + <!-- Copy the contents of each "build" directory --> + <copy todir="${tomcat.dist}/bin"> + <fileset dir="${tomcat.build}/bin"> + </fileset> + </copy> + <copy todir="${tomcat.dist}/lib"> + <fileset dir="${tomcat.build}/lib" /> + </copy> + <copy todir="${tomcat.dist}/conf"> + <fileset dir="${tomcat.build}/conf"> + </fileset> + </copy> + + <copy todir="${tomcat.dist}/webapps"> + <fileset dir="${tomcat.build}/webapps"> + <exclude name="**/balancer/WEB-INF/classes/**" /> + <exclude name="**/ROOT/WEB-INF/classes/**" /> + <exclude name="**/WEB-INF/src/**" /> + </fileset> + </copy> + + <!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 --> + <touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" /> + + <!-- Correct permissions and line endings on "bin" scripts --> + <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"/> + <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/> + <chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/> + + </target> + + <target name="dist-javadoc" description="Create the Tomcat javadoc" > + <javadoc packagenames="org.apache.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/api" + author="true" version="true" + windowtitle="Tomcat API Documentation" + doctitle="Tomcat API" + bottom="Copyright © 2000-2006 Apache Software Foundation. All Rights Reserved." + additionalparam="-breakiterator"> + </javadoc> + </target> + + <target name="dist-deployer" description="Create the Tomcat deployer binary" > + + <!-- Servlet and JSP --> + <copy todir="${tomcat.deployer}/lib"> + <fileset dir="${tomcat.build}/lib"> + <include name="el-api.jar"/> + <include name="jsp-api.jar"/> + <include name="jasper.jar"/> + <include name="jasper-el.jar"/> + <include name="servlet-api.jar"/> + </fileset> + </copy> + + <!-- Digester and dependencies --> + <copy todir="${tomcat.deployer}/lib" + file="${tomcat.build}/lib/catalina-ant.jar"/> + <copy todir="${tomcat.deployer}/lib" file="${commons-logging.jar}"/> + <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"> + <fileset dir="${tomcat.classes}"> + <include name="org/apache/catalina/startup/DigesterFactory.class" /> + <include name="org/apache/catalina/util/SchemaResolver.class" /> + <include name="org/apache/catalina/util/StringManager.class" /> + <include name="org/apache/tomcat/util/*" /> + <include name="org/apache/tomcat/util/digester/*" /> + <exclude name="**/package.html" /> + <exclude name="**/LocalStrings_*" /> + </fileset> + </jar> + + <!-- Main build script --> + <copy todir="${tomcat.deployer}"> + <fileset dir="${basedir}/res/deployer" /> + </copy> + + <!-- Copy deployer documentation --> + <copy todir="${tomcat.deployer}"> + <fileset dir="${tomcat.build}/webapps/docs"> + <include name="images/jakarta-logo.gif" /> + <include name="images/tomcat.gif" /> + </fileset> + </copy> + <copy tofile="${tomcat.deployer}/docs/manual.html" + file="${tomcat.build}/webapps/docs/printer/deployer-howto.html" + failonerror="false"/> + + </target> + + <!-- ====================== DIST: Create Sources ======================== --> + <target name="dist-source"> + + <mkdir dir="${tomcat.dist}/src"/> + + <!-- Tomcat source --> + <copy todir="${tomcat.dist}/src"> + <fileset dir="${basedir}"> + <exclude name=".*/**"/> + <exclude name="build/**"/> + <exclude name="classes/**"/> + <exclude name="dist/**"/> + <exclude name="release/**"/> + <exclude name="deployer/**"/> + <exclude name="build.properties"/> + </fileset> + </copy> + + </target> + + + <!-- ================= DIST: Create Windows Installer =================== --> + <target name="installer" + description="Create Windows installer" if="execute.installer"> + <echo message="Builds a Windows installer based on Nullsoft Installer"/> + <copy todir="${tomcat.dist}"> + <fileset dir="resources" /> + </copy> + <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> + <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> + <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> + <copy file="${jtc.home}/procrun/bin/tomcat5.exe" + tofile="${tomcat.dist}/bin/tomcat5.exe" /> + <copy file="${jtc.home}/procrun/bin/tomcat5w.exe" + tofile="${tomcat.dist}/bin/tomcat5w.exe" /> + + <filter token="VERSION" value="${version}"/> + <filter token="VERSION_NUMBER" value="${version.number}"/> + + <copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" filtering="true"/> + <exec dir="${tomcat.dist}" executable="${nsis.exe}"> + <arg value="/DNSISDIR=${nsis.home}" /> + <arg value="tomcat.nsi" /> + </exec> + + <move file="${tomcat.dist}/tomcat-installer.exe" tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" /> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}.exe.md5" + message="${md5sum.binary-prefix}${final.name}.exe${line.separator}" append="true" /> + </target> + + + <!-- ==================== RELEASE: Create Release ======================= --> + <target name="release" depends="clean,dist-static,dist-source,dist-javadoc,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,package-docs-tgz" + description="Create a Tomcat 5 packaged distribution"> + + <filter token="VERSION" value="${version}"/> + <copy file="KEYS" + todir="${tomcat.release}/v${version}"/> + <copy file="RELEASE-NOTES" + todir="${tomcat.release}/v${version}" + filtering="true"/> + <copy file="res/welcome.main.html" + tofile="${tomcat.release}/v${version}/README.html" + filtering="true"/> + <copy file="res/welcome.bin.html" + tofile="${tomcat.release}/v${version}/bin/README.html" + filtering="true"/> + + <!-- This is why releasing must be done on a Windows box: + otherwise this check fails and the .exe distro is not generated --> + <condition property="execute.installer"> + <and> + <os family="windows" /> + <available file="${nsis.exe}" /> + <available file="${nsis.installoptions.dll}" /> + <available file="${nsis.nsexec.dll}" /> + <available file="${nsis.nsisdl.dll}" /> + </and> + </condition> + + </target> + + <!-- Packages the core zip distro --> + <target name="package-zip"> + <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip"> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}"> + <include name="bin/**"/> + <include name="conf/**"/> + <include name="logs/**"/> + <include name="lib/**"/> + <include name="webapps/**"/> + <include name="work/**"/> + <include name="temp/**"/> + <include name="LICENSE"/> + <include name="NOTICE"/> + <include name="README.txt"/> + <include name="RELEASE-NOTES"/> + <include name="RUNNING.txt"/> + <include name="BENCHMARKS.txt"/> + <exclude name="webapps/admin/**"/> + <exclude name="conf/Catalina/localhost/admin.xml"/> + </zipfileset> + </zip> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}.zip" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}.zip.md5" + message="${md5sum.binary-prefix}${final.name}.zip${line.separator}" append="true" /> + </target> + + <!-- Packages the deployer distribution in zip format --> + <target name="package-deployer-zip"> + <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip"> + <zipfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer" includes="**" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="LICENSE" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="NOTICE" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="README.txt" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}-deployer" includes="RELEASE-NOTES" /> + </zip> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.zip.md5" + message="${md5sum.binary-prefix}${final.name}-deployer.zip${line.separator}" append="true" /> + </target> + + <!-- Packages the admin webapp distro in zip format --> + <target name="package-admin-zip"> + <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}-admin.zip"> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}"> + <include name="server/webapps/admin/**"/> + <include name="conf/Catalina/localhost/admin.xml"/> + <exclude name="*.jsp" /> + </zipfileset> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="LICENSE" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="NOTICE" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="README.txt" /> + <zipfileset dir="${tomcat.dist}" prefix="${final.name}" includes="RELEASE-NOTES" /> + </zip> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.zip.md5" + message="${md5sum.binary-prefix}${final.name}-admin.zip${line.separator}" append="true" /> + </target> + + <!-- Packages the core tar.gz distro --> + <target name="package-tgz"> + <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/> + <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/> + <tar longfile="gnu" compression="gzip" + tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz"> + <tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}"> + <include name="bin/catalina.sh" /> + <include name="bin/digest.sh" /> + <include name="bin/jasper.sh" /> + <include name="bin/jspc.sh" /> + <include name="bin/setclasspath.sh" /> + <include name="bin/startup.sh" /> + <include name="bin/shutdown.sh" /> + <include name="bin/tool-wrapper.sh" /> + <include name="bin/tool-wrapper-using-launcher.sh" /> + <include name="bin/shutdown-using-launcher.sh" /> + <include name="bin/startup-using-launcher.sh" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}"> + <include name="conf/**" /> + <exclude name="conf/Catalina/localhost/admin.xml" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}" prefix="${final.name}"> + <include name="bin/**" /> + <include name="common/**" /> + <include name="logs/**" /> + <include name="server/**" /> + <include name="shared/**" /> + <include name="temp/**" /> + <include name="webapps/**" /> + <include name="work/**" /> + <include name="LICENSE" /> + <include name="NOTICE" /> + <include name="README.txt" /> + <include name="RELEASE-NOTES" /> + <include name="RUNNING.txt" /> + <include name="BENCHMARKS.txt" /> + <exclude name="bin/catalina.sh" /> + <exclude name="bin/digest.sh" /> + <exclude name="bin/jasper.sh" /> + <exclude name="bin/jspc.sh" /> + <exclude name="bin/setclasspath.sh" /> + <exclude name="bin/startup.sh" /> + <exclude name="bin/shutdown.sh" /> + <exclude name="bin/tool-wrapper.sh" /> + <exclude name="bin/tool-wrapper-using-launcher.sh" /> + <exclude name="bin/shutdown-using-launcher.sh" /> + <exclude name="bin/startup-using-launcher.sh" /> + <exclude name="conf/**" /> + <exclude name="src/**" /> + <exclude name="server/webapps/admin/**" /> + </tarfileset> + </tar> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}.tar.gz.md5" + message="${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}" append="true" /> + </target> + + <!-- Packages the deployer Tomcat distro in tar.gz format --> + <target name="package-deployer-tgz"> + <fixcrlf srcdir="${tomcat.dist}" + includes="*.txt,LICENSE,NOTICE" eol="lf"/> + <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"/> + + <tar longfile="gnu" compression="gzip" + tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz"> + <tarfileset dir="${tomcat.dist}" prefix="${final.name}-deployer"> + <include name="LICENSE" /> + <include name="NOTICE" /> + <include name="README.txt" /> + <include name="RELEASE-NOTES" /> + </tarfileset> + <tarfileset dir="${tomcat.deployer}" prefix="${final.name}-deployer"> + <include name="**" /> + </tarfileset> + </tar> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz.md5" + message="${md5sum.binary-prefix}${final.name}-deployer.tar.gz${line.separator}" append="true" /> + </target> + + <!-- Packages the admin webapp distro in tar.gz format --> + <target name="package-admin-tgz"> + <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/> + + <tar longfile="gnu" compression="gzip" + tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz"> + <tarfileset dir="${tomcat.dist}" prefix="${final.name}"> + <include name="LICENSE" /> + <include name="NOTICE" /> + <include name="README.txt" /> + <include name="RELEASE-NOTES" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}" prefix="${final.name}"> + <include name="server/webapps/admin/**" /> + <exclude name="*.jsp" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}" mode="600" prefix="${final.name}"> + <include name="conf/Catalina/localhost/admin.xml" /> + </tarfileset> + </tar> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz.md5" + message="${md5sum.binary-prefix}${final.name}-admin.tar.gz${line.separator}" append="true" /> + </target> + + <!-- Packages the documentation distro in tar.gz format --> + <target name="package-docs-tgz"> + + <!-- Package gocs --> + <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/> + + <tar longfile="gnu" compression="gzip" + tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz"> + <tarfileset dir="${tomcat.dist}" prefix="tomcat-6.0-doc"> + <include name="LICENSE" /> + <include name="NOTICE" /> + <include name="README.txt" /> + <include name="RUNNING.txt" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="tomcat-6.0-doc"> + <include name="**" /> + </tarfileset> + </tar> + + <checksum file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.md5" + message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}" append="true" /> + </target> + + <!-- Packages the source code distribution in zip format --> + <target name="package-src-zip"> + <zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip"> + <zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" /> + </zip> + + <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.zip" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/src/${final-src.name}.zip.md5" + message="${md5sum.binary-prefix}${final-src.name}.zip${line.separator}" append="true" /> + </target> + + <!-- Packages the source code distribution in tar.gz format --> + <target name="package-src-tgz"> + <fixcrlf srcdir="${tomcat.dist}" + excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" eol="lf"/> + + <tar longfile="gnu" compression="gzip" + tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz"> + <tarfileset dir="${tomcat.dist}/src" mode="755" prefix="${final-src.name}"> + <include name="${jtc.project}/jk/native/buildconf.sh" /> + <include name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" /> + <include name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" /> + <include name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" /> + <include name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" /> + <include name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" /> + <include name="${jtc.project}/jk/native/domino/mkini.sh" /> + </tarfileset> + <tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}"> + <exclude name="${jtc.project}/jk/native/buildconf.sh" /> + <exclude name="${jtc.project}/jk/native/apache-1.3/build-hpux-cc.sh" /> + <exclude name="${jtc.project}/jk/native/apache-1.3/build-solaris.sh" /> + <exclude name="${jtc.project}/jk/native/apache-1.3/build-unix.sh" /> + <exclude name="${jtc.project}/jk/native/apache-2.0/build-unix.sh" /> + <exclude name="${jtc.project}/jk/native/apache-2.0/install-unix.sh" /> + <exclude name="${jtc.project}/jk/native/domino/mkini.sh" /> + </tarfileset> + </tar> + + <checksum file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz" + forceOverwrite="yes" fileext=".md5" /> + <echo file="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz.md5" + message="${md5sum.binary-prefix}${final-src.name}.tar.gz${line.separator}" append="true" /> + </target> + +</project> Propchange: tomcat/tc6.0.x/trunk/dist.xml ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]