Author: gmazza
Date: Sun Jul 13 11:41:40 2014
New Revision: 1610169
URL: http://svn.apache.org/r1610169
Log:
Update LICENSE file, adding YUI and JQuery information.
Modified:
roller/trunk/LICENSE.txt
Modified: roller/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/LICENSE.txt?rev=1610169&r1=1610168&r2=1610169&view=diff
==============================================================================
--- roller/trunk/LICENSE.txt (original)
+++ roller/trunk/LICENSE.txt Sun Jul 13 11:41:40 2014
@@ -3,7 +3,17 @@ LICENSE.txt - Roller licensing terms
Roller is licensed under the Apache License Version 2.0, see below.
Roller also uses the JDOM XML parser library, licensed under the
-terms of the JDOM license (a BSD-like license listed at end of this file).
+terms of the JDOM license (an Apache-like license listed at end of this file).
+
+Roller includes the YUI (BSD license) and JQuery (MIT) front end libraries:
+
+YUI 3.17.2 (build 9c3c78e)
+Copyright 2014 Yahoo! Inc. All rights reserved.
+Licensed under the BSD License.
+http://yuilibrary.com/license/
+
+jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license
+
And Roller contains some snippets of code from the Blojsom and Pebble
blog servers, which are both licensed under the terms of the BSD license
@@ -216,9 +226,12 @@ blog servers, which are both licensed un
-------------------------------------------------------------------------------
- The JDOM License
- Copyright (C) 2000-2002 Jason Hunter & Brett McLaughlin.
- All rights reserved.
+The JDOM license
+
+/*--
+
+ Copyright (C) 2000-2012 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
@@ -228,30 +241,30 @@ blog servers, which are both licensed un
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
+ 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 <license AT jdom DOT org>.
+ 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 <pm AT jdom DOT org>.
+ 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
+ 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
+ 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
+ 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
@@ -261,8 +274,12 @@ blog servers, which are both licensed un
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/>.
+ 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/>.
+
+ */
+
+
