MARMOTTA-477 Added Licenses for squebi and in the libraries bundled in the 
squebi webjar (kudos to tkurz):
- squebi: AL2
- libraries: MIT
- fonts: SIL OFL 1.1


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7f8f6f27
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7f8f6f27
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7f8f6f27

Branch: refs/heads/master
Commit: 7f8f6f27792449a7937bc9bc0aad9eb60941861d
Parents: 090273c
Author: Jakob Frank <[email protected]>
Authored: Wed Apr 2 11:33:15 2014 +0200
Committer: Jakob Frank <[email protected]>
Committed: Wed Apr 2 11:35:56 2014 +0200

----------------------------------------------------------------------
 .../src/main/resources/installer/LICENSE.txt    | 110 +++++++++++++++++--
 .../src/main/webapp/META-INF/LICENSE            |  95 +++++++++++++++-
 2 files changed, 196 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/7f8f6f27/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
----------------------------------------------------------------------
diff --git 
a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt 
b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
index a4b1e74..9027fb4 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
@@ -227,6 +227,7 @@ The Apache License, Version 2.0, also applies to the 
following subcomponents:
  * Java Property Utility, http://software.dzhuvinov.com/
  * XML Commons External Components XML APIs, 
http://xml.apache.org/commons/components/external/
  * Timeknots Webjar, https://github.com/webjars/timeknots
+ * Squebi Webjar, https://github.com/tkurz/squebi
  
 
 Apache Marmotta subcomponents:
@@ -2406,6 +2407,10 @@ For the angularjs webjar,
         Copyright 2014 jQuery Foundation and other contributors
         http://jquery.com/
 
+    the requirejs, requirejs-plugins, jquery, angular, bootstrap, codemirror,
+            fontawsome, angular-ui-codemirror, angular-bootstrap and 
require-css
+        packaged in the squebi webjar (https://github.com/tkurz/squebi)
+
     the MIT License applies:
 
     Permission is hereby granted, free of charge, to any person obtaining a 
copy
@@ -2458,12 +2463,12 @@ For the Sgvizler webjar,
 
     Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.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:
+    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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
@@ -2473,7 +2478,95 @@ For the Sgvizler webjar,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
     SOFTWARE. 
 
-
+For the fontawesome desktop and webfont files
+    packaged in the squebi webjar (https://github.com/tkurz/squebi)
+
+    -----------------------------------------------------------
+    SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+    -----------------------------------------------------------
+
+    PREAMBLE
+    The goals of the Open Font License (OFL) are to stimulate worldwide
+    development of collaborative font projects, to support the font creation
+    efforts of academic and linguistic communities, and to provide a free and
+    open framework in which fonts may be shared and improved in partnership
+    with others.
+
+    The OFL allows the licensed fonts to be used, studied, modified and
+    redistributed freely as long as they are not sold by themselves. The
+    fonts, including any derivative works, can be bundled, embedded,
+    redistributed and/or sold with any software provided that any reserved
+    names are not used by derivative works. The fonts and derivatives,
+    however, cannot be released under any other type of license. The
+    requirement for fonts to remain under this license does not apply
+    to any document created using the fonts or their derivatives.
+
+    DEFINITIONS
+    "Font Software" refers to the set of files released by the Copyright
+    Holder(s) under this license and clearly marked as such. This may
+    include source files, build scripts and documentation.
+
+    "Reserved Font Name" refers to any names specified as such after the
+    copyright statement(s).
+
+    "Original Version" refers to the collection of Font Software components as
+    distributed by the Copyright Holder(s).
+
+    "Modified Version" refers to any derivative made by adding to, deleting,
+    or substituting -- in part or in whole -- any of the components of the
+    Original Version, by changing formats or by porting the Font Software to a
+    new environment.
+
+    "Author" refers to any designer, engineer, programmer, technical
+    writer or other person who contributed to the Font Software.
+
+    PERMISSION & CONDITIONS
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of the Font Software, to use, study, copy, merge, embed, modify,
+    redistribute, and sell modified and unmodified copies of the Font
+    Software, subject to the following conditions:
+
+    1) Neither the Font Software nor any of its individual components,
+    in Original or Modified Versions, may be sold by itself.
+
+    2) Original or Modified Versions of the Font Software may be bundled,
+    redistributed and/or sold with any software, provided that each copy
+    contains the above copyright notice and this license. These can be
+    included either as stand-alone text files, human-readable headers or
+    in the appropriate machine-readable metadata fields within text or
+    binary files as long as those fields can be easily viewed by the user.
+
+    3) No Modified Version of the Font Software may use the Reserved Font
+    Name(s) unless explicit written permission is granted by the corresponding
+    Copyright Holder. This restriction only applies to the primary font name as
+    presented to the users.
+
+    4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+    Software shall not be used to promote, endorse or advertise any
+    Modified Version, except to acknowledge the contribution(s) of the
+    Copyright Holder(s) and the Author(s) or with their explicit written
+    permission.
+
+    5) The Font Software, modified or unmodified, in part or in whole,
+    must be distributed entirely under this license, and must not be
+    distributed under any other license. The requirement for fonts to
+    remain under this license does not apply to any document created
+    using the Font Software.
+
+    TERMINATION
+    This license becomes null and void if any of the above conditions are
+    not met.
+
+    DISCLAIMER
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
 
 Apache Marmotta code subcomponents:
 ===================================
@@ -2534,7 +2627,8 @@ For the ROME component,
 
 For the Javolution component,
 
-    located at commons/marmotta-commons/src/ext/java
+    located at:
+        commons/marmotta-commons/src/ext/java
 
    Javolution - Java(tm) Solution for Real-Time and Embedded Systems
    Copyright (c) 2012, Javolution (http://javolution.org/)

http://git-wip-us.apache.org/repos/asf/marmotta/blob/7f8f6f27/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE 
b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
index 7baf7a1..36916e7 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
@@ -224,6 +224,7 @@ The Apache License, Version 2.0, also applies to the 
following subcomponents:
  * Java Property Utility, http://software.dzhuvinov.com/
  * XML Commons External Components XML APIs, 
http://xml.apache.org/commons/components/external/
  * Timeknots Webjar, https://github.com/webjars/timeknots
+ * Squebi Webjar, https://github.com/tkurz/squebi
 
 
 Apache Marmotta subcomponents:
@@ -2403,6 +2404,10 @@ For the angularjs webjar,
         Copyright 2014 jQuery Foundation and other contributors
         http://jquery.com/
 
+    the requirejs, requirejs-plugins, jquery, angular, bootstrap, codemirror,
+            fontawsome, angular-ui-codemirror, angular-bootstrap and 
require-css
+        packaged in the squebi webjar (https://github.com/tkurz/squebi)
+
     the MIT License applies:
 
     Permission is hereby granted, free of charge, to any person obtaining a 
copy
@@ -2470,7 +2475,95 @@ For the Sgvizler webjar,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
THE
     SOFTWARE.
 
-
+For the fontawesome desktop and webfont files
+    packaged in the squebi webjar (https://github.com/tkurz/squebi)
+
+    -----------------------------------------------------------
+    SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+    -----------------------------------------------------------
+
+    PREAMBLE
+    The goals of the Open Font License (OFL) are to stimulate worldwide
+    development of collaborative font projects, to support the font creation
+    efforts of academic and linguistic communities, and to provide a free and
+    open framework in which fonts may be shared and improved in partnership
+    with others.
+
+    The OFL allows the licensed fonts to be used, studied, modified and
+    redistributed freely as long as they are not sold by themselves. The
+    fonts, including any derivative works, can be bundled, embedded,
+    redistributed and/or sold with any software provided that any reserved
+    names are not used by derivative works. The fonts and derivatives,
+    however, cannot be released under any other type of license. The
+    requirement for fonts to remain under this license does not apply
+    to any document created using the fonts or their derivatives.
+
+    DEFINITIONS
+    "Font Software" refers to the set of files released by the Copyright
+    Holder(s) under this license and clearly marked as such. This may
+    include source files, build scripts and documentation.
+
+    "Reserved Font Name" refers to any names specified as such after the
+    copyright statement(s).
+
+    "Original Version" refers to the collection of Font Software components as
+    distributed by the Copyright Holder(s).
+
+    "Modified Version" refers to any derivative made by adding to, deleting,
+    or substituting -- in part or in whole -- any of the components of the
+    Original Version, by changing formats or by porting the Font Software to a
+    new environment.
+
+    "Author" refers to any designer, engineer, programmer, technical
+    writer or other person who contributed to the Font Software.
+
+    PERMISSION & CONDITIONS
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of the Font Software, to use, study, copy, merge, embed, modify,
+    redistribute, and sell modified and unmodified copies of the Font
+    Software, subject to the following conditions:
+
+    1) Neither the Font Software nor any of its individual components,
+    in Original or Modified Versions, may be sold by itself.
+
+    2) Original or Modified Versions of the Font Software may be bundled,
+    redistributed and/or sold with any software, provided that each copy
+    contains the above copyright notice and this license. These can be
+    included either as stand-alone text files, human-readable headers or
+    in the appropriate machine-readable metadata fields within text or
+    binary files as long as those fields can be easily viewed by the user.
+
+    3) No Modified Version of the Font Software may use the Reserved Font
+    Name(s) unless explicit written permission is granted by the corresponding
+    Copyright Holder. This restriction only applies to the primary font name as
+    presented to the users.
+
+    4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+    Software shall not be used to promote, endorse or advertise any
+    Modified Version, except to acknowledge the contribution(s) of the
+    Copyright Holder(s) and the Author(s) or with their explicit written
+    permission.
+
+    5) The Font Software, modified or unmodified, in part or in whole,
+    must be distributed entirely under this license, and must not be
+    distributed under any other license. The requirement for fonts to
+    remain under this license does not apply to any document created
+    using the Font Software.
+
+    TERMINATION
+    This license becomes null and void if any of the above conditions are
+    not met.
+
+    DISCLAIMER
+    THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+    OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+    COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+    INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+    DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+    OTHER DEALINGS IN THE FONT SOFTWARE.
 
 Apache Marmotta code subcomponents:
 ===================================

Reply via email to