You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2007/08/04 16:41:49 UTC

svn commit: r562725 [2/33] - in /portals/pluto/branches/1.1-286-trunk-merge: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/ maven-pluto-plugin/src/ maven-pluto-plugin/src/main/...

Added: portals/pluto/branches/1.1-286-trunk-merge/KEYS
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/KEYS?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/KEYS (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/KEYS Sat Aug  4 07:41:23 2007
@@ -0,0 +1,214 @@
+(instructions copied from forrest's KEYS file)
+
+This file contains the PGP keys of various developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Users: pgp < KEYS
+Developers:
+        pgp -kxa <your name> and append it to this file.
+        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+        (gpg --list-sigs <your name>
+             && gpg --armor --export <your name>) >> this file.
+------------------------------------------------------------------------
+
+pub  1024D/E41EDC7E 2003-09-26 Carsten Ziegeler <cz...@apache.org>
+sig 3       E41EDC7E 2003-09-26   Carsten Ziegeler <cz...@apache.org>
+sig 3       EE56550E 2003-12-01   Cliff Schmidt <cl...@alum.mit.edu>
+sig 3       CC78C893 2003-11-18   Rich Bowen <rb...@rcbowen.com>
+sig 3       EE65E321 2003-11-24   Martin Kraemer <ma...@apache.org>
+sig         40581837 2003-11-27   Nick Kew <ni...@webthing.com>
+sig 3       142B509B 2003-11-25   Glenn L. Nielsen (Sign jakarta.apache.org distributions) <gl...@apache.org>
+sig 3       CE19D5C6 2003-11-18   Jamie Wallingford (legobuff) <ja...@legobuff.com>
+sig 3       D147B776 2003-11-28   Mitch Comstock (RAID) <mc...@raidworks.com>
+sig 2       65FDCDEE 2003-11-20   James Howison <ja...@freelancepropaganda.com>
+sig         FD093C41 2003-11-23   James M. Turner <tu...@blackbear.com>
+sig 2       A1D69759 2003-11-24   Michael Kellen <id...@visi.com>
+sig 2       76D83CC6 2003-11-22   Manoj Kasichainula <ma...@apache.org>
+sig 3       A54DA2DF 2003-11-18   Erin Mulder <me...@alumni.princeton.edu>
+sig         152924AF 2003-11-22   Sander Temme <sa...@temme.net>
+sig         964F31D9 2003-11-22   [User id not found]
+sig         B6B45F1F 2003-11-19   Chengetai Masango <ch...@masango.net>
+sig 2       4C9165B6 2003-11-18   Aaron Mulder <am...@alumni.princeton.edu>
+sig 3       F5FC4B42 2003-11-21   Theodore W. Leung <tw...@sauria.com>
+sig 2       F88341D9 2003-11-30   Lars Eilebrecht <la...@eilebrecht.org>
+sig 3       A11D56FB 2003-12-03   Geoffrey Young (http://www.modperlcookbook.org/~geoff/) <ge...@modperlcookbook.org>
+sub  1024g/0F6ED732 2003-09-26
+sig         E41EDC7E 2003-09-26   Carsten Ziegeler <cz...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.3 (MingW32)
+
+mQGiBD90V4MRBAC1lbNdQ9fvvooWXlFx9u/C3Vtsgc+ZsukqBRQRuSEBNZKQr3XC
+NmOy6rlLKan0brlr8L+6xmkQgJCgsNGnjqwIHRe8irMLEqK+uGhpoQ9z4zgc6JVl
+CLarZPvqe7GOifOKlheadWrkkRQMOuKjDF8Nuy10S4jaIEVMhPcorakbYwCgqXzA
+GD/327IVU2SEfL2ezVC1nc0D/Rj43bqn/GzB6pBUIaG2LNAfPtVfdmnqjKa/0PDF
+/hxyGN2Pb5BBlBAZe/ysNRNpGi+kVqGxweccugco6atDRv/INPVQ1dSKAoX/zuuE
+rMeTCaXYE45uBXYhvSsGM2iNJYcS/VW10ZW5RD3F5eWVSo50Xin4obmJmlfr8BTp
+VoxNBACjYrCo9f2MI30fxCgKu9ugyz/rFA7Zja/Hq18jyUWUA8oIQ6VonNvnEu80
+9jf1c23HtKQu+f4yHBDKR6RKsas5kCQDZJncQCn8PHRqSkLWRsAnl2e8fY72QnVI
+pSL7HZ4AnOAaO9sMONQMADq3q9muQofNQDS79IRAWXP7kDT5pbQnQ2Fyc3RlbiBa
+aWVnZWxlciA8Y3ppZWdlbGVyQGFwYWNoZS5vcmc+iF4EExECAB4FAj90V4MCGwMG
+CwkIBwMCAxUCAwMWAgECHgECF4AACgkQEy5J1OQe3H4aLwCdEP8ARIZxOvFITQ7I
+nee1qC85BbsAnjnKXQaUm1unAnNHwN7fNyZnnIuEiEYEExECAAYFAj/K5J0ACgkQ
+aFp3yu5WVQ43XwCfahn9RObiYcvqRFXPtze303XMRQIAoIvStwGIypv7YrjeS/70
+EpaQMPn5iEYEExECAAYFAj+6hk0ACgkQXP03+sx4yJOqUwCg17eCYJCnmzDw9GTe
+/BKGPZj12LYAoMnIahWcyIFLlLOP9ISlMKlr5EkWiJwEEwECAAYFAj/Cd1AACgkQ
+N+P0X+5l4yE+dQQArTUZsgHjZE1M9DRQhZQkU20/WzW4NVxWaYdW2/tIy/a293Zd
+RWG9QDe1VPT7KUoAT306N5HqM4TUjg2QjAyg6ou6J76yk62j1Hsj0RJskf0IMXiF
+NZICn7z+y6FsCI60flgpOKI11GZeAI6FLGppcsF5NCnAP9PKv20EQ07kUeqIRgQQ
+EQIABgUCP8YSFAAKCRBtC8c6QFgYN2IOAJ4lgeI6pvXBeEM13xq9WSplyS9z7gCc
+CO/dGO4i7M9rcDp9B79sy/Qpnk6IRgQTEQIABgUCP8OFGQAKCRD6PI0mFCtQm93V
+AKCMJi0mWq0PLehrhpGwJKrzdt6DSgCgiRqkfD1u4lj6rezjCxH9GR6b9HqIRgQT
+EQIABgUCP7mp+AAKCRCoHuZJzhnVxkHGAJ4moSSBBtV6ynXFk+k26ca1M5Lx5QCd
+G8MrlXJ5ThRD4ZecP79x5x8CmTeIRgQTEQIABgUCP8e9LgAKCRCkdA850Ue3dsVa
+AJ9h8CF7Tj68kwbzhY0/RjkA2pA94gCfQH1azsf2LYhOvObOrknpk1ZALOGIRgQS
+EQIABgUCP7xjvgAKCRDsmT1jZf3N7jUmAJ41pjcLgAkHvGnfv9jZYz4CqvrGfgCd
+ERE/EX2IX0bYOraPIcuhcHaHCQ2IRgQQEQIABgUCP8BjyAAKCRAaCdGD/Qk8QVAN
+AKCMesKnneWni3IardexYlkChRaLXACgtmgMT0KWnWAwk3zji3zkVgk72HqIRgQS
+EQIABgUCP8FOvQAKCRDMITAgodaXWbO0AKCPOmm3BjK/OrGzsu+04g6SfuV8fQCf
+b0SDGLgnslcqkzU02ZxT+hHWAbCJARwEEgECAAYFAj+/wxYACgkQBurPqnbYPMbJ
+ugf/X7I18RgC6uFsPXsCMQh/EQdDO3Cll8SnmCmNz08jlE89cDiHAgJZ6b7n+p+G
+v44DaO5Ofkb+iwtTHuFuvG50qY45X2/oyBJHllXlbxMEyjWfhny6hD84WYnM7PS2
+a6gww0+beCz77ESw6RdHgIFNvZnn0Ca58QLKixlKfNxqaqrR6EG6zUI9qdNX1XVc
+Wfu70EZfaZ0Kx5jTDz4h7TGw59oH+NBDRpGvU213NFyckbcGav11GgLBCwR6Iyzx
+nFTrowWXR2QXfX8akSFg6Oz1k818Pjwolr1l3JF5YAaDxwJ4qZo/ldHSF4/+fAmC
+JLJfRco6ndv8rFr6FV0+SVv5dIhGBBMRAgAGBQI/uaDwAAoJEBD6TIilTaLfcHoA
+oOl0OsrJQ1JAgtyCXTs0VxJAXshnAKDXdDvK0ZevnovRoZvMW6RYv0+STYhGBBAR
+AgAGBQI/v6F3AAoJELK+vEAVKSSvF/8AnjieEHBnFWQQNrZtknhXQeyzkS9eAJ9U
+I6CHLstOQAIQj6dgQIfXS6oaHohGBBARAgAGBQI/v6OIAAoJEMEee0eWTzHZlWIA
+oLPh3TMdnARqbnzFpHQV0BN1Y+53AKDm7WOQM+PUUOcXrlYw63CVC9QPP4hGBBAR
+AgAGBQI/u6D5AAoJEKRZJPC2tF8fWigAoMOg9N7DfgZCaMDH/uiZPeVDYLx1AKD4
+H4Cv3wOrBC9gsfOz8vPc+psGu4hGBBIRAgAGBQI/uc+fAAoJELkkUqxMkWW2D0oA
+nilUs/fdruISz7OcUHSYoFb5lxxpAJ0SbzM82p96RMGjtMtLWdDNm3AKz4hGBBMR
+AgAGBQI/vcjeAAoJEL66K4f1/EtCILwAn2x9+QkXNkfTt5LEHmJAXXzkr2aFAJ9l
+vz17ctX04GyH0E2p7lMU9qJvWoiZBBIBAgAGBQI/ym6tAAoJED6Pt/L4g0HZKPED
+51Q8rmnCha+FQi8+42sTbBjWSkYmsB/84mjddFlK40AfmKpXNnF5lpHCPBfdtuG7
+/r3mnQrT/T5PBlWA088zyQhzBTsCNObNQE/5cwoKv2sOuWMZ/HW5JFYJgfQoqb4b
+hTkSy7d0ncIW4Rq+heZc/E8xWmUpQH1CrFzvB2bsiEYEExECAAYFAj/N+agACgkQ
+CVpF3KEdVvtdTwCgtbh65s6vDfxmgVqxdkqsi3Nak20AmgM7hfMHhUcn+Y8PAyYv
+0OrVvODkuQENBD90V4QQBACNBis1jev/dbIOmVHw096OO2p/R0tuXSx2q0wfjRtE
+qkBOBz/Wdr0gCTJMMOWAYlKhM3ZPbs3bcrT8HXYK5GCpvWQj5SGe2E/Mreolvl+i
+1U4GGhZVVDQziZdImmSDsqCHPj4s5KWJhnkSrE3asWennYqLAEuv62SF/rOawEfr
+2wADBQP9EmVJEG9mDpwj4SZ0kFbBbbqc6t1ntRjx8PkW49znU0NOCM2lIaOM3leM
+8bm5zgbnD4kS7gDItOwzPaHepLrh7a7OVUTpf/HxUgtLAjazF445mjKk1/KQ7oU5
+SR5j3nJZwaI6wTBoI94fk/BBZtxZ4EcdgcJhQABI9LoKr+vTa2eISQQYEQIACQUC
+P3RXhAIbDAAKCRATLknU5B7cfgWMAJ9w/IX0FwxyOhwCveM1PDrVWxT4dQCfaG22
+PDGaBFWsUIyQDUGS56dkC0k=
+=4pJn
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub  1024D/320B4FB4 2004-12-05 Nick Lothian (Apache) <nl...@apache.org>
+sig 3       320B4FB4 2004-12-05   Nick Lothian (Apache) <nl...@apache.org>
+sub  1024g/5436F884 2004-12-05
+sig         320B4FB4 2004-12-05   Nick Lothian (Apache) <nl...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.2.5 (MingW32)
+
+mQGiBEGy7V4RBACHbTfwKP3tYgujjVlgIuH6O/kZAZkGr5BlK6t3aZxWxn1hnZUb
+u9fNdFK6TuVxLN8/clRHw6SqKjfFsFl0ximws9ArgvAZtOB7lAwI8Dun7cqLiQ92
+4h/FivOXumqsFmUNWLtbbyzlbbjOs6yuUTUMn94X+sjR1BdJ61jHsX27HwCg+gYJ
+C8sC9azTSP520s+QDIqqqC0D/0Ixw9E1ioTREC+DKTl0Yc67NttrRja860eyJ5gW
+3EbADK57jaHUJbUpGkuJhGKnNlCbE4Zg+j//kTKU8RdO/DO9h61MfIAjSjAlI880
+I4GqQcVKN1cRwFCW1qiZHjqMxeDv+SUVuTde6ZmFT7pCpQGy3/vq3H/29ejkVnVn
+EmJsA/4vwczcvXfCt2j2hyq8p/70TO9fm/tWaPLfYZ9s61M2wCXT5414L+K/KS+L
++ucXCNumVQSMmsAg4rCS9vE+WPxaT/KqvDyEeSpfNA9KK0tgL2pAT+J/ikDqmiFV
+SSwYLdFfmKpfhL1OUHoInmFzhJB0sKFJ2xPY2B5WyKXSPRGUerQrTmljayBMb3Ro
+aWFuIChBcGFjaGUpIDxubG90aGlhbkBhcGFjaGUub3JnPoheBBMRAgAeBQJBsu1e
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEJIfsKkyC0+0c6cAoOP9ObcM2kMD
+iEFWoW9btpC6+6RNAJ9fls4oHGsbY63s2NDPe0jMTMGrC7kBDQRBsu1fEAQAg1ys
+XC9D+Gyh33sxe4CD/lQGi0EeFMmsoKB9ZGsKy3BOy9bkYq6QFP4K1+ylYoiQ6Tb3
+BN2IiFqzP2MO8rLq1Gh7XFzbXEidj1xe9kXct5KAE8DnkQ7WTsqj9hpuae1Ipd3P
+dMaAnmGz38pEPezXrR5sUJQF9bg7q7XUWDmZ1HcAAwUD/jl89B8FOXDaNIl/Fb1S
+Kb3DQxbRJ2wQlbXi/td61sS9rznnv4bo2CoJ/Du5EYUoM4QDfj0Q/6eLEMSvz2VI
+b66kU2nLK7ERgk6I8be0ODpeU0XNMtFly7kg51uAhDg9Z0j+sFzbWRCr+zY2NUoo
+hRIdPJ55WPTQBZWaEBCikeEHiEkEGBECAAkFAkGy7V8CGwwACgkQkh+wqTILT7To
+AgCeIYQjWxrjd4c2jsB/ytfDVBBJZiUAn2LByyqYsMAQQVRyJaWF1E8b4TD4
+=Z3c0
+-----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/DD4200EA 2004-11-02
+uid                  David H. DeWolf <da...@daviddewolf.com>
+sig 3        DD4200EA 2004-11-02  David H. DeWolf <da...@daviddewolf.com>
+uid                  David H. DeWolf <dd...@apache.org>
+sig 3        DD4200EA 2004-11-02  David H. DeWolf <da...@daviddewolf.com>
+uid                  David H. DeWolf <dd...@rocketmail.com>
+sig 3        DD4200EA 2004-11-02  David H. DeWolf <da...@daviddewolf.com>
+uid                  David H. DeWolf <dd...@gmail.com>
+sig 3        DD4200EA 2004-11-02  David H. DeWolf <da...@daviddewolf.com>
+uid                  David H. DeWolf <da...@digitalfocus.com>
+sig 3        DD4200EA 2005-06-25  David H. DeWolf <da...@daviddewolf.com>
+sub   1024g/F7DE5A9C 2004-11-02
+sig          DD4200EA 2004-11-02  David H. DeWolf <da...@daviddewolf.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.0 (Cygwin)
+
+mQGiBEGHzhMRBACVBP2u+rePvFsGWoSnlpbXUJO3EyEHSlRKNeu+5MMLp2tYpP6k
+zM9zBFNHf0elbA8KESVkv6D6/YilYfogxvw+dgVy2sFsSDDxplaIOEumX783aiGS
+fYi7KM3W61co2g9RlKZm8Ho8ZVV0WoTD2L/OPKm1PRvlqM6eh6Pmr5fZhwCg88ZE
+jjtjg92j77t/ciZZ9a6YKrcD/0RDdIQl408krXfbCLK6AQXnzu5mJUjWit0HCtXr
+cN2UsAwX1KAANNV54N0IxxBWw1CpUIolIhZBpgE8Se5hNU90sTvvGjieWkiL1rET
+SolKIJT+cqzf6C9dzIydxuR2X+W6l6IKlytk0AYwaup9scAij0Zexx1qxHxjxylU
+Ief9A/9+lVQZ7Wd04Ul6/Wt+tcguP5OIr6fWVoD7+xRH5JtBGurUsm7eRsky65SJ
+OkNxJYsfXR4g7LygCMBZSG/nAx5Eus+Ah4mEHgHJ0h+AZOCY1EDs4K3LN47AkW/D
++vRbvfvMmh7J1pizubwyo0iyYniraQNI1zCWWrEereB/L3S9FLQnRGF2aWQgSC4g
+RGVXb2xmIDxkYXZpZEBkYXZpZGRld29sZi5jb20+iGEEExECACECGwMGCwkIBwMC
+AxUCAwMWAgECHgECF4AFAkGH1CgCGQEACgkQshdj+t1CAOrZygCgj41mE/x1iVew
+oqXBWdCTA+GYjX4AnRVodDBzkWCndt9n7HfNCL1nFL4vtCREYXZpZCBILiBEZVdv
+bGYgPGRkZXdvbGZAYXBhY2hlLm9yZz6IXgQTEQIAHgIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAUCQYfUJgAKCRCyF2P63UIA6g9lAJ4i2NY+zD4bxJi0h2EpNkO+rgVF
+/ACgmL2VgAi8/lU8LXQDrLO3F30nrKi0KERhdmlkIEguIERlV29sZiA8ZGRld29s
+ZkByb2NrZXRtYWlsLmNvbT6IXgQTEQIAHgUCQYfSHwIbAwYLCQgHAwIDFQIDAxYC
+AQIeAQIXgAAKCRCyF2P63UIA6gEiAKCU58ktQAUGOMwpJXluG95mhhrCIwCg6bFe
+atZ5JvPoJwwiXBmbbZC3Oeq0I0RhdmlkIEguIERlV29sZiA8ZGRld29sZkBnbWFp
+bC5jb20+iF4EExECAB4FAkGH0jwCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ
+shdj+t1CAOqIRACgxA80v9zy9y+Aco3UNsC9DLHkwJ0AnRJPuPkt89NE/opcbgNH
+uI3+ylFbtC9EYXZpZCBILiBEZVdvbGYgPGRhdmlkLmRld29sZkBkaWdpdGFsZm9j
+dXMuY29tPoheBBMRAgAeBQJCvLVHAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJ
+ELIXY/rdQgDqCyAAmwf4gVzRpTaAFoSYp6ZmDAR8Qt5JAKCYMvybti9CFzYsa96D
+P7G0aRuxxLkBDQRBh84TEAQA6zybsVGREjBQ+wKLT764hWjR7SkBaIjYLZJHUOwl
+6TNXhl9302lT+DeQAQXeBGUIg79QR/JHjLL5MoMHeQ+xPbY/EtrlGL9O67Nn/gtq
+AqLjlGEwlKBhae9A3bzxViKEHyi2X9Qtib+lgW3jsJta33ifgGC8TWNSxCrBGnPb
+6pMAAwYEAM54Z0pEX7SnW38QomN6qn+JrJ5Kp5R3A2QCkeqTWuykTHZbI4I3vO2q
+TXiHVI8Rz0soAEFLMr+95SnpInf0jm/gBPBaKHS2DHcLMqLZvut3TH8Vs50pBlP3
+KnWqi9xqaJq2TwgWCNh1RFydcd+aC3bCHTNWq9M7B2sxM6hNaEkkiEkEGBECAAkF
+AkGHzhMCGwwACgkQshdj+t1CAOph4gCgpxV7iVMhaAHYaGFWT9m/opl9b+UAnRWl
+X5guSzlwPBtoCQ0rjtIIHGiL
+=k+ts
+-----END PGP PUBLIC KEY BLOCK-----
+pub   1024D/917DD857 2006-04-27
+uid                  Craig Doremus <cd...@apache.org>
+sig 3        917DD857 2006-04-27  Craig Doremus <cd...@apache.org>
+sub   2048g/5AA44BC4 2006-04-27
+sig          917DD857 2006-04-27  Craig Doremus <cd...@apache.org>
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.3 (MingW32)
+
+mQGiBERRLT0RBAD6viO/WGm7UJ1yh/ZiGw1DeG2KXU0BKcIoXSFl/bfwkmB3/Vim
+096aUU2Q/TvWjKqrdM9WJ8RGcmzGZWmZRaLff+fLSz8Qj3o+65a0OE899KD5okpW
+6lEA7j8gniKbm0lN25tQt6j+9LLDJlzuk4ywxWvf7sH7cWZcKfHR5wsF2wCglIZK
+ev3TIrWciMIQcHc5dbukVAcEAMnj3rUVnNyBQ3nmwxbQ8tMEdNnYyTbXQAKuwzwT
+dWOiZE9ggS4N3hkgcVRlm0Eat6kLlNa9IikaVn8Oe1jt8W+O33lSIuyFyA/lznkh
+3UlIeC3qI9jp8/WjFGKORLG3xu3Xdk0JcXRroPBQHJH1Xm0dcei/z3PDem5xgX9x
+ywDLA/4hde+KTPVin/smXSh98ZmqEjKpcvpfWp5SW5Sg86YdEZyyADIQJDl4+E5g
+s7FryP6GvdO8krFvAmG55kPJV3BB5vplHCSe9suI/VB5ssp6+RTf7Ll7s/fqYojC
+7hXt539vkiXd6XP0s52C9eOWmIcezGwKudezC7K/pvrSOBAE8rQjQ3JhaWcgRG9y
+ZW11cyA8Y2RvcmVtdXNAYXBhY2hlLm9yZz6IYAQTEQIAIAUCRFEtPQIbAwYLCQgH
+AwIEFQIIAwQWAgMBAh4BAheAAAoJEFA40leRfdhX1f4An0d3MutZ47VR3/1hmY41
+mCdas3OWAJ9kqHzA70Q6dE/ZmbllFbpjAQG1ibkCDQREUS1MEAgAxfMGzTD5bs8w
+3lL5b8lmEd3iga3aGjzAn04QGyrZy475cKum5hBLY1lzfRW10nTudIunFe/fNauG
+/BrKrcQD2ebzXW5VWgG39oaoP219PJXCfCKNcg6ZcbxlBFmKcCmpHoyYJpkO3uup
+tL3LQpozNw+Bz48g8X3AMxRVJlqK2wdp6DR9MAifevVi7NdMhjdLrM4In9t72fTD
++hwUKAIOThxIgQlHOamNzxHKGS8RLxhAhK1O+yV1T254a3z/y3vwZkZrobcBq4pf
+MpK2IZdLpoO+9CDklpxUXS9Pk/sBiHgsI9Ik14aETs2xOiB6fxPbtKJAYHdF0G1i
+5kfGOBbjYwADBQf9HLe+NdU0C/AgueHlQPYTJfTQGNeHyMczefYzPepQkPSNVWGS
+vg9QDXCbdbvDaYTD0Qostuojhvs89UXpCwY3K33xwzkczTZWnbfAiehjTH6ClufD
+c8DQ69Mw+xgF38UbmezY13jpBNmk/nkiL5Nxq5Bd3bc9+40WY+ahqJ5Dzvv6cZ0d
+/USXmEd0lDn8Z0ArNqdruzqmWlsRQnUHfUQw1O+ZXQJj07WwKxQ1EWsPKMHsUCnh
+PyK5fxiQP/WNwC7EAKTpSjOJBGz05SdXpw6Du9ZhUHYVNk8GaCGGBJoR1gaOggmH
+gTtg+IbEjbg1RZGqr/NYPHkXfx3gVqA1HhTkxIhJBBgRAgAJBQJEUS1MAhsMAAoJ
+EFA40leRfdhX36YAn271wqmQdnwlsVg1U6IolfNT9PiTAKCPVWyr211pg1I+CBKX
+BphAwkntjw==
+=1L2C
+-----END PGP PUBLIC KEY BLOCK-----

Added: portals/pluto/branches/1.1-286-trunk-merge/LICENSE
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/LICENSE?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/LICENSE (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/LICENSE Sat Aug  4 07:41:23 2007
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: portals/pluto/branches/1.1-286-trunk-merge/README
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/README?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/README (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/README Sat Aug  4 07:41:23 2007
@@ -0,0 +1,90 @@
+#  Copyright 2006 The Apache Software Foundation
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License
+
+README for Pluto 1.1-beta2
+
+To run the Pluto Portal Driver deployed in Tomcat 5.5.17:
+1. Unzip the binary distribution into a directory.
+	a. <PLUTO-HOME> will be the pluto-1.1.0-beta2 subdirectory.
+2. Execute startup.bat (Windows) or startup.sh (Unix)
+in <PLUTO-HOME>/bin.
+	a. Use shutdown.bat/shutdown.sh to stop the portal
+3. Browse to http://localhost:8080/pluto/portal
+4. Login as tomcat user (password=tomcat).
+
+For information on deploying portlets, building the portal from source
+ and for the most up to date documentation please go to: 
+  http://portals.apache.org/pluto
+  
+***********************************************************
+* RELEASE NOTES: 1.1.0-beta2 Sept 26, 2006                *
+***********************************************************
+* Fixed or Resolved Issues                                *
+***********************************************************
+** Bug ****************************************************
+ PLUTO-191  Dynamic Inclusion of dependencies in Maven Plugin
+ PLUTO-232  Maximize window state does not work properly
+ PLUTO-233  Exception thrown if edit or help mode is not supported by portlet
+ PLUTO-242  Portlet session is invalidated when maxInactiveInterval < 0
+ PLUTO-243  PortalURLParser drops '/' characters when building render path
+ PLUTO-245  Parsing of portlet.xml strips space from init-param values
+ PLUTO-246  PortalURLParser should URLEncode query string parameters 
+ PLUTO-248  PortalUrlParser should encode '#' character
+ PLUTO-251  Pluto fails when navigating between pages using the drop-downs
+ PLUTO-254  NPE in PortalDriverServlet when requesting a resource that doesn't exist 
+***********************************************************
+
+** New Feature ********************************************
+ PLUTO-214  Add logout link to portal page.
+ PLUTO-255   Seperate portal-driver into portal-driver-api and portal-driver-impl
+***********************************************************
+***********************************************************
+
+***********************************************************
+***********************************************************
+* Open Issues                                             *
+***********************************************************
+
+** Bug ****************************************************
+ PLUTO-124  POST Data gets truncated due to internal redirect by pluto
+ PLUTO-122  Portlet Preferences need to be user specific
+ PLUTO-257  Pluto 1.1 plugin for the deployment of custom portlets does not work
+ PLUTO-200  Missing Resource Exception from PortletConfig.getResourceBundle
+ PLUTO-234  Session Timeout Test in testsuite fails
+***********************************************************
+    
+** New Feature ********************************************
+ PLUTO-215  Create admin portlet for Pluto portal driver
+ PLUTO-252  Custom Tags with response.encodeUrl( url ) and Render hidden portlet mode.
+ PLUTO-38   user profile attribute support
+ PLUTO-186  ToolTips to Portlet Controls
+***********************************************************
+    
+** Improvement ********************************************
+ PLUTO-204  Add spec PLT number to TestResult in portlet tests
+ PLUTO-247  PortalURLParser: Avoid putting '?' and '&' characters in query string if unnecessary
+***********************************************************
+    
+** Task ***************************************************
+ PLUTO-218  [1.1] Script to package source release
+ PLUTO-217  [1.1] Script to package binary release
+***********************************************************
+
+** Test ***************************************************
+ PLUTO-206  Improve pluto-testsuite to test more aspects
+***********************************************************
+    
+** Wish ***************************************************
+ PLUTO-153  Jetty Deployment Support
+***********************************************************
\ No newline at end of file

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/pom.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,155 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <artifactId>pluto</artifactId>
+    <groupId>org.apache.pluto</groupId>
+    <version>1.1.0-286-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>assembly</artifactId>
+  <name>Pluto Assembly Project</name>
+  <url>http://portals.apache.org/pluto/</url>
+  <inceptionYear>2001</inceptionYear>
+
+  <profiles>
+    <profile>
+      <id>build-assemblies</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>compile</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <tasks>
+                <ant antfile="${basedir}/src/main/assembly/bundle-ant.xml" inheritRefs="true">
+                  <target name="package" />
+                </ant>
+              </tasks>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>ant</groupId>
+                <artifactId>ant-antlr</artifactId>
+                <version>1.6.5</version>
+              </dependency>
+              <dependency>
+                <groupId>antlr</groupId>
+                <artifactId>antlrall</artifactId>
+                <version>2.7.4</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>maven-pluto-plugin</artifactId>
+            <version>${pom.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>install</goal>
+                </goals>
+                <phase>package</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <installDir>${project.build.directory}/pluto-tomcat</installDir>
+              <installationDirectory>${project.build.directory}/pluto-tomcat</installationDirectory>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.1</version>
+            <executions>
+              <execution>
+                <id>make-assemblies</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>attached</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/container-bin.xml</descriptor>
+                <descriptor>${basedir}/src/main/assembly/bundled.xml</descriptor>
+              </descriptors>
+              <finalName>pluto-${pom.version}</finalName>
+              <outputDirectory>target/assembly/out</outputDirectory>
+              <workDirectory>target/assembly/work</workDirectory>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+    
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-descriptor-api</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-descriptor-impl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-container</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver-impl</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal</artifactId>
+      <type>war</type>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-testsuite</artifactId>
+      <type>war</type>
+      <version>${pom.version}</version>
+    </dependency>
+
+    <!--
+      This dependency is required because the
+      of the Maven Remote Resources plugin.
+    -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bin.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bin.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bin.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+
+    <id>bin</id>
+
+    <formats>
+        <format>tar.gz</format>
+        <format>tar.bz2</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <fileSets>
+        <!-- Pluto root files -->
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <!-- Pluto library files -->
+        <fileSet>
+            <directory>../pluto-descriptor-api/target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-descriptor-impl/target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-container/target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-taglib/target</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+
+        <!-- Pluto webapp files (pluto-portal and pluto-testsuite) -->
+        <fileSet>
+            <directory>../pluto-portal/target</directory>
+            <outputDirectory>webapps</outputDirectory>
+            <includes>
+                <include>*.war</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-testsuite/target</directory>
+            <outputDirectory>webapps</outputDirectory>
+            <includes>
+                <include>*.war</include>
+            </includes>
+        </fileSet>
+
+        <!-- Pluto utility files (util, maven/ant plugins) -->
+        <fileSet>
+            <directory>../pluto-util/target</directory>
+            <outputDirectory>util</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-ant-tasks/target</directory>
+            <outputDirectory>util</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>maven-pluto-plugin/target</directory>
+            <outputDirectory>util</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+
+        <!-- Pluto Documentation -->
+        <fileSet>
+            <directory>../pluto-site/target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+            <includes>
+                <include>*</include>
+                <include>**</include>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+
+    <dependencySets>
+        <!-- We specifically exclude dependencies from bin -->
+    </dependencySets>
+
+</assembly>
+

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundle-ant.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundle-ant.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundle-ant.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundle-ant.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,126 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+	Used by the maven assembly plugin to assemble the Tomcat-bundled distribution of Pluto 1.1. In
+	doing so it:
+	1. Downloads Tomcat from Apache and unzips it into a working directory. 
+	2. Adds emptySessionPath="true" to Tomcat's server.xml.
+	3. Uncomments SingleSignOn Valve in server.xml so that Tomcat manager app can be used without additional login.
+	4. Adds a pluto user with pluto and manager role to tomcat-users.xml.
+	5. Adds a pluto and manager role to the tomcat user in tomcat-users.xml.
+-->
+<project name="PlutoDistributions" default="package">
+
+	<xmlproperty file="pom.xml"/>
+
+    <property name="base.tomcat.project"
+              value="apache"
+              description="Base project name for tomcat"/>
+
+    <property name="tomcat.version"
+              value="5.5.23"
+              description="Version of Tomcat to deploy Pluto"/>
+
+    <property name="base.name"
+              value="${base.tomcat.project}-tomcat-${tomcat.version}"/>
+
+
+
+    <property name="project.build.directory"
+              value="target"
+              description="Build directory"/>
+
+    <property name="package.dir"
+              value="${project.build.directory}/pluto-tomcat"/>
+
+
+    <target name="package"
+            depends="download-tomcat,update-tomcat-config"
+            description="Package pluto into a tomcat distribution"/>
+
+
+    <target name="download-tomcat"
+            description="Download tomcat">
+
+		<get src="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/${base.name}.tar.gz"
+		     dest="${package.dir}.tar.gz" verbose="true"
+		/>
+
+        <gunzip src="${package.dir}.tar.gz"
+			dest="${package.dir}.tar"
+			description="Creates tar from tar.gz tomcat dist"
+		/>
+
+		<untar src="${package.dir}.tar"
+			dest="${package.dir}-unzip"
+			description="Untars tomcat dist"
+		/>
+
+        <move todir="${package.dir}">
+            <fileset dir="${package.dir}-unzip/${base.tomcat.project}-tomcat-${tomcat.version}">
+                <include name="*"/>
+                <include name="**/*"/>
+            </fileset>
+        </move>
+
+    </target>
+
+    <target name="update-tomcat-config">
+		<copy file="${basedir}/../README" todir="${package.dir}"/>
+
+		<!-- Add emptySessionPath="true" to Connector element in server.xml -->
+		<replace file="${package.dir}/conf/server.xml"
+			token="connectionTimeout=&quot;20000&quot; disableUploadTimeout=&quot;true&quot; /&gt;"
+			value="connectionTimeout=&quot;20000&quot; disableUploadTimeout=&quot;true&quot; emptySessionPath=&quot;true&quot; /&gt;"
+			summary="true"
+		/>
+
+		<!-- Uncomment Single Sign On so Tomcat manager can be used without additional login -->
+		<replace file="${package.dir}/conf/server.xml"
+			token="&lt;Valve className=&quot;org.apache.catalina.authenticator.SingleSignOn&quot; /&gt;"
+			value="--&gt;${line.separator}        &lt;Valve className=&quot;org.apache.catalina.authenticator.SingleSignOn&quot; /&gt;${line.separator}        &lt;!--"
+			summary="true"
+		/>
+
+		<!-- Put tomcat user in 'pluto' and 'manager' roles in tomcat-users.xml -->
+		<replace file="${package.dir}/conf/tomcat-users.xml"
+			token="roles=&quot;tomcat&quot;"
+			value="roles=&quot;tomcat,pluto,manager&quot;"
+			summary="true"
+		/>
+
+		<!-- Add 'pluto' user to tomcat-users.xml and put user in pluto and manager roles -->
+		<replace file="${package.dir}/conf/tomcat-users.xml"
+			token="&lt;/tomcat-users&gt;"
+			value="&lt;user name=&quot;pluto&quot; password=&quot;pluto&quot; roles=&quot;pluto,tomcat,manager&quot; /&gt;${line.separator}&lt;/tomcat-users&gt;"
+			summary="true"
+		/>
+    </target>
+
+
+	<target name="run-maven" description="Runs maven2 goals">
+		<exec executable="mvn" vmlauncher="false" dir="${basedir}">
+			<arg line="install"/>
+		</exec>
+		<exec executable="mvn" vmlauncher="false" dir="${basedir}">
+			<arg line="pluto:install -DinstallDir=${package.dir}"/>
+		</exec>
+	</target>
+
+
+</project>

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundled.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundled.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundled.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/bundled.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+
+    <id>bundle</id>
+
+    <formats>
+        <format>tar.gz</format>
+        <format>tar.bz2</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <fileSets>
+        <!-- Pluto root files -->
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>target/pluto-tomcat</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*</include>
+                <include>**/*</include>
+            </includes>
+           <excludes>
+                <exclude>bin/*.sh</exclude>
+           </excludes>
+        </fileSet>
+
+        <fileSet>
+            <directory>target/pluto-tomcat</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bin/*.sh</include>
+            </includes>
+           <fileMode>0755</fileMode>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-site/target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+            <includes>
+                <include>*</include>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+</assembly>
+

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/container-bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/container-bin.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/container-bin.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/container-bin.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<assembly>
+
+    <id>container-bin</id>
+
+    <formats>
+        <format>tar.gz</format>
+        <format>tar.bz2</format>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <!--
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>compile</scope>
+            <excludes>
+                <exclude>org.apache.pluto:pluto-descriptor-api</exclude>
+                <exclude>org.apache.pluto:pluto-descriptor-impl</exclude>
+                <exclude>org.apache.pluto:pluto-container</exclude>
+                <exclude>org.springframework:*</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+    -->
+
+    <fileSets>
+        <!-- Pluto root files -->
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+        <!-- Pluto library files -->
+        <fileSet>
+            <directory>../pluto-descriptor-api/target</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-descriptor-impl/target</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-container/target</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../pluto-taglib/target</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+
+        <!-- Container Documentation -->
+        <fileSet>
+            <directory>../pluto-container/target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+</assembly>
+

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/src.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/src.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/assembly/src.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,163 @@
+<!--
+/*
+ * $Id: src.xml 503952 2007-02-06 01:50:15Z esm $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<assembly>
+
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>NOTICE*</include>
+            </includes>
+        </fileSet>
+
+        <!-- Include the source code in the assembly -->
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+            </includes>
+        </fileSet>
+
+        <!-- Start Container Src -->
+        <fileSet>
+            <directory>../pluto-descriptor-api</directory>
+            <outputDirectory>/pluto-descriptor-api</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-descriptor-impl</directory>
+            <outputDirectory>/pluto-descriptor-impl</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-container</directory>
+            <outputDirectory>/pluto-container</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-taglib</directory>
+            <outputDirectory>/pluto-taglib</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <!-- Start Portal Src -->
+
+        <fileSet>
+            <directory>../pluto-portal-driver</directory>
+            <outputDirectory>/pluto-portal-driver</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-portal-driver-impl</directory>
+            <outputDirectory>/pluto-portal-driver-impl</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-portal</directory>
+            <outputDirectory>/pluto-portal</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-testsuite</directory>
+            <outputDirectory>/pluto-testsuite</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <!-- Start Util Src -->
+
+        <fileSet>
+            <directory>../pluto-util</directory>
+            <outputDirectory>/pluto-util</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../maven-pluto-plugin</directory>
+            <outputDirectory>/maven-pluto-plugin</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <fileSet>
+            <directory>../pluto-ant-tasks</directory>
+            <outputDirectory>/pluto-ant-tasks</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+        <!-- Docs -->
+        <fileSet>
+            <directory>../pluto-site</directory>
+            <outputDirectory>/pluto-site</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/LICENSE.txt?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/LICENSE.txt (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/LICENSE.txt Sat Aug  4 07:41:23 2007
@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

Added: portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/NOTICE.txt?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/NOTICE.txt (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/assembly/src/main/resources/NOTICE.txt Sat Aug  4 07:41:23 2007
@@ -0,0 +1,6 @@
+Apache Pluto
+Copyright 1999-2007 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

Added: portals/pluto/branches/1.1-286-trunk-merge/dist-build.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/dist-build.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/dist-build.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/dist-build.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,197 @@
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+	Builds a binary and source distribution of Pluto 1.1, bundling it into zip, gzip and bzip2 files.
+	
+	Run the binary build using the command line:
+		ant -f dist-build.xml
+				
+	The binary distribution is done in the following way:
+	1. Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
+		build:
+		a. Adds emptySessionPath="true" to server.xml.
+		b. Adds a pluto user with pluto role to tomcat-users.xml.
+		c. Adds a pluto role to the tomcat user in tomcat-users.xml.
+	2. Runs 'mvn install' and 'mvn pluto:install' to create the	Pluto driver and testsuite 
+		and installs them into the Tomcat dist in the working directory.
+	3. Bundles up the altered Tomcat dist with Pluto into a zip, gzip and bzip2 file.
+	
+	Run the source build using the command line:
+		ant -f dist-build.xml src-dist	
+
+	All built distributions end up in target/dist.				
+-->
+<project name="PlutoDistributions" default="bin-dist">
+
+	<property name="tomcat.version" value="5.5.23" description="Version of Tomcat to deploy Pluto"/>
+   	<xmlproperty file="pom.xml"/> <!-- picks up version from pom file -->
+	<property name="pluto.version" value="${project.version}" description="Version of Pluto to build from root pom"/>
+
+	<property name="dist.basedir" value="target/dist" description="Base working directory"/>
+	<property name="base.name" value="apache-tomcat-${tomcat.version}"/>
+	<property name="dist.dir" value="${dist.basedir}/${base.name}"/>
+	<property name="pluto.name" value="pluto-${pluto.version}"/>
+	<property name="pluto.dir" value="${dist.basedir}/${pluto.name}"/>
+	<property name="unzip.file" value="${dist.basedir}/${base.name}.tar.gz"/>
+	<property name="tar.file" value="${dist.basedir}/${base.name}.tar"/>
+
+	<fileset dir="." id="src.fileset">
+		<include name="**/*"/>
+		<exclude name="**/*.class"/>
+		<exclude name="**/*.zip"/>
+		<exclude name="**/*.tar.gz"/>
+		<exclude name="**/*.tar.b2"/>
+		<exclude name="**/target/**/*"/>
+		<exclude name="**/.svn/*"/>
+		<exclude name="bin/**/*"/>
+		<exclude name=".classpath"/>
+		<exclude name=".project"/>
+	</fileset>					
+	
+	<target name="src-dist" depends="prepare-src-dist">
+		<zip destfile="${dist.basedir}/${pluto.name}-src.zip">
+			<zipfileset refid="src.fileset"/>							
+		</zip>
+
+		<antcall target="srctar-nocompress"/>
+		
+		<gzip src="${dist.basedir}/${pluto.name}-src.tar" 
+			destfile="${dist.basedir}/${pluto.name}-src.tar.gz"/>
+		
+		<bzip2 src="${dist.basedir}/${pluto.name}-src.tar" 
+			destfile="${dist.basedir}/${pluto.name}-src.tar.bz2"/>
+		
+		<antcall target="clean"/>	
+	</target>
+
+	<target name="srctar-nocompress" description="Creates tar source distributions">
+		<tar destfile="${dist.basedir}/${pluto.name}-src.tar">
+				<tarfileset dir="."> <!-- refid does not work -->
+					<include name="**/*"/>
+					<exclude name="**/*.class"/>
+					<exclude name="**/*.zip"/>
+					<exclude name="**/*.tar.gz"/>
+					<exclude name="**/*.tar.bz2"/>
+					<exclude name="**/target/**/*"/>
+					<exclude name="**/.svn/*"/>
+					<exclude name="bin/**/*"/>
+					<exclude name=".classpath"/>
+					<exclude name=".project"/>
+				</tarfileset>	
+		</tar>	
+	</target>
+
+	<target name="prepare-src-dist">
+		<mkdir dir="${dist.basedir}"/>		
+	</target>
+
+	<target name="bin-dist" depends="prepare-bin-dist,run-maven" description="Creates zip, gzip, and bzip2 distributions">
+		<!-- Copy over jars needed to deploy custom portlets -->
+		<copy file="pluto-util/target/pluto-util-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>			
+		<copy file="pluto-descriptor-api/target/pluto-descriptor-api-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>			
+		<copy file="pluto-descriptor-impl/target/pluto-descriptor-impl-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>			
+
+		<!-- Zip everything up -->
+		<zip destfile="${dist.basedir}/${pluto.name}-bin.zip">
+			<zipfileset prefix="${pluto.name}" dir="${dist.dir}" includes="**/*"/>
+		</zip>
+
+<!--		
+		<antcall target="tar-nocompress"/>
+		<gzip src="${dist.basedir}/${pluto.name}-bin.tar" 
+			destfile="${dist.basedir}/${pluto.name}-bin.tar.gz"/>
+		
+		<bzip2 src="${dist.basedir}/${pluto.name}-bin.tar" 
+			destfile="${dist.basedir}/${pluto.name}-bin.tar.bz2"/>
+-->				
+		<antcall target="clean"/>	
+	</target>
+	
+	<target name="tar-nocompress" description="Creates tar binary distributions">
+		<tar destfile="${dist.basedir}/${pluto.name}-bin.tar">
+			<tarfileset prefix="${pluto.name}" dir="${dist.dir}" mode="755" username="pluto" group="pluto">
+		    	<include name="bin/*.sh"/>
+			</tarfileset>
+			<tarfileset prefix="${pluto.name}" dir="${dist.dir}" username="pluto" group="pluto">
+				<include name="**/*"/>
+				<exclude name="bin/*.sh"/>
+			</tarfileset>
+		</tar>		
+	</target>
+	
+	<target name="prepare-bin-dist">
+		<exec executable="mvn" vmlauncher="false" dir="${basedir}">
+			<arg line="clean:clean"/>
+		</exec>
+		<mkdir dir="${dist.basedir}"/>
+		
+		<get src="http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat.version}/bin/${base.name}.tar.gz"
+		     dest="${unzip.file}"
+		/>
+		
+		<gunzip src="${unzip.file}"
+			dest="${dist.basedir}"
+			description="Creates tar from tar.gz tomcat dist"
+		/>
+		
+		<untar src="${tar.file}"
+			dest="${dist.basedir}"
+			description="Untars tomcat dist"
+		/>		
+
+		<!-- Copy over README -->
+		<copy file="README" todir="${dist.dir}"/>
+
+		<!-- Add emptySessionPath="true" to Connector element in server.xml -->
+		<replace file="${dist.dir}/conf/server.xml"
+			token="connectionTimeout=&quot;20000&quot; disableUploadTimeout=&quot;true&quot; /&gt;" 
+			value="connectionTimeout=&quot;20000&quot; disableUploadTimeout=&quot;true&quot; emptySessionPath=&quot;true&quot; /&gt;" 
+			summary="true"
+		/>
+
+		<!-- Put tomcat user in 'pluto' role in tomcat-users.xml -->
+		<replace file="${dist.dir}/conf/tomcat-users.xml"
+			token="roles=&quot;tomcat&quot;" 
+			value="roles=&quot;tomcat,pluto&quot;" 
+			summary="true"
+		/>
+		
+		<!-- Add 'pluto' user to tomcat-users.xml -->
+		<replace file="${dist.dir}/conf/tomcat-users.xml"
+			token="&lt;/tomcat-users&gt;" 
+			value="&lt;user name=&quot;pluto&quot; password=&quot;pluto&quot; roles=&quot;pluto&quot; /&gt;${line.separator}&lt;/tomcat-users&gt;" 
+			summary="true"
+		/>
+	</target>
+
+	<target name="run-maven" description="Runs maven2 goals">
+		<exec executable="mvn" vmlauncher="false" dir="${basedir}">
+			<arg line="install"/>
+		</exec>
+		<exec executable="mvn" vmlauncher="false" dir="${basedir}">
+			<arg line="pluto:install -DinstallDir=${user.dir}/${dist.dir}"/>
+		</exec>
+	</target>
+		
+	<target name="clean">
+		<delete dir="${dist.dir}"/>
+		<delete file="${unzip.file}" failonerror="false"/>	
+		<delete file="${tar.file}" failonerror="false"/>	
+   	    <delete file="${dist.basedir}/${pluto.name}-src.tar" failonerror="false"/>
+   	    <delete file="${dist.basedir}/${pluto.name}-bin.tar" failonerror="false"/>
+	</target>
+
+</project>

Added: portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/maven-pluto-plugin/pom.xml Sat Aug  4 07:41:23 2007
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005-2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  
+  <parent>
+    <groupId>org.apache.pluto</groupId>
+    <artifactId>pluto</artifactId>
+    <version>1.1.0-286-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>maven-pluto-plugin</artifactId> 
+  <packaging>maven-plugin</packaging>
+  <name>Maven Pluto Installer Plugin</name>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-util</artifactId>
+      <version>${pom.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${maven.version}</version>
+    </dependency>
+    
+    <!-- Do not remove this dep: See MNG-1178 -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+    
+  </dependencies>
+  
+  <build> 
+    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>    
+    <resources>
+      <resource>
+        <directory>src/main/scripts</directory>
+        <includes>
+          <include>**/*.mmld</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>        
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-plugin-plugin</artifactId>        
+        <configuration>
+          <goalPrefix>pluto</goalPrefix>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  
+</project>