From e83b5f9d656e524c3a3a605d69b43ea4b6957cb8 Mon Sep 17 00:00:00 2001 From: Ted Kirby Date: Thu, 28 Aug 2008 04:33:31 +0000 Subject: [PATCH] GERONIMODEVTOOLS-507 Ship only one feature that provides v20 and v21 server support add version and build date to about.html files from build, so we don't have to manually muck with the date each release. Use one about.html file, not one per plugin, since they're all the same. Add a pointer to release notes in about.html update license to cover both server versions manually update plugin sizes while I was there, since we are close to release. git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk@689718 13f79535-47bb-0310-9956-ffa450edef68 --- assembly/src/main/assembly/deployable.xml | 1 - assembly/src/main/assembly/site.xml | 3 - assembly/src/main/assembly/updatesite.xml | 1 - .../feature.properties | 432 +++++++++++++++++- .../feature.xml | 53 ++- .../license.html | 8 + .../org.apache.geronimo.v21.feature/pom.xml | 3 +- features/pom.xml | 1 - plugins/about.html | 17 + .../about.html | 10 - .../pom.xml | 3 +- .../about.html | 10 - .../pom.xml | 8 +- .../about.html | 10 - .../org.apache.geronimo.runtime.v20/pom.xml | 8 +- .../about.html | 10 - .../org.apache.geronimo.runtime.v21/pom.xml | 10 +- .../org.apache.geronimo.st.core/about.html | 10 - plugins/org.apache.geronimo.st.core/pom.xml | 10 +- .../org.apache.geronimo.st.schemas/about.html | 10 - .../org.apache.geronimo.st.schemas/pom.xml | 8 +- plugins/org.apache.geronimo.st.ui/about.html | 10 - plugins/org.apache.geronimo.st.ui/pom.xml | 8 +- .../G-logo-32x32.gif | Bin 1773 -> 0 bytes .../about.html | 10 - .../org.apache.geronimo.st.v20.core/about.ini | 38 -- .../org.apache.geronimo.st.v20.core/pom.xml | 15 +- .../org.apache.geronimo.st.v20.ui/about.html | 10 - plugins/org.apache.geronimo.st.v20.ui/pom.xml | 10 +- .../about.html | 10 - .../org.apache.geronimo.st.v21.core/about.ini | 2 +- .../org.apache.geronimo.st.v21.core/pom.xml | 10 +- .../org.apache.geronimo.st.v21.ui/about.html | 10 - plugins/org.apache.geronimo.st.v21.ui/pom.xml | 10 +- 34 files changed, 549 insertions(+), 220 deletions(-) create mode 100644 plugins/about.html delete mode 100644 plugins/org.apache.geronimo.jee.v21.jaxbmodel/about.html delete mode 100644 plugins/org.apache.geronimo.runtime.common/about.html delete mode 100644 plugins/org.apache.geronimo.runtime.v20/about.html delete mode 100644 plugins/org.apache.geronimo.runtime.v21/about.html delete mode 100644 plugins/org.apache.geronimo.st.core/about.html delete mode 100644 plugins/org.apache.geronimo.st.schemas/about.html delete mode 100644 plugins/org.apache.geronimo.st.ui/about.html delete mode 100644 plugins/org.apache.geronimo.st.v20.core/G-logo-32x32.gif delete mode 100644 plugins/org.apache.geronimo.st.v20.core/about.html delete mode 100644 plugins/org.apache.geronimo.st.v20.core/about.ini delete mode 100644 plugins/org.apache.geronimo.st.v20.ui/about.html delete mode 100644 plugins/org.apache.geronimo.st.v21.core/about.html delete mode 100644 plugins/org.apache.geronimo.st.v21.ui/about.html diff --git a/assembly/src/main/assembly/deployable.xml b/assembly/src/main/assembly/deployable.xml index deed5bbe..d4f182a3 100644 --- a/assembly/src/main/assembly/deployable.xml +++ b/assembly/src/main/assembly/deployable.xml @@ -70,7 +70,6 @@ eclipse/features/ true - org.apache.geronimo.devtools:org.apache.geronimo.v20.feature org.apache.geronimo.devtools:org.apache.geronimo.v21.feature diff --git a/assembly/src/main/assembly/site.xml b/assembly/src/main/assembly/site.xml index c60a86e9..c6494242 100644 --- a/assembly/src/main/assembly/site.xml +++ b/assembly/src/main/assembly/site.xml @@ -82,9 +82,6 @@ - - - diff --git a/assembly/src/main/assembly/updatesite.xml b/assembly/src/main/assembly/updatesite.xml index bab6abfc..e07f2fda 100644 --- a/assembly/src/main/assembly/updatesite.xml +++ b/assembly/src/main/assembly/updatesite.xml @@ -69,7 +69,6 @@ ${artifactId}_${version}.${extension} features/ - org.apache.geronimo.devtools:org.apache.geronimo.v20.feature org.apache.geronimo.devtools:org.apache.geronimo.v21.feature diff --git a/features/org.apache.geronimo.v21.feature/feature.properties b/features/org.apache.geronimo.v21.feature/feature.properties index 5ff928bf..1a897651 100644 --- a/features/org.apache.geronimo.v21.feature/feature.properties +++ b/features/org.apache.geronimo.v21.feature/feature.properties @@ -17,16 +17,19 @@ # $Rev$ $Date$ # providerName = Apache Software Foundation -description = This feature provides the WTP Server Adapter and additional development tools for the Apache Geronimo v2.1 server. + +description = This feature provides the WTP Server Adapters and additional development tools for the Apache Geronimo v2.0 and v2.1 servers. + copyright = Copyright 2004,2008 The Apache Software Foundation. -license = Apache License \n\ - Version 2.0, January 2004 \n\ - http://www.apache.org/licenses/ \n\ +license = \n\ + Apache License\n\ + Version 2.0, January 2004\n\ + http://www.apache.org/licenses/\n\ \n\ - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION \n\ + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\ \n\ - 1. Definitions. \n\ + 1. Definitions.\n\ \n\ "License" shall mean the terms and conditions for use, reproduction,\n\ and distribution as defined by Sections 1 through 9 of this document.\n\ @@ -196,41 +199,419 @@ license = Apache License \n\ of your accepting any such warranty or additional liability.\n\ \n\ END OF TERMS AND CONDITIONS\n\ - \n\ +\n\ + APPENDIX: How to apply the Apache License to your work.\n\ +\n\ + To apply the Apache License to your work, attach the following\n\ + boilerplate notice, with the fields enclosed by brackets "[]"\n\ + replaced with your own identifying information. (Don't include\n\ + the brackets!) The text should be enclosed in the appropriate\n\ + comment syntax for the file format. We also recommend that a\n\ + file or class name and description of purpose be included on the\n\ + same "printed page" as the copyright notice for easier\n\ + identification within third-party archives.\n\ +\n\ + Copyright [yyyy] [name of copyright owner]\n\ +\n\ + Licensed under the Apache License, Version 2.0 (the "License");\n\ + you may not use this file except in compliance with the License.\n\ + You may obtain a copy of the License at\n\ +\n\ + http://www.apache.org/licenses/LICENSE-2.0\n\ +\n\ + Unless required by applicable law or agreed to in writing, software\n\ + distributed under the License is distributed on an "AS IS" BASIS,\n\ + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\ + See the License for the specific language governing permissions and\n\ + limitations under the License.\n\ +\n\ #########################################################################\n\ ## ADDITIONAL SOURCE LICENSES ##\n\ #########################################################################\n\ \n\ -For geronimo-crypto-2.1.3.jar:\n\ -\n\ The ASN1 codec implementation in the geronimo-crypto module was\n\ developed by the Bouncy Castle project. (http://www.bouncycastle.org/).\n\ Use of the source code, thus licensed, and the resultant binary are \n\ subject to the terms and conditions of the following license.\n\ \n\ =========================================================================\n\ -== Bouncy Castle License ==\n\ +== Bouncy Castle License (ASN1 codec in geronimo-util) ==\n\ =========================================================================\n\ \n\ The Bouncy Castle License\n\ \n\ -Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)\n\ +Copyright (c) 2000-2005 The Legion Of The Bouncy Castle\n\ +(http://www.bouncycastle.org)\n\ \n\ -Permission is hereby granted, free of charge, to any person obtaining a copy of this software\n\ -and associated documentation files (the "Software"), to deal in the Software without restriction,\n\ -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,\n\ -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,\n\ -subject to the following conditions:\n\ +Permission is hereby granted, free of charge, to any person obtaining\n\ +a copy of this software and associated documentation files (the\n\ +"Software"), to deal in the Software without restriction, including\n\ +without limitation the rights to use, copy, modify, merge, publish,\n\ +distribute, sublicense, and/or sell copies of the Software, and to\n\ +permit persons to whom the Software is furnished to do so, subject to\n\ +the following conditions:\n\ \n\ -The above copyright notice and this permission notice shall be included in all copies or substantial\n\ -portions of the Software.\n\ +The above copyright notice and this permission notice shall be\n\ +included in all copies or substantial portions of the Software.\n\ \n\ -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,\n\ -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR\n\ -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\n\ -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR\n\ -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER\n\ -DEALINGS IN THE SOFTWARE.\n\ +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\n\ +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\n\ +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\n\ +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\n\ +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\n\ +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\n\ +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\ +\n\ +For cglib-nodep-2.1_3.jar:\n\ +\n\ +=========================================================================\n\ +== CGLIB License ==\n\ +=========================================================================\n\ +\n\ +CGLIB is licensed under the Apache License 2.0.\n\ +\n\ +For commons-logging-1.0.4.jar:\n\ +\n\ +=========================================================================\n\ +== Apache Commons License ==\n\ +== Codec, Collections, Digester, Discovery, File Upload, HTTP Client, ==\n\ +== IO, JEXL, Logging ==\n\ +=========================================================================\n\ +\n\ +These Apache Commons libraries are licensed under the Apache License, \n\ +Version 2.0.\n\ +\n\ +For jaxb-api and jaxb-impl jars:\n\ +\n\ +=========================================================================\n\ +== Sun CDDL License ==\n\ +== JAXB-API, JAXB, JAXWS, JSTL, SAAJ ==\n\ +=========================================================================\n\ +\n\ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0\n\ +\n\ +1. Definitions.\n\ +\n\ +1.1. Contributor means each individual or entity that creates or\n\ + contributes to the creation of Modifications.\n\ +\n\ +1.2. Contributor Version means the combination of the Original\n\ + Software, prior Modifications used by a Contributor (if any), and\n\ + the Modifications made by that particular Contributor.\n\ +\n\ +1.3. Covered Software means (a) the Original Software, or (b)\n\ + Modifications, or (c) the combination of files containing\n\ + Original Software with files containing Modifications, in each\n\ + case including portions thereof.\n\ +\n\ +1.4. Executable means the Covered Software in any form other than\n\ + Source Code.\n\ +\n\ +1.5. Initial Developer means the individual or entity that first makes\n\ + Original Software available under this License.\n\ +\n\ +1.6. Larger Work means a work which combines Covered Software or\n\ + portions thereof with code not governed by the terms of this\n\ + License.\n\ +\n\ +1.7. License means this document.\n\ +\n\ +1.8. Licensable means having the right to grant, to the maximum extent\n\ + possible, whether at the time of the initial grant or\n\ + subsequently acquired, any and all of the rights conveyed herein.\n\ +\n\ +1.9. Modifications means the Source Code and Executable form of any of\n\ + the following:\n\ +\n\ +A. Any file that results from an addition to, deletion from or\n\ +modification of the contents of a file containing Original Software or\n\ +previous Modifications;\n\ +\n\ +B. Any new file that contains any part of the Original Software or\n\ +previous Modification; or\n\ +\n\ +C. Any new file that is contributed or otherwise made available under\n\ +the terms of this License.\n\ +\n\ +1.10. Original Software means the Source Code and Executable form of\n\ + computer software code that is originally released under this\n\ + License.\n\ +\n\ +1.11. Patent Claims means any patent claim(s), now owned or hereafter\n\ + acquired, including without limitation, method, process, and\n\ + apparatus claims, in any patent Licensable by grantor.\n\ +\n\ +1.12. Source Code means (a) the common form of computer software code\n\ + in which modifications are made and (b) associated documentation\n\ + included in or with such code.\n\ +\n\ +1.13. You (or Your) means an individual or a legal entity exercising\n\ + rights under, and complying with all of the terms of, this\n\ + License. For legal entities, You includes any entity which\n\ + controls, is controlled by, or is under common control with\n\ + You. For purposes of this definition, control means (a)áthe\n\ + power, direct or indirect, to cause the direction or management\n\ + of such entity, whether by contract or otherwise, or\n\ + (b)áownership of more than fifty percent (50%) of the\n\ + outstanding shares or beneficial ownership of such entity.\n\ +\n\ +2. License Grants.\n\ +\n\ +2.1. The Initial Developer Grant. Conditioned upon Your compliance\n\ +with Section 3.1 below and subject to third party intellectual\n\ +property claims, the Initial Developer hereby grants You a world-wide,\n\ +royalty-free, non-exclusive license: (a) under intellectual property\n\ +rights (other than patent or trademark) Licensable by Initial\n\ +Developer, to use, reproduce, modify, display, perform, sublicense and\n\ +distribute the Original Software (or portions thereof), with or\n\ +without Modifications, and/or as part of a Larger Work; and (b) under\n\ +Patent Claims infringed by the making, using or selling of Original\n\ +Software, to make, have made, use, practice, sell, and offer for sale,\n\ +and/or otherwise dispose of the Original Software (or portions\n\ +thereof). (c) The licenses granted in Sectionsá2.1(a) and (b) are\n\ +effective on the date Initial Developer first distributes or otherwise\n\ +makes the Original Software available to a third party under the terms\n\ +of this License. (d) Notwithstanding Sectioná2.1(b) above, no patent\n\ +license is granted: (1)áfor code that You delete from the Original\n\ +Software, or (2)áfor infringements caused by: (i)áthe modification of\n\ +the Original Software, or (ii)áthe combination of the Original\n\ +Software with other software or devices.\n\ +\n\ +2.2. Contributor Grant. Conditioned upon Your compliance with Section\n\ +3.1 below and subject to third party intellectual property claims,\n\ +each Contributor hereby grants You a world-wide, royalty-free,\n\ +non-exclusive license: (a) under intellectual property rights (other\n\ +than patent or trademark) Licensable by Contributor to use, reproduce,\n\ +modify, display, perform, sublicense and distribute the Modifications\n\ +created by such Contributor (or portions thereof), either on an\n\ +unmodified basis, with other Modifications, as Covered Software and/or\n\ +as part of a Larger Work; and (b) under Patent Claims infringed by the\n\ +making, using, or selling of Modifications made by that Contributor\n\ +either alone and/or in combination with its Contributor Version (or\n\ +portions of such combination), to make, use, sell, offer for sale,\n\ +have made, and/or otherwise dispose of: (1)áModifications made by that\n\ +Contributor (or portions thereof); and (2)áthe combination of\n\ +Modifications made by that Contributor with its Contributor Version\n\ +(or portions of such combination). (c) The licenses granted in\n\ +Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor first\n\ +distributes or otherwise makes the Modifications available to a third\n\ +party. (d) Notwithstanding Sectioná2.2(b) above, no patent license is\n\ +granted: (1)áfor any code that Contributor has deleted from the\n\ +Contributor Version; (2)áfor infringements caused by: (i)áthird party\n\ +modifications of Contributor Version, or (ii)áthe combination of\n\ +Modifications made by that Contributor with other software (except as\n\ +part of the Contributor Version) or other devices; or (3)áunder Patent\n\ +Claims infringed by Covered Software in the absence of Modifications\n\ +made by that Contributor.\n\ +\n\ +3. Distribution Obligations.\n\ +\n\ +3.1. Availability of Source Code.\n\ +\n\ +Any Covered Software that You distribute or otherwise make available\n\ +in Executable form must also be made available in Source Code form and\n\ +that Source Code form must be distributed only under the terms of this\n\ +License. You must include a copy of this License with every copy of\n\ +the Source Code form of the Covered Software You distribute or\n\ +otherwise make available. You must inform recipients of any such\n\ +Covered Software in Executable form as to how they can obtain such\n\ +Covered Software in Source Code form in a reasonable manner on or\n\ +through a medium customarily used for software exchange.\n\ +\n\ +3.2. Modifications.\n\ +\n\ +The Modifications that You create or to which You contribute are\n\ +governed by the terms of this License. You represent that You believe\n\ +Your Modifications are Your original creation(s) and/or You have\n\ +sufficient rights to grant the rights conveyed by this License.\n\ +\n\ +3.3. Required Notices. You must include a notice in each of Your\n\ +Modifications that identifies You as the Contributor of the\n\ +Modification. You may not remove or alter any copyright, patent or\n\ +trademark notices contained within the Covered Software, or any\n\ +notices of licensing or any descriptive text giving attribution to any\n\ +Contributor or the Initial Developer.\n\ +\n\ +3.4. Application of Additional Terms. You may not offer or impose any\n\ +terms on any Covered Software in Source Code form that alters or\n\ +restricts the applicable version of this License or the recipients\n\ +rights hereunder. You may choose to offer, and to charge a fee for,\n\ +warranty, support, indemnity or liability obligations to one or more\n\ +recipients of Covered Software. However, you may do so only on Your\n\ +own behalf, and not on behalf of the Initial Developer or any\n\ +Contributor. You must make it absolutely clear that any such warranty,\n\ +support, indemnity or liability obligation is offered by You alone,\n\ +and You hereby agree to indemnify the Initial Developer and every\n\ +Contributor for any liability incurred by the Initial Developer or\n\ +such Contributor as a result of warranty, support, indemnity or\n\ +liability terms You offer.\n\ +\n\ +3.5. Distribution of Executable Versions. You may distribute the\n\ +Executable form of the Covered Software under the terms of this\n\ +License or under the terms of a license of Your choice, which may\n\ +contain terms different from this License, provided that You are in\n\ +compliance with the terms of this License and that the license for the\n\ +Executable form does not attempt to limit or alter the recipients\n\ +rights in the Source Code form from the rights set forth in this\n\ +License. If You distribute the Covered Software in Executable form\n\ +under a different license, You must make it absolutely clear that any\n\ +terms which differ from this License are offered by You alone, not by\n\ +the Initial Developer or Contributor. You hereby agree to indemnify\n\ +the Initial Developer and every Contributor for any liability incurred\n\ +by the Initial Developer or such Contributor as a result of any such\n\ +terms You offer.\n\ +\n\ +3.6. Larger Works. You may create a Larger Work by combining Covered\n\ +Software with other code not governed by the terms of this License and\n\ +distribute the Larger Work as a single product. In such a case, You\n\ +must make sure the requirements of this License are fulfilled for the\n\ +Covered Software.\n\ +\n\ +4. Versions of the License.\n\ +\n\ +4.1. New Versions. Sun Microsystems, Inc. is the initial license\n\ +steward and may publish revised and/or new versions of this License\n\ +from time to time. Each version will be given a distinguishing version\n\ +number. Except as provided in Section 4.3, no one other than the\n\ +license steward has the right to modify this License.\n\ +\n\ +4.2. Effect of New Versions.\n\ +\n\ +You may always continue to use, distribute or otherwise make the\n\ +Covered Software available under the terms of the version of the\n\ +License under which You originally received the Covered Software. If\n\ +the Initial Developer includes a notice in the Original Software\n\ +prohibiting it from being distributed or otherwise made available\n\ +under any subsequent version of the License, You must distribute and\n\ +make the Covered Software available under the terms of the version of\n\ +the License under which You originally received the Covered\n\ +Software. Otherwise, You may also choose to use, distribute or\n\ +otherwise make the Covered Software available under the terms of any\n\ +subsequent version of the License published by the license steward.\n\ +4.3. Modified Versions.\n\ +\n\ +When You are an Initial Developer and You want to create a new license\n\ +for Your Original Software, You may create and use a modified version\n\ +of this License if You: (a)árename the license and remove any\n\ +references to the name of the license steward (except to note that the\n\ +license differs from this License); and (b)áotherwise make it clear\n\ +that the license contains terms which differ from this License.\n\ +\n\ +5. DISCLAIMER OF WARRANTY.\n\ +\n\ +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS,\n\ +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,\n\ +WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF\n\ +DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR\n\ +NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF\n\ +THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE\n\ +DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER\n\ +CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR\n\ +CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART\n\ +OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED\n\ +HEREUNDER EXCEPT UNDER THIS DISCLAIMER.\n\ +\n\ +6. TERMINATION.\n\ +\n\ +6.1. This License and the rights granted hereunder will terminate\n\ + automatically if You fail to comply with terms herein and fail to\n\ + cure such breach within 30 days of becoming aware of the\n\ + breach. Provisions which, by their nature, must remain in effect\n\ + beyond the termination of this License shall survive.\n\ +\n\ +6.2. If You assert a patent infringement claim (excluding declaratory\n\ + judgment actions) against Initial Developer or a Contributor (the\n\ + Initial Developer or Contributor against whom You assert such\n\ + claim is referred to as Participant) alleging that the\n\ + Participant Software (meaning the Contributor Version where the\n\ + Participant is a Contributor or the Original Software where the\n\ + Participant is the Initial Developer) directly or indirectly\n\ + infringes any patent, then any and all rights granted directly or\n\ + indirectly to You by such Participant, the Initial Developer (if\n\ + the Initial Developer is not the Participant) and all\n\ + Contributors under Sectionsá2.1 and/or 2.2 of this License shall,\n\ + upon 60 days notice from Participant terminate prospectively and\n\ + automatically at the expiration of such 60 day notice period,\n\ + unless if within such 60 day period You withdraw Your claim with\n\ + respect to the Participant Software against such Participant\n\ + either unilaterally or pursuant to a written agreement with\n\ + Participant.\n\ +\n\ +6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all\n\ + end user licenses that have been validly granted by You or any\n\ + distributor hereunder prior to termination (excluding licenses\n\ + granted to You by any distributor) shall survive termination.\n\ +\n\ +7. LIMITATION OF LIABILITY.\n\ +\n\ +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT\n\ +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL\n\ +DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED\n\ +SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY\n\ +PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES\n\ +OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST\n\ +PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR\n\ +MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN\n\ +IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH\n\ +DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR\n\ +DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE\n\ +EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO\n\ +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL\n\ +DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.\n\ +\n\ +8. U.S. GOVERNMENT END USERS.\n\ +\n\ +The Covered Software is a commercial item, as that term is defined in\n\ +48áC.F.R.á2.101 (Oct. 1995), consisting of commercial computer\n\ +software (as that term is defined at 48 C.F.R. á252.227-7014(a)(1))\n\ +and commercial computer software documentation as such terms are used\n\ +in 48áC.F.R.á12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and\n\ +48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all\n\ +U.S. Government End Users acquire Covered Software with only those\n\ +rights set forth herein. This U.S. Government Rights clause is in lieu\n\ +of, and supersedes, any other FAR, DFAR, or other clause or provision\n\ +that addresses Government rights in computer software under this\n\ +License.\n\ +\n\ +9. MISCELLANEOUS.\n\ +\n\ +This License represents the complete agreement concerning subject\n\ +matter hereof. If any provision of this License is held to be\n\ +unenforceable, such provision shall be reformed only to the extent\n\ +necessary to make it enforceable. This License shall be governed by\n\ +the law of the jurisdiction specified in a notice contained within the\n\ +Original Software (except to the extent applicable law, if any,\n\ +provides otherwise), excluding such jurisdictions conflict-of-law\n\ +provisions. Any litigation relating to this License shall be subject\n\ +to the jurisdiction of the courts located in the jurisdiction and\n\ +venue specified in a notice contained within the Original Software,\n\ +with the losing party responsible for costs, including, without\n\ +limitation, court costs and reasonable attorneys fees and\n\ +expenses. The application of the United Nations Convention on\n\ +Contracts for the International Sale of Goods is expressly\n\ +excluded. Any law or regulation which provides that the language of a\n\ +contract shall be construed against the drafter shall not apply to\n\ +this License. You agree that You alone are responsible for compliance\n\ +with the United States export administration regulations (and the\n\ +export control laws and regulation of any other countries) when You\n\ +use, distribute or otherwise make available any Covered Software.\n\ +\n\ +10. RESPONSIBILITY FOR CLAIMS.\n\ +\n\ +As between Initial Developer and the Contributors, each party is\n\ +responsible for claims and damages arising, directly or indirectly,\n\ +out of its utilization of rights under this License and You agree to\n\ +work with Initial Developer and Contributors to distribute such\n\ +responsibility on an equitable basis. Nothing herein is intended or\n\ +shall be deemed to constitute any admission of liability.\n\ +\n\ +NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND\n\ +DISTRIBUTION LICENSE (CDDL) The GlassFish code released under the CDDL\n\ +shall be governed by the laws of the State of California (excluding\n\ +conflict-of-law provisions). Any litigation relating to this License\n\ +shall be subject to the jurisdiction of the Federal Courts of the\n\ +Northern District of California and the state courts of the State of\n\ +California, with venue lying in Santa Clara County, California.\n\ \n\ For plexus-archiver-1.0-alpha-7.jar:\n\ \n\ @@ -472,4 +853,5 @@ This Agreement is governed by the laws of the State of New York and the \n\ intellectual property laws of the United States of America. No party to this \n\ Agreement will bring a legal action under this Agreement more than one year \n\ after the cause of action arose. Each party waives its rights to a jury \n\ -trial in any resulting litigation. \n +trial in any resulting litigation. \n\ +\n\ diff --git a/features/org.apache.geronimo.v21.feature/feature.xml b/features/org.apache.geronimo.v21.feature/feature.xml index 6b224863..d2897389 100644 --- a/features/org.apache.geronimo.v21.feature/feature.xml +++ b/features/org.apache.geronimo.v21.feature/feature.xml @@ -47,56 +47,77 @@ + + + + + + + diff --git a/features/org.apache.geronimo.v21.feature/license.html b/features/org.apache.geronimo.v21.feature/license.html index ecd89dfb..7f9914bc 100644 --- a/features/org.apache.geronimo.v21.feature/license.html +++ b/features/org.apache.geronimo.v21.feature/license.html @@ -1,8 +1,16 @@ +Version: ${pom.version}-${buildNumber}

