Author: antonio Date: Mon Dec 27 03:36:53 2004 New Revision: 123399 URL: http://svn.apache.org/viewcvs?view=rev&rev=123399 Log: Update slide to 2.1 Added: cocoon/branches/BRANCH_2_1_X/legal/commons-codec-1.3.jar.license.txt (contents, props changed) cocoon/branches/BRANCH_2_1_X/legal/commons-transaction-1.0.jar.license.txt (contents, props changed) cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.1.jar.license.txt (contents, props changed) cocoon/branches/BRANCH_2_1_X/legal/jdom-1.0.jar.license.txt (contents, props changed) cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.1.jar.license.txt - copied unchanged from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.1.jar.license.txt - copied unchanged from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.1.jar.license.txt - copied unchanged from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.3.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/commons-transaction-1.0.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.1.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-1.0.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.1.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.1.jar (contents, props changed) cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.1.jar (contents, props changed) Removed: cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.0rc1.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/jdom-b9.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.0.jar cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-b9.jar cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.0.jar cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.0.jar cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.0.jar Modified: cocoon/branches/BRANCH_2_1_X/gump.xml cocoon/branches/BRANCH_2_1_X/lib/jars.xml cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/gump.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/gump.xml?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/gump.xml&r1=123398&p2=cocoon/branches/BRANCH_2_1_X/gump.xml&r2=123399 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/gump.xml (original) +++ cocoon/branches/BRANCH_2_1_X/gump.xml Mon Dec 27 03:36:53 2004 @@ -658,12 +658,16 @@ <depend project="jta"/> <depend project="jakarta-slide"/> <depend project="jdom"/> + <depend project="commons-transaction"/> + <depend project="commons-codec"/> <library name="geronimo-spec-jta"/> <library name="slide-kernel"/> <library name="slide-stores"/> <library name="slide-webdavservlet"/> <library name="jdom"/> + <library name="commons-transaction"/> + <library name="commons-codec"/> <work nested="tools/anttasks"/> <home nested="build/cocoon-@@DATE@@"/> Added: cocoon/branches/BRANCH_2_1_X/legal/commons-codec-1.3.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/commons-codec-1.3.jar.license.txt?view=auto&rev=123399 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/legal/commons-codec-1.3.jar.license.txt Mon Dec 27 03:36:53 2004 @@ -0,0 +1,202 @@ + + 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: cocoon/branches/BRANCH_2_1_X/legal/commons-transaction-1.0.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/commons-transaction-1.0.jar.license.txt?view=auto&rev=123399 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/legal/commons-transaction-1.0.jar.license.txt Mon Dec 27 03:36:53 2004 @@ -0,0 +1,202 @@ + + 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. Deleted: /cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.0rc1.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.0rc1.jar.license.txt?view=auto&rev=123398 ============================================================================== Added: cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.1.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.1.jar.license.txt?view=auto&rev=123399 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/legal/jakarta-slide-webdavlib-2.1.jar.license.txt Mon Dec 27 03:36:53 2004 @@ -0,0 +1,202 @@ + + 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: cocoon/branches/BRANCH_2_1_X/legal/jdom-1.0.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/jdom-1.0.jar.license.txt?view=auto&rev=123399 ============================================================================== --- (empty file) +++ cocoon/branches/BRANCH_2_1_X/legal/jdom-1.0.jar.license.txt Mon Dec 27 03:36:53 2004 @@ -0,0 +1,56 @@ +/*-- + + $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $ + + Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. + + 3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. + + 4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management <request_AT_jdom_DOT_org>. + + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the + software itself an acknowledgement equivalent to the following: + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." + Alternatively, the acknowledgment may be graphical using the logos + available at http://www.jdom.org/images/logos. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally + created by Jason Hunter <jhunter_AT_jdom_DOT_org> and + Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information + on the JDOM Project, please see <http://www.jdom.org/>. + + */ + Deleted: /cocoon/branches/BRANCH_2_1_X/legal/jdom-b9.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/jdom-b9.jar.license.txt?view=auto&rev=123398 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt?view=auto&rev=123398 ============================================================================== Copied: cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.1.jar.license.txt (from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt) Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.1.jar.license.txt?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.0.jar.license.txt&r1=123396&p2=cocoon/branches/BRANCH_2_1_X/legal/slide-kernel-2.1.jar.license.txt&r2=123399 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt?view=auto&rev=123398 ============================================================================== Copied: cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.1.jar.license.txt (from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt) Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.1.jar.license.txt?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.0.jar.license.txt&r1=123396&p2=cocoon/branches/BRANCH_2_1_X/legal/slide-stores-2.1.jar.license.txt&r2=123399 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt?view=auto&rev=123398 ============================================================================== Copied: cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.1.jar.license.txt (from r123396, cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt) Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.1.jar.license.txt?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.0.jar.license.txt&r1=123396&p2=cocoon/branches/BRANCH_2_1_X/legal/slide-webdavservlet-2.1.jar.license.txt&r2=123399 ============================================================================== Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/lib/jars.xml&r1=123398&p2=cocoon/branches/BRANCH_2_1_X/lib/jars.xml&r2=123399 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original) +++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Mon Dec 27 03:36:53 2004 @@ -764,7 +764,7 @@ <title>Slide kernel</title> <description>The Jakarta Slide kernel API.</description> <used-by>Slide block</used-by> - <lib>optional/slide-kernel-2.0.jar</lib> + <lib>optional/slide-kernel-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -772,7 +772,7 @@ <title>Slide stores</title> <description>The Jakarta Slide stores implementation.</description> <used-by>Slide block</used-by> - <lib>optional/slide-stores-2.0.jar</lib> + <lib>optional/slide-stores-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -780,7 +780,7 @@ <title>Slide WebDAV Servlet</title> <description>The Jakarta Slide WebDAV servlet.</description> <used-by>Slide block</used-by> - <lib>optional/slide-webdavservlet-2.0.jar</lib> + <lib>optional/slide-webdavservlet-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> @@ -788,15 +788,31 @@ <title>Slide WebDAV Client library</title> <description>The Jakarta Slide WebDAV client library.</description> <used-by>WebDAV block</used-by> - <lib>optional/jakarta-slide-webdavlib-2.0.jar</lib> + <lib>optional/jakarta-slide-webdavlib-2.1.jar</lib> <homepage>http://jakarta.apache.org/slide/</homepage> </file> <file> + <title>Jakarta Commons Transaction</title> + <description>Utility classes commonly used in transactional Java programming</description> + <used-by>WebDAV block</used-by> + <lib>optional/commons-transaction-1.0.jar</lib> + <homepage>http://jakarta.apache.org/commons/transaction/</homepage> + </file> + + <file> + <title>Jakarta Commons Codec</title> + <description>implementations of common encoders and decoders</description> + <used-by>WebDAV block</used-by> + <lib>optional/commons-codec-1.3.jar</lib> + <homepage>http://jakarta.apache.org/commons/codec/</homepage> + </file> + + <file> <title>JDOM</title> <description>JDOM</description> <used-by>Slide block</used-by> - <lib>optional/jdom-b9.jar</lib> + <lib>optional/jdom-1.0.jar</lib> <homepage>http://www.jdom.org/</homepage> </file> Added: cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.3.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/commons-codec-1.3.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Added: cocoon/branches/BRANCH_2_1_X/lib/optional/commons-transaction-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/commons-transaction-1.0.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.0.jar?view=auto&rev=123398 ============================================================================== Added: cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jakarta-slide-webdavlib-2.1.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Added: cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-1.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-1.0.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-b9.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/jdom-b9.jar?view=auto&rev=123398 ============================================================================== Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.0.jar?view=auto&rev=123398 ============================================================================== Added: cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-kernel-2.1.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.0.jar?view=auto&rev=123398 ============================================================================== Added: cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-stores-2.1.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Deleted: /cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.0.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.0.jar?view=auto&rev=123398 ============================================================================== Added: cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.1.jar Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/lib/optional/slide-webdavservlet-2.1.jar?view=auto&rev=123399 ============================================================================== Binary file. No diff available. Modified: cocoon/branches/BRANCH_2_1_X/status.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=123399&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=123398&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=123399 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Dec 27 03:36:53 2004 @@ -202,6 +202,12 @@ <changes> <release version="@version@" date="@date@"> + <action dev="AG" type="add"> + Added commons-transaction 1.0 and commons-codec 1.3. Both are needed by slide 2.1. + </action> + <action dev="AG" type="update"> + Updated jakarta-slide-webdavlib to 2.1, jdom to 1.0, slide-kernel to 2.1, slide-stores to 2.1, slide-webdavservlet to 2.1. + </action> <action dev="RG" type="add"> Portal now allows Cocoon to be deployed as a war (only supports local JSR-168 portlets) and allows external portlets to be in a war.
