svn commit: r1215449 - /logging/log4php/trunk/LICENSE

[ih...@apache.org]

Author: ihabunek
Date: Sat Dec 17 10:26:12 2011
New Revision: 1215449

URL: http://svn.apache.org/viewvc?rev=1215449&view=rev
Log:
Updated LICENSE file to include jQuery license.

Modified:
    logging/log4php/trunk/LICENSE

Modified: logging/log4php/trunk/LICENSE
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/LICENSE?rev=1215449&r1=1215448&r2=1215449&view=diff
==============================================================================
--- logging/log4php/trunk/LICENSE (original)
+++ logging/log4php/trunk/LICENSE Sat Dec 17 10:26:12 2011
@@ -199,3 +199,54 @@
    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 LOG4PHP SUBCOMPONENTS: 
+
+Apache log4php includes subcomponents with separate copyright notices and 
+license terms. Your use of the source code for the these subcomponents is
+subject to the terms and conditions of the following licenses. 
+
+From the jQuery component:
+
+/*!
+ * jQuery JavaScript Library v1.7.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Mon Nov 21 21:11:03 2011 -0500
+ */ 
+ 
+The MIT license used for the jQuery component: 
+
+/*
+ * Copyright (c) 2011 John Resig, http://jquery.com/
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ */