diff --git a/LICENSE.txt b/LICENSE.txt index 73b679f..d645695 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,60 +1,202 @@ -/* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//logging/LICENSE.txt,v 1.4 2003/10/09 21:37:46 rdonkin Exp $ - * $Revision: 1.4 $ - * $Date: 2003/10/09 21:37:46 $ - * - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001-2003 The Apache Software Foundation. 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 following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgement may appear in the software itself, - * if and wherever such third-party acknowledgements normally appear. - * - * 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * "Apache" nor may "Apache" appear in their names without prior - * written permission of the Apache Software Foundation. - * - * 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 APACHE SOFTWARE FOUNDATION OR - * ITS 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 Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ + + 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 new file mode 100644 index 0000000..439eb83 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/PROPOSAL.html b/PROPOSAL.html index f4664e5..3fb0f30 100644 --- a/PROPOSAL.html +++ b/PROPOSAL.html @@ -1,3 +1,21 @@ + + Proposal for Logging Library Package diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 587f541..52510b0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,22 @@ -$Id: RELEASE-NOTES.txt,v 1.2 2003/04/04 02:49:10 craigmcc Exp $ + + +$Id: RELEASE-NOTES.txt,v 1.3 2004/02/28 22:10:53 craigmcc Exp $ Commons Logging Package Version 1.0.3 diff --git a/STATUS.html b/STATUS.html index fe06a53..98e2e87 100644 --- a/STATUS.html +++ b/STATUS.html @@ -1,3 +1,21 @@ + + Status File for Jakarta Commons "Logging" Component @@ -7,7 +25,7 @@

The Jakarta Commons Logging Component

-$Id: STATUS.html,v 1.14 2003/05/14 10:47:56 rdonkin Exp $
+$Id: STATUS.html,v 1.15 2004/02/28 22:10:53 craigmcc Exp $
[Introduction] [Dependencies] [Release Info] diff --git a/build.properties.sample b/build.properties.sample index fb705e7..350dbf4 100644 --- a/build.properties.sample +++ b/build.properties.sample @@ -1,3 +1,17 @@ +# Copyright 2001-2004 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # log4j.jar - log4j classes (see http://jakarta.apache.org/log4j) log4j.jar=/java/log4j/log4j.jar @@ -16,4 +30,4 @@ avalon-framework.jar=../../Avalon-4.1.4/avalon-framework-4.1.4.jar # Maven properties (for web site build) # Those committers using agents may like to use #maven.username=rdonkin -#logging.cvs=lserver:rdonkin@cvs.apache.org:/home/cvs \ No newline at end of file +#logging.cvs=lserver:rdonkin@cvs.apache.org:/home/cvs diff --git a/build.xml b/build.xml index 21ea0ff..032fabf 100644 --- a/build.xml +++ b/build.xml @@ -1,9 +1,27 @@ + + @@ -246,12 +264,15 @@ + + + diff --git a/checkstyle.xml b/checkstyle.xml index d02e0af..139341f 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -1,5 +1,23 @@ + + diff --git a/maven.xml b/maven.xml index 1a28e1d..487af0e 100644 --- a/maven.xml +++ b/maven.xml @@ -1,3 +1,21 @@ + + diff --git a/project.properties b/project.properties index 9f208b4..da85da5 100644 --- a/project.properties +++ b/project.properties @@ -1,3 +1,19 @@ +# Copyright 2001-2004 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + # documentation properties maven.xdoc.jsl=../commons-build/commons-site.jsl maven.xdoc.date=left @@ -7,4 +23,4 @@ maven.xdoc.poweredby.image=maven-feather.png maven.junit.fork=true -logging.cvs=pserver:anoncvs@cvs.apache.org:/home/cvspublic \ No newline at end of file +logging.cvs=pserver:anoncvs@cvs.apache.org:/home/cvspublic diff --git a/project.xml b/project.xml index a153dc0..13b353f 100644 --- a/project.xml +++ b/project.xml @@ -1,3 +1,21 @@ + + diff --git a/src/java/org/apache/commons/logging/impl/package.html b/src/java/org/apache/commons/logging/impl/package.html index e237393..eb26b76 100644 --- a/src/java/org/apache/commons/logging/impl/package.html +++ b/src/java/org/apache/commons/logging/impl/package.html @@ -1,3 +1,21 @@ + +

Concrete implementations of commons-logging wrapper APIs.

diff --git a/src/java/org/apache/commons/logging/package.html b/src/java/org/apache/commons/logging/package.html index 5e8f0d0..b631a5b 100644 --- a/src/java/org/apache/commons/logging/package.html +++ b/src/java/org/apache/commons/logging/package.html @@ -1,3 +1,21 @@ + +

Simple wrapper API around multiple logging APIs.

diff --git a/src/java/overview.html b/src/java/overview.html index 737d9c2..a3db7c0 100644 --- a/src/java/overview.html +++ b/src/java/overview.html @@ -1,3 +1,21 @@ + + Overview Documentation for COMMONS-LOGGING diff --git a/src/test/org/apache/commons/logging/jdk14/CustomConfig.properties b/src/test/org/apache/commons/logging/jdk14/CustomConfig.properties index 58a7683..9c55a64 100644 --- a/src/test/org/apache/commons/logging/jdk14/CustomConfig.properties +++ b/src/test/org/apache/commons/logging/jdk14/CustomConfig.properties @@ -1,3 +1,18 @@ +# Copyright 2001-2004 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + # This is the custom configuration properties for the JDK 1.4 logger tests # in CustomConfigTestCase. diff --git a/src/test/org/apache/commons/logging/log4j/CustomConfig.properties b/src/test/org/apache/commons/logging/log4j/CustomConfig.properties index 4a19514..1b42efb 100644 --- a/src/test/org/apache/commons/logging/log4j/CustomConfig.properties +++ b/src/test/org/apache/commons/logging/log4j/CustomConfig.properties @@ -1,3 +1,18 @@ +# Copyright 2001-2004 The Apache Software Foundation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + # This is the custom configuration properties for the Log4J logger tests # in CustomConfigTestCase. diff --git a/usersguide.html b/usersguide.html index 746fa0b..4ef12ff 100644 --- a/usersguide.html +++ b/usersguide.html @@ -1,3 +1,21 @@ + + diff --git a/xdocs/guide.xml b/xdocs/guide.xml index 7260c22..2afdffe 100644 --- a/xdocs/guide.xml +++ b/xdocs/guide.xml @@ -1,5 +1,23 @@ + + diff --git a/xdocs/index.xml b/xdocs/index.xml index 140789d..5cac8bb 100644 --- a/xdocs/index.xml +++ b/xdocs/index.xml @@ -1,5 +1,23 @@ + + diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml index 8615969..7f10397 100755 --- a/xdocs/navigation.xml +++ b/xdocs/navigation.xml @@ -1,5 +1,23 @@ + + ]> diff --git a/xdocs/proposal.xml b/xdocs/proposal.xml index e1acafd..fc5660c 100644 --- a/xdocs/proposal.xml +++ b/xdocs/proposal.xml @@ -1,3 +1,21 @@ + + Proposal for Logging Library Package