License

The license for this feature is found here in the about_files/LICENSE.txt file.

Notices

The notices for this feature are found here in the about_files/NOTICE.txt file. +

Release Notes

+For detailed information about this feature, see these +Release Notes. +

The Geronimo Devtools project

+For more information on using this feature, getting the source code and/or contributing to the project, +visit the project home page +http://geronimo.apache.org/development-tools.html. \ No newline at end of file diff --git a/features/org.apache.geronimo.v21.feature/pom.xml b/features/org.apache.geronimo.v21.feature/pom.xml index 2ca217a7..1d7c7621 100644 --- a/features/org.apache.geronimo.v21.feature/pom.xml +++ b/features/org.apache.geronimo.v21.feature/pom.xml @@ -61,13 +61,14 @@ --> . + true license.html about_files - ../../plugins/org.apache.geronimo.runtime.v21 + ../.. LICENSE.txt NOTICE.txt diff --git a/features/pom.xml b/features/pom.xml index f4e4ea0a..1aa4a8d6 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -29,7 +29,6 @@ ../pom.xml - org.apache.geronimo.v20.feature org.apache.geronimo.v21.feature diff --git a/plugins/about.html b/plugins/about.html new file mode 100644 index 00000000..3bbd3c6f --- /dev/null +++ b/plugins/about.html @@ -0,0 +1,17 @@ + + +

