diff --git a/LICENSE.txt b/LICENSE.txt index 43e91eb0b0d..6b0b1270ff0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,203 +1,203 @@ - - 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. - + + 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. + diff --git a/NOTICE.txt b/NOTICE.txt index 89f0a96a4a1..439eb83b2f4 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,3 +1,3 @@ -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 44b5b2cb895..85228860ccc 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,27 +1,27 @@ -$Id: RELEASE-NOTES.txt,v 1.5 2004/04/18 22:04:50 bayard Exp $ - - Commons IO Package - Version 1.0 - Release Notes - - -INTRODUCTION: - -This document contains the release notes for this version of the Commons -IO package. - -Commons IO is a package of Java utility classes for java.io's hierarchy. -Classes in this package are considered to be so standard and of such high -reuse as to justify existence in java.io. - -Commons IO contains utility classes, stream implementations, file filters, -and endian transformation classes. - -NEW FEATURES: - -* This is the first release of Commons IO, so all features are new features. - -BUG FIXES: - -Since this is the first release, there are no declared bugfixes. - +$Id$ + + Commons IO Package + Version 1.0 + Release Notes + + +INTRODUCTION: + +This document contains the release notes for this version of the Commons +IO package. + +Commons IO is a package of Java utility classes for java.io's hierarchy. +Classes in this package are considered to be so standard and of such high +reuse as to justify existence in java.io. + +Commons IO contains utility classes, stream implementations, file filters, +and endian transformation classes. + +NEW FEATURES: + +* This is the first release of Commons IO, so all features are new features. + +BUG FIXES: + +Since this is the first release, there are no declared bugfixes. + diff --git a/STATUS.html b/STATUS.html index c05ec4ca840..e42d4c009fd 100644 --- a/STATUS.html +++ b/STATUS.html @@ -7,7 +7,7 @@

The Jakarta Commons IO Component

- $Id: STATUS.html,v 1.14 2004/02/04 21:49:52 scolebourne Exp $
+ $Id$
[Introduction] [Dependencies] [Release Info] [Committers] [Action Items]
diff --git a/src/java/org/apache/commons/io/CopyUtils.java b/src/java/org/apache/commons/io/CopyUtils.java index c0cb5b8c5f0..789de5500de 100644 --- a/src/java/org/apache/commons/io/CopyUtils.java +++ b/src/java/org/apache/commons/io/CopyUtils.java @@ -105,7 +105,7 @@ * @author Peter Donald * @author Jeff Turner * @author Matthew Hawthorne - * @version $Id: CopyUtils.java,v 1.10 2004/10/24 04:20:06 martinc Exp $ + * @version $Id$ * @deprecated Use IOUtils. Will be removed in 2.0. * Methods renamed to IOUtils.write() or IOUtils.copy(). * Null handling behaviour changed in IOUtils (null data does not diff --git a/src/java/org/apache/commons/io/EndianUtils.java b/src/java/org/apache/commons/io/EndianUtils.java index 2b121269f34..88411791328 100644 --- a/src/java/org/apache/commons/io/EndianUtils.java +++ b/src/java/org/apache/commons/io/EndianUtils.java @@ -26,7 +26,7 @@ * Origin of code: Apache Avalon (Excalibur) * * @author Peter Donald - * @version CVS $Revision: 1.15 $ $Date: 2004/10/24 04:20:06 $ + * @version CVS $Revision$ $Date$ */ public class EndianUtils { diff --git a/src/java/org/apache/commons/io/FileCleaner.java b/src/java/org/apache/commons/io/FileCleaner.java index 926750c428f..dd419b27d9c 100644 --- a/src/java/org/apache/commons/io/FileCleaner.java +++ b/src/java/org/apache/commons/io/FileCleaner.java @@ -28,7 +28,7 @@ * @author Noel Bergman * @author Martin Cooper * - * @version $Id: FileCleaner.java,v 1.2 2004/10/24 04:20:06 martinc Exp $ + * @version $Id$ */ public class FileCleaner { diff --git a/src/java/org/apache/commons/io/HexDump.java b/src/java/org/apache/commons/io/HexDump.java index 50ee6ee8144..98936323cff 100644 --- a/src/java/org/apache/commons/io/HexDump.java +++ b/src/java/org/apache/commons/io/HexDump.java @@ -27,7 +27,7 @@ * * @author Scott Sanders (sanders at apache dot org) * @author Marc Johnson - * @version $Revision: 1.9 $ $Date: 2004/10/24 04:20:07 $ + * @version $Revision$ $Date$ */ public class HexDump { diff --git a/src/java/org/apache/commons/io/IOUtils.java b/src/java/org/apache/commons/io/IOUtils.java index ef9cb0960e5..5af75194804 100644 --- a/src/java/org/apache/commons/io/IOUtils.java +++ b/src/java/org/apache/commons/io/IOUtils.java @@ -65,7 +65,7 @@ * @author Matthew Hawthorne * @author Stephen Colebourne * @author Gareth Davis - * @version CVS $Revision: 1.22 $ $Date: 2004/10/24 04:20:07 $ + * @version CVS $Revision$ $Date$ */ public class IOUtils { // NOTE: This class is focussed on InputStream, OutputStream, Reader and diff --git a/src/java/org/apache/commons/io/filefilter/AbstractFileFilter.java b/src/java/org/apache/commons/io/filefilter/AbstractFileFilter.java index b94b3807446..9c2b95ca3f5 100644 --- a/src/java/org/apache/commons/io/filefilter/AbstractFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/AbstractFileFilter.java @@ -25,7 +25,7 @@ * otherwise your class will infinitely loop. * * @since Commons IO 1.0 - * @version $Revision: 1.10 $ $Date: 2004/10/24 16:50:23 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/AndFileFilter.java b/src/java/org/apache/commons/io/filefilter/AndFileFilter.java index 462895d12be..2b09004b7a7 100644 --- a/src/java/org/apache/commons/io/filefilter/AndFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/AndFileFilter.java @@ -29,7 +29,7 @@ * false. * * @since Commons IO 1.0 - * @version $Revision: 1.11 $ $Date: 2004/10/25 23:28:29 $ + * @version $Revision$ $Date$ * * @author Steven Caswell */ diff --git a/src/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java b/src/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java index f53bf7aab8b..e0e64058bbd 100644 --- a/src/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/ConditionalFileFilter.java @@ -21,7 +21,7 @@ * Defines operations for conditional file filters. * * @since Commons IO 1.1 - * @version $Revision: 1.3 $ $Date: 2004/10/25 23:28:29 $ + * @version $Revision$ $Date$ * * @author Steven Caswell */ diff --git a/src/java/org/apache/commons/io/filefilter/DelegateFileFilter.java b/src/java/org/apache/commons/io/filefilter/DelegateFileFilter.java index c223610b69a..53339feca3b 100644 --- a/src/java/org/apache/commons/io/filefilter/DelegateFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/DelegateFileFilter.java @@ -23,7 +23,7 @@ * This class turns a Java FileFilter or FilenameFilter into an IO FileFilter. * * @since Commons IO 1.0 - * @version $Revision: 1.8 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java b/src/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java index 8faad77f13f..4c9c09fa9af 100644 --- a/src/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java @@ -32,7 +32,7 @@ * * * @since Commons IO 1.0 - * @version $Revision: 1.7 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/FalseFileFilter.java b/src/java/org/apache/commons/io/filefilter/FalseFileFilter.java index 05c89112db2..baa5051e8a5 100644 --- a/src/java/org/apache/commons/io/filefilter/FalseFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/FalseFileFilter.java @@ -21,7 +21,7 @@ * A file filter that always returns false. * * @since Commons IO 1.0 - * @version $Revision: 1.7 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/IOFileFilter.java b/src/java/org/apache/commons/io/filefilter/IOFileFilter.java index 768bd22bb92..7b01650eabc 100644 --- a/src/java/org/apache/commons/io/filefilter/IOFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/IOFileFilter.java @@ -24,7 +24,7 @@ * interfaces together. * * @since Commons IO 1.0 - * @version $Revision: 1.4 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/NameFileFilter.java b/src/java/org/apache/commons/io/filefilter/NameFileFilter.java index 303662b9340..d77cb6e8c1f 100644 --- a/src/java/org/apache/commons/io/filefilter/NameFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/NameFileFilter.java @@ -33,7 +33,7 @@ * * * @since Commons IO 1.0 - * @version $Revision: 1.3 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/NotFileFilter.java b/src/java/org/apache/commons/io/filefilter/NotFileFilter.java index a13e10be4a6..984b245f251 100644 --- a/src/java/org/apache/commons/io/filefilter/NotFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/NotFileFilter.java @@ -21,7 +21,7 @@ * This filter produces a logical NOT of the filters specified. * * @since Commons IO 1.0 - * @version $Revision: 1.6 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Stephen Colebourne */ diff --git a/src/java/org/apache/commons/io/filefilter/OrFileFilter.java b/src/java/org/apache/commons/io/filefilter/OrFileFilter.java index a919dbe3c51..17af29c0c0c 100644 --- a/src/java/org/apache/commons/io/filefilter/OrFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/OrFileFilter.java @@ -29,7 +29,7 @@ * true. * * @since Commons IO 1.0 - * @version $Revision: 1.11 $ $Date: 2004/10/25 23:28:30 $ + * @version $Revision$ $Date$ * * @author Steven Caswell */ diff --git a/src/java/org/apache/commons/io/filefilter/PrefixFileFilter.java b/src/java/org/apache/commons/io/filefilter/PrefixFileFilter.java index a3dbce528d8..be0c7c3bd4f 100644 --- a/src/java/org/apache/commons/io/filefilter/PrefixFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/PrefixFileFilter.java @@ -33,7 +33,7 @@ * * * @since Commons IO 1.0 - * @version $Revision: 1.8 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/SuffixFileFilter.java b/src/java/org/apache/commons/io/filefilter/SuffixFileFilter.java index 2eba4df3bbd..d58e7618ea0 100644 --- a/src/java/org/apache/commons/io/filefilter/SuffixFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/SuffixFileFilter.java @@ -34,7 +34,7 @@ * * * @since Commons IO 1.0 - * @version $Revision: 1.6 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/TrueFileFilter.java b/src/java/org/apache/commons/io/filefilter/TrueFileFilter.java index 7d9efb64a9b..42e9d1d284d 100644 --- a/src/java/org/apache/commons/io/filefilter/TrueFileFilter.java +++ b/src/java/org/apache/commons/io/filefilter/TrueFileFilter.java @@ -21,7 +21,7 @@ * A file filter that always returns true. * * @since Commons IO 1.0 - * @version $Revision: 1.7 $ $Date: 2004/02/23 04:37:57 $ + * @version $Revision$ $Date$ * * @author Henri Yandell * @author Stephen Colebourne diff --git a/src/java/org/apache/commons/io/filefilter/WildcardFilter.java b/src/java/org/apache/commons/io/filefilter/WildcardFilter.java index be49193fbc3..ee870b45be0 100644 --- a/src/java/org/apache/commons/io/filefilter/WildcardFilter.java +++ b/src/java/org/apache/commons/io/filefilter/WildcardFilter.java @@ -22,7 +22,7 @@ * * * @author Jason Anderson - * @version $Revision: 1.5 $ $Date: 2004/10/31 04:17:34 $ + * @version $Revision$ $Date$ * @since Commons IO 1.1 */ public class WildcardFilter extends AbstractFileFilter { diff --git a/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java b/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java index 19672e8a96e..b531386c200 100644 --- a/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java +++ b/src/java/org/apache/commons/io/input/ClassLoaderObjectInputStream.java @@ -26,7 +26,7 @@ * by Avalon components that are juggling many classloaders. * * @author Paul Hammant - * @version $Revision: 1.5 $ $Date: 2004/02/23 04:38:52 $ + * @version $Revision$ $Date$ */ public class ClassLoaderObjectInputStream extends ObjectInputStream diff --git a/src/java/org/apache/commons/io/input/DemuxInputStream.java b/src/java/org/apache/commons/io/input/DemuxInputStream.java index a7cc5d5d0e1..c4c5c0313e6 100644 --- a/src/java/org/apache/commons/io/input/DemuxInputStream.java +++ b/src/java/org/apache/commons/io/input/DemuxInputStream.java @@ -23,7 +23,7 @@ * with this thread. * * @author Peter Donald - * @version $Revision: 1.5 $ $Date: 2004/02/23 04:38:52 $ + * @version $Revision$ $Date$ */ public class DemuxInputStream extends InputStream diff --git a/src/java/org/apache/commons/io/input/SwappedDataInputStream.java b/src/java/org/apache/commons/io/input/SwappedDataInputStream.java index 32d895d1027..b591eecc3cf 100644 --- a/src/java/org/apache/commons/io/input/SwappedDataInputStream.java +++ b/src/java/org/apache/commons/io/input/SwappedDataInputStream.java @@ -30,7 +30,7 @@ *

Origin of code: Avalon Excalibur (IO)

* * @author Peter Donald - * @version CVS $Revision: 1.8 $ $Date: 2004/02/23 04:56:59 $ + * @version CVS $Revision$ $Date$ */ public class SwappedDataInputStream extends ProxyInputStream implements DataInput diff --git a/src/java/org/apache/commons/io/input/package.html b/src/java/org/apache/commons/io/input/package.html index 9c17ddb077e..4b0974916bd 100755 --- a/src/java/org/apache/commons/io/input/package.html +++ b/src/java/org/apache/commons/io/input/package.html @@ -1,8 +1,8 @@ - - - Implementations of input classes, such as - InputStream and - Reader. - - - + + + Implementations of input classes, such as + InputStream and + Reader. + + + diff --git a/src/java/org/apache/commons/io/output/ByteArrayOutputStream.java b/src/java/org/apache/commons/io/output/ByteArrayOutputStream.java index 642a73066e0..cd92f917b6b 100644 --- a/src/java/org/apache/commons/io/output/ByteArrayOutputStream.java +++ b/src/java/org/apache/commons/io/output/ByteArrayOutputStream.java @@ -42,7 +42,7 @@ * designed to behave exactly like the original. The only exception is the * deprecated toString(int) method that has been ignored. * @author Jeremias Maerki - * @version $Id: ByteArrayOutputStream.java,v 1.8 2004/04/24 19:24:09 jeremias Exp $ + * @version $Id$ */ public class ByteArrayOutputStream extends OutputStream { diff --git a/src/java/org/apache/commons/io/output/CountingOutputStream.java b/src/java/org/apache/commons/io/output/CountingOutputStream.java index 6281a68f811..33172df7da7 100644 --- a/src/java/org/apache/commons/io/output/CountingOutputStream.java +++ b/src/java/org/apache/commons/io/output/CountingOutputStream.java @@ -23,7 +23,7 @@ * through it. * * @author Henri Yandell - * @version $Id: CountingOutputStream.java,v 1.6 2004/06/13 05:35:44 bayard Exp $ + * @version $Id$ */ public class CountingOutputStream extends ProxyOutputStream { diff --git a/src/java/org/apache/commons/io/output/DeferredFileOutputStream.java b/src/java/org/apache/commons/io/output/DeferredFileOutputStream.java index d060b6b9ee5..e5ece8eafb6 100644 --- a/src/java/org/apache/commons/io/output/DeferredFileOutputStream.java +++ b/src/java/org/apache/commons/io/output/DeferredFileOutputStream.java @@ -35,7 +35,7 @@ * * @author Martin Cooper * - * @version $Id: DeferredFileOutputStream.java,v 1.4 2004/10/11 04:29:47 martinc Exp $ + * @version $Id$ */ public class DeferredFileOutputStream extends ThresholdingOutputStream diff --git a/src/java/org/apache/commons/io/output/DemuxOutputStream.java b/src/java/org/apache/commons/io/output/DemuxOutputStream.java index 92ffde86410..2dd84084e4e 100644 --- a/src/java/org/apache/commons/io/output/DemuxOutputStream.java +++ b/src/java/org/apache/commons/io/output/DemuxOutputStream.java @@ -23,7 +23,7 @@ * with this thread. * * @author Peter Donald - * @version $Revision: 1.5 $ $Date: 2004/02/23 04:40:29 $ + * @version $Revision$ $Date$ */ public class DemuxOutputStream extends OutputStream diff --git a/src/java/org/apache/commons/io/output/LockableFileWriter.java b/src/java/org/apache/commons/io/output/LockableFileWriter.java index b0d036213e7..8f5af8d662d 100644 --- a/src/java/org/apache/commons/io/output/LockableFileWriter.java +++ b/src/java/org/apache/commons/io/output/LockableFileWriter.java @@ -31,7 +31,7 @@ * @author Michael Salmon * @author Jon S. Stevens * @author Daniel Rall - * @version $Id: LockableFileWriter.java,v 1.7 2004/02/23 04:40:29 bayard Exp $ + * @version $Id$ */ public class LockableFileWriter extends Writer { diff --git a/src/java/org/apache/commons/io/output/TeeOutputStream.java b/src/java/org/apache/commons/io/output/TeeOutputStream.java index 3e75ec7e10e..0bf87fb5c6f 100644 --- a/src/java/org/apache/commons/io/output/TeeOutputStream.java +++ b/src/java/org/apache/commons/io/output/TeeOutputStream.java @@ -24,7 +24,7 @@ * are now two streams. * * @author Henri Yandell - * @version $Id: TeeOutputStream.java,v 1.6 2004/02/23 04:53:04 bayard Exp $ + * @version $Id$ */ public class TeeOutputStream extends ProxyOutputStream { diff --git a/src/java/org/apache/commons/io/output/ThresholdingOutputStream.java b/src/java/org/apache/commons/io/output/ThresholdingOutputStream.java index 114df9c3110..cf07cf262d2 100644 --- a/src/java/org/apache/commons/io/output/ThresholdingOutputStream.java +++ b/src/java/org/apache/commons/io/output/ThresholdingOutputStream.java @@ -37,7 +37,7 @@ * * @author Martin Cooper * - * @version $Id: ThresholdingOutputStream.java,v 1.2 2004/02/23 04:40:29 bayard Exp $ + * @version $Id$ */ public abstract class ThresholdingOutputStream extends OutputStream diff --git a/src/java/org/apache/commons/io/output/package.html b/src/java/org/apache/commons/io/output/package.html index 6287a482278..40b98cf8a2e 100755 --- a/src/java/org/apache/commons/io/output/package.html +++ b/src/java/org/apache/commons/io/output/package.html @@ -1,8 +1,8 @@ - - - Implementations of output classes, such as - OutputStream and - Writer. - - - + + + Implementations of output classes, such as + OutputStream and + Writer. + + + diff --git a/src/test/org/apache/commons/io/CopyUtilsTest.java b/src/test/org/apache/commons/io/CopyUtilsTest.java index a37685c7ce8..5130b2cb19c 100644 --- a/src/test/org/apache/commons/io/CopyUtilsTest.java +++ b/src/test/org/apache/commons/io/CopyUtilsTest.java @@ -37,7 +37,7 @@ * @author Jeff Turner * @author Matthew Hawthorne * @author Jeremias Maerki - * @version $Id: CopyUtilsTest.java,v 1.8 2004/08/13 23:51:41 scolebourne Exp $ + * @version $Id$ * @see CopyUtils */ public class CopyUtilsTest extends FileBasedTestCase { diff --git a/src/test/org/apache/commons/io/EndianUtilsTest.java b/src/test/org/apache/commons/io/EndianUtilsTest.java index a031da956c4..8bf47aeabb4 100755 --- a/src/test/org/apache/commons/io/EndianUtilsTest.java +++ b/src/test/org/apache/commons/io/EndianUtilsTest.java @@ -23,7 +23,7 @@ /** * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.13 $ $Date: 2004/02/29 21:47:07 $ + * @version $Revision$ $Date$ */ public class EndianUtilsTest extends TestCase { diff --git a/src/test/org/apache/commons/io/FileCleanerTestCase.java b/src/test/org/apache/commons/io/FileCleanerTestCase.java index 25ff0eaff42..48091c4ce2b 100644 --- a/src/test/org/apache/commons/io/FileCleanerTestCase.java +++ b/src/test/org/apache/commons/io/FileCleanerTestCase.java @@ -31,7 +31,7 @@ * @author Noel Bergman * @author Martin Cooper * - * @version $Id: FileCleanerTestCase.java,v 1.1 2004/03/18 06:04:14 martinc Exp $ + * @version $Id$ * @see FileCleaner */ diff --git a/src/test/org/apache/commons/io/FilenameUtilsTestCase.java b/src/test/org/apache/commons/io/FilenameUtilsTestCase.java index 5ad251b6b61..87819605bef 100644 --- a/src/test/org/apache/commons/io/FilenameUtilsTestCase.java +++ b/src/test/org/apache/commons/io/FilenameUtilsTestCase.java @@ -33,7 +33,7 @@ * @author Peter Donald * @author Matthew Hawthorne * @author Martin Cooper - * @version $Id: FilenameUtilsTestCase.java,v 1.23 2004/12/04 19:28:40 scolebourne Exp $ + * @version $Id$ * @see FilenameUtils */ public class FilenameUtilsTestCase extends FileBasedTestCase { diff --git a/src/test/org/apache/commons/io/HexDumpTest.java b/src/test/org/apache/commons/io/HexDumpTest.java index 2b3f3bbbac2..0625e7e9eff 100644 --- a/src/test/org/apache/commons/io/HexDumpTest.java +++ b/src/test/org/apache/commons/io/HexDumpTest.java @@ -25,7 +25,7 @@ /** * @author Scott Sanders (sanders at apache dot org) * @author Marc Johnson (mjohnson at apache dot org) - * @version $Revision: 1.5 $ $Date: 2004/02/23 05:02:25 $ + * @version $Revision$ $Date$ */ public class HexDumpTest extends TestCase { diff --git a/src/test/org/apache/commons/io/IOUtilsCopyTestCase.java b/src/test/org/apache/commons/io/IOUtilsCopyTestCase.java index e41ff0182f7..a3db0a052df 100644 --- a/src/test/org/apache/commons/io/IOUtilsCopyTestCase.java +++ b/src/test/org/apache/commons/io/IOUtilsCopyTestCase.java @@ -40,7 +40,7 @@ * @author Matthew Hawthorne * @author Jeremias Maerki * @author Stephen Colebourne - * @version $Id: IOUtilsCopyTestCase.java,v 1.1 2004/08/13 23:39:01 scolebourne Exp $ + * @version $Id$ * @see IOUtils */ public class IOUtilsCopyTestCase extends FileBasedTestCase { diff --git a/src/test/org/apache/commons/io/IOUtilsWriteTestCase.java b/src/test/org/apache/commons/io/IOUtilsWriteTestCase.java index 2d9522b4340..9386ab3f98c 100644 --- a/src/test/org/apache/commons/io/IOUtilsWriteTestCase.java +++ b/src/test/org/apache/commons/io/IOUtilsWriteTestCase.java @@ -35,7 +35,7 @@ * @author Matthew Hawthorne * @author Jeremias Maerki * @author Stephen Colebourne - * @version $Id: IOUtilsWriteTestCase.java,v 1.1 2004/08/13 23:39:01 scolebourne Exp $ + * @version $Id$ * @see IOUtils */ public class IOUtilsWriteTestCase extends FileBasedTestCase { diff --git a/src/test/org/apache/commons/io/input/SwappedDataInputStreamTest.java b/src/test/org/apache/commons/io/input/SwappedDataInputStreamTest.java index a0e2428d488..b3053418d40 100755 --- a/src/test/org/apache/commons/io/input/SwappedDataInputStreamTest.java +++ b/src/test/org/apache/commons/io/input/SwappedDataInputStreamTest.java @@ -29,7 +29,7 @@ * effectively tests the underlying EndianUtils Stream methods. * * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.9 $ $Date: 2004/02/29 22:03:45 $ + * @version $Revision$ $Date$ */ public class SwappedDataInputStreamTest extends TestCase { diff --git a/src/test/org/apache/commons/io/output/CountingOutputStreamTest.java b/src/test/org/apache/commons/io/output/CountingOutputStreamTest.java index f69f8453274..3e6229de942 100755 --- a/src/test/org/apache/commons/io/output/CountingOutputStreamTest.java +++ b/src/test/org/apache/commons/io/output/CountingOutputStreamTest.java @@ -26,7 +26,7 @@ /** * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.3 $ $Date: 2004/06/13 05:35:44 $ + * @version $Revision$ $Date$ */ public class CountingOutputStreamTest extends TestCase { diff --git a/src/test/org/apache/commons/io/output/DeferredFileOutputStreamTest.java b/src/test/org/apache/commons/io/output/DeferredFileOutputStreamTest.java index 1917323d4e9..a6d4e09c19f 100644 --- a/src/test/org/apache/commons/io/output/DeferredFileOutputStreamTest.java +++ b/src/test/org/apache/commons/io/output/DeferredFileOutputStreamTest.java @@ -31,7 +31,7 @@ * * @author Martin Cooper * - * @version $Id: DeferredFileOutputStreamTest.java,v 1.2 2004/02/23 05:02:25 bayard Exp $ + * @version $Id$ */ public class DeferredFileOutputStreamTest extends TestCase { diff --git a/src/test/org/apache/commons/io/output/LockableFileWriterTest.java b/src/test/org/apache/commons/io/output/LockableFileWriterTest.java index 7912d4c0bd2..709696a5d12 100755 --- a/src/test/org/apache/commons/io/output/LockableFileWriterTest.java +++ b/src/test/org/apache/commons/io/output/LockableFileWriterTest.java @@ -28,7 +28,7 @@ * the locking is tested only on construction. * * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.2 $ $Date: 2004/02/29 21:07:14 $ + * @version $Revision$ $Date$ */ public class LockableFileWriterTest extends TestCase { diff --git a/src/test/org/apache/commons/io/output/NullOutputStreamTest.java b/src/test/org/apache/commons/io/output/NullOutputStreamTest.java index e47625947f1..5203388bc04 100755 --- a/src/test/org/apache/commons/io/output/NullOutputStreamTest.java +++ b/src/test/org/apache/commons/io/output/NullOutputStreamTest.java @@ -28,7 +28,7 @@ * Exceptions are thrown. * * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.2 $ $Date: 2004/02/23 05:02:25 $ + * @version $Revision$ $Date$ */ public class NullOutputStreamTest extends TestCase { diff --git a/src/test/org/apache/commons/io/output/TeeOutputStreamTest.java b/src/test/org/apache/commons/io/output/TeeOutputStreamTest.java index 18e898afef8..ec66f5c3e25 100755 --- a/src/test/org/apache/commons/io/output/TeeOutputStreamTest.java +++ b/src/test/org/apache/commons/io/output/TeeOutputStreamTest.java @@ -26,7 +26,7 @@ /** * @author Henri Yandell (bayard at apache dot org) - * @version $Revision: 1.3 $ $Date: 2004/02/23 05:02:25 $ + * @version $Revision$ $Date$ */ public class TeeOutputStreamTest extends TestCase { diff --git a/xdocs/bestpractices.xml b/xdocs/bestpractices.xml index ad380bb0bc1..c7829c43b07 100644 --- a/xdocs/bestpractices.xml +++ b/xdocs/bestpractices.xml @@ -2,7 +2,7 @@ diff --git a/xdocs/building.xml b/xdocs/building.xml index 923084919b6..59287f492ce 100644 --- a/xdocs/building.xml +++ b/xdocs/building.xml @@ -2,7 +2,7 @@ diff --git a/xdocs/description.xml b/xdocs/description.xml index 5d688b0abfb..2cec8cdcafc 100755 --- a/xdocs/description.xml +++ b/xdocs/description.xml @@ -2,7 +2,7 @@ diff --git a/xdocs/proposal.xml b/xdocs/proposal.xml index 3e4ae72f9ae..e3b9042873f 100644 --- a/xdocs/proposal.xml +++ b/xdocs/proposal.xml @@ -1,6 +1,6 @@ - + Proposal for IO Package