About This Content

+

Version: ${pom.version}-${buildNumber}

+

License

+The license for this plugin is found here in the about_files/LICENSE.txt file. +

Notices

+The notices for this plugin are found here in the about_files/NOTICE.txt file. +

Release Notes

+For detailed information about this feature, see these +Release Notes. +

The Geronimo Devtools project

+For more information on using this feature, getting the source code and/or contributing to the project, +visit the project home page +http://geronimo.apache.org/development-tools.html. + + diff --git a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/about.html b/plugins/org.apache.geronimo.jee.v21.jaxbmodel/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml b/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml index bc4e8ab4..88232a08 100644 --- a/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml +++ b/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml @@ -70,7 +70,8 @@ at install time using Eclipse Update Manager, and after install. --> - . + .. + true about.html diff --git a/plugins/org.apache.geronimo.runtime.common/about.html b/plugins/org.apache.geronimo.runtime.common/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.runtime.common/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.runtime.common/pom.xml b/plugins/org.apache.geronimo.runtime.common/pom.xml index 2fed77ec..3da94934 100644 --- a/plugins/org.apache.geronimo.runtime.common/pom.xml +++ b/plugins/org.apache.geronimo.runtime.common/pom.xml @@ -28,11 +28,17 @@ + + .. + true + + about.html + + . plugin.xml - about.html diff --git a/plugins/org.apache.geronimo.runtime.v20/about.html b/plugins/org.apache.geronimo.runtime.v20/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.runtime.v20/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.runtime.v20/pom.xml b/plugins/org.apache.geronimo.runtime.v20/pom.xml index 24818d26..3cc9ce7c 100644 --- a/plugins/org.apache.geronimo.runtime.v20/pom.xml +++ b/plugins/org.apache.geronimo.runtime.v20/pom.xml @@ -31,11 +31,17 @@ + + .. + true + + about.html + + . plugin.xml - about.html diff --git a/plugins/org.apache.geronimo.runtime.v21/about.html b/plugins/org.apache.geronimo.runtime.v21/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.runtime.v21/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.runtime.v21/pom.xml b/plugins/org.apache.geronimo.runtime.v21/pom.xml index d42cea3a..27757049 100644 --- a/plugins/org.apache.geronimo.runtime.v21/pom.xml +++ b/plugins/org.apache.geronimo.runtime.v21/pom.xml @@ -32,12 +32,18 @@ - . + .. + true - plugin.xml about.html + + . + + plugin.xml + + lib lib diff --git a/plugins/org.apache.geronimo.st.core/about.html b/plugins/org.apache.geronimo.st.core/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.st.core/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.st.core/pom.xml b/plugins/org.apache.geronimo.st.core/pom.xml index 52141341..d8b6be0e 100644 --- a/plugins/org.apache.geronimo.st.core/pom.xml +++ b/plugins/org.apache.geronimo.st.core/pom.xml @@ -28,13 +28,19 @@ + + .. + true + + about.html + + . .options plugin.xml - plugin.properties - about.html + plugin.properties diff --git a/plugins/org.apache.geronimo.st.schemas/about.html b/plugins/org.apache.geronimo.st.schemas/about.html deleted file mode 100644 index 1b816e25..00000000 --- a/plugins/org.apache.geronimo.st.schemas/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - diff --git a/plugins/org.apache.geronimo.st.schemas/pom.xml b/plugins/org.apache.geronimo.st.schemas/pom.xml index bcf73d1e..eb3f909c 100644 --- a/plugins/org.apache.geronimo.st.schemas/pom.xml +++ b/plugins/org.apache.geronimo.st.schemas/pom.xml @@ -28,11 +28,17 @@ + + .. + true + + about.html + + . plugin.xml - about.html diff --git a/plugins/org.apache.geronimo.st.ui/about.html b/plugins/org.apache.geronimo.st.ui/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.st.ui/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.st.ui/pom.xml b/plugins/org.apache.geronimo.st.ui/pom.xml index 17a0c5ba..8302c7bb 100644 --- a/plugins/org.apache.geronimo.st.ui/pom.xml +++ b/plugins/org.apache.geronimo.st.ui/pom.xml @@ -28,13 +28,19 @@ + + .. + true + + about.html + + . plugin.xml plugin.properties .options - about.html diff --git a/plugins/org.apache.geronimo.st.v20.core/G-logo-32x32.gif b/plugins/org.apache.geronimo.st.v20.core/G-logo-32x32.gif deleted file mode 100644 index f6d7f0184ca63ad3fd8c9795f633a2e232f753ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1773 zcmb`G`8(SQ9>>4Z2qCp@5!Ffujbck3rJZgar81?1>WoortI@hj%&4WE*$pA3RSm^Z zN8@N~^m0wlQISK0v?M|VZKX#LBFITnS@v((_w#z*zr3I4^V92d3?1y_d)5xH1C+p4 zv|6ocHbpF6T2W{;UpGE2sf5dGFL@Hm^a}IC3QMp$HmjJJSB?o~Qwypok#crb{aK<~ zkghMu)zY<%Rn=D@wFgN4ODF9$=;9_l;Pltvv>x4zUPwl-9=2B>+Y8MkLo<3|Ka;or z(r2_uR-f^uK9g*U$t8+eHpTp36pI|HRW22tOM~Z9tuNDTuF!0MrS1BSZuf6G@<09G zY=Y}|$YVI>G4|v$P)J&FfCiwC{04f$Lj^1Z?GEg3p^ zgLSx+b>!xoBg8lUWp4w^-v-?p4!$*ftYR2lIdZ&eB&?bp_B;FgYIb-HC%lFoahnra z%ZaMxoT?lBp?>to2JVjyqtW%F(G83(a`U8H}lc`@GO=drty3#p)^~Fr_ ztC{P62})moywM~0ohq#DpS?{N-llzN7?`W?7v5nA8wckanX}D9^LJUIX6EeuH=?^k zbFFVh_cr^@eB1ECgSYdK*^7@xM2|;AkA~+vN5x%SaVKZtPwwK=vBej>r5EGkSA0p& zH@(t3xzsl$p}$|HPD}bftkU1F(B3UG1=2x*l<|IfaAsxrvyA;kKKx0_ z5z5Er6r3+ozDUWNlk?~0Gh*e(CFQ(Sy&zLB%GRrCpI=Rg88fS+LMd-vF)5P2TU5MX zR0x)oVueN|U6Ux(D@wIW{Z*pWC^cGzdPBCRQGeY~Z)n#x4by6uBogt`l0qS0Qz^6> zm0BfVQ_59Jgvfc!9%yg$PJ{j#M;#BF@=UQn_+d|pD%v6&c7oyP&d*)Z z4d3=8I4V=N`e+%sY1IXfWHAGi>hRZwP;Ub}m{^9C`^OK5o8<=Yb^ zKjfKWYxfHi7cP+`JA#8RFj_cUd`~0DY zb0P@vv+X(zcs!~ReC=eN30NOQ4mp9=-C>dsI83w`TA!2oT!o(|xwjag+Hrw~PAw!1 z8tmp?3plb!R>V}Uj=gnA1(pJ}XXR4#ns8nAXg$nqK7P-DpKfJ*cQM2!-AyMDRT)(|`~8o7n2Itw3`f!8bSvXV%8uDK zSD5=DJz}d<0KGavFd{K2(<#vd>+fuvibd+6A>G)#Ck|epg00dY3Q}N3Rir?xGdU)Z zor%N%4hmU!Iu;R`XukizDdqsWdg%;B3<}xG|wU zpxkkHf!{^+&32qFBEGJJU>zJvpupmY?)?_E#1_DKXKYcJizN}mf}wmG3oTPx{Ru|z zK>mrA4mWAvS^m8MRC=HwDw1Ps-HM}{oUhA-Sh}|Q{bY82IW%%_911D(&NCOl(9g(r z_kla;_=^E zgpvcwJ!0lu-x)_~jD0E&ng1hl&!Gw8^L^)vE*YZDLo; - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.st.v20.core/about.ini b/plugins/org.apache.geronimo.st.v20.core/about.ini deleted file mode 100644 index 1508fe81..00000000 --- a/plugins/org.apache.geronimo.st.v20.core/about.ini +++ /dev/null @@ -1,38 +0,0 @@ -# -# 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. -# -# $Rev: 583586 $ $Date: 2007-10-10 15:29:32 -0400 (Wed, 10 Oct 2007) $ -# - -# -# Property "aboutText" contains blurb for feature details in the "About" -# dialog. Maximum 15 lines and 75 characters per line. -# -aboutText=Apache Geronimo v2.0 Server Adapter\n\ -Version: ${pom.version}-${buildNumber}\n\ -\n\ -(c) Copyright 2003-2008 The Apache Software Foundation\n\ -Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\ -\n\ -Visit http://geronimo.apache.org/\n\ -\n\ -This product includes software developed by the\n\ -Apache Software Foundation http://www.apache.org/ - -# -# Property "featureImage" contains path to feature image (32x32) -# -featureImage=G-logo-32x32.gif diff --git a/plugins/org.apache.geronimo.st.v20.core/pom.xml b/plugins/org.apache.geronimo.st.v20.core/pom.xml index 27070351..64564158 100644 --- a/plugins/org.apache.geronimo.st.v20.core/pom.xml +++ b/plugins/org.apache.geronimo.st.v20.core/pom.xml @@ -28,6 +28,13 @@ + + .. + true + + about.html + + . true @@ -35,8 +42,6 @@ plugin.xml plugin.properties .options - about.ini - about.html - - . - - G-logo-32x32.gif - - diff --git a/plugins/org.apache.geronimo.st.v20.ui/about.html b/plugins/org.apache.geronimo.st.v20.ui/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.st.v20.ui/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.st.v20.ui/pom.xml b/plugins/org.apache.geronimo.st.v20.ui/pom.xml index 79f1fe43..07cc3d0b 100644 --- a/plugins/org.apache.geronimo.st.v20.ui/pom.xml +++ b/plugins/org.apache.geronimo.st.v20.ui/pom.xml @@ -27,14 +27,20 @@ ../pom.xml - + + + .. + true + + about.html + + . plugin.xml plugin.properties .options - about.html diff --git a/plugins/org.apache.geronimo.st.v21.core/about.html b/plugins/org.apache.geronimo.st.v21.core/about.html deleted file mode 100644 index b67ad4a3..00000000 --- a/plugins/org.apache.geronimo.st.v21.core/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -

About This Content

-

June 24, 2008

-

License

-The license for this plugin is found here in the about_files/LICENSE.txt file. -

Notices

-The notices for this plugin are found here in the about_files/NOTICE.txt file. - - \ No newline at end of file diff --git a/plugins/org.apache.geronimo.st.v21.core/about.ini b/plugins/org.apache.geronimo.st.v21.core/about.ini index 9bd03524..54582790 100644 --- a/plugins/org.apache.geronimo.st.v21.core/about.ini +++ b/plugins/org.apache.geronimo.st.v21.core/about.ini @@ -27,7 +27,7 @@ Version: ${pom.version}-${buildNumber}\n\ (c) Copyright 2003-2008 The Apache Software Foundation\n\ Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\ \n\ -Visit http://geronimo.apache.org/\n\ +Visit http://geronimo.apache.org/development-tools.html\n\ \n\ This product includes software developed by the\n\ Apache Software Foundation http://www.apache.org/ diff --git a/plugins/org.apache.geronimo.st.v21.core/pom.xml b/plugins/org.apache.geronimo.st.v21.core/pom.xml index cb26d6b4..dc6e4d0e 100644 --- a/plugins/org.apache.geronimo.st.v21.core/pom.xml +++ b/plugins/org.apache.geronimo.st.v21.core/pom.xml @@ -27,7 +27,14 @@ ../pom.xml - + + + .. + true + + about.html + + . true @@ -36,7 +43,6 @@ plugin.properties .options about.ini - about.html