You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/01/09 14:03:12 UTC

[2/2] git commit: MARMOTTA-321: cleaned up the LICENSE.txt, removed some components no longer used

MARMOTTA-321: cleaned up the LICENSE.txt, removed some components no longer used


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

Branch: refs/heads/develop
Commit: 9fc4a5eb4aec8e1c97fc41fd18e62408eb51ca04
Parents: 39d4e4a
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jan 9 11:53:56 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jan 9 11:53:56 2014 +0100

----------------------------------------------------------------------
 LICENSE.txt                                     | 171 +---------
 .../src/main/resources/installer/LICENSE.txt    | 313 ++++---------------
 .../src/main/doc/LICENSE.txt                    |  41 +--
 3 files changed, 62 insertions(+), 463 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/9fc4a5eb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index d777a04..f08ca02 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -473,7 +473,7 @@ For the SwingBits component,
 For the ROME component,
 
     located at:
-        commons/sesame-tools-rio-rss/src/ext/java/
+        commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/
 
     Copyright (c) 2004 Sun Microsystems, http://rometools.jira.com
     with some minor modifications for Apache Marmotta.
@@ -481,43 +481,7 @@ For the ROME component,
     ROME is provided under the Apache License, version 2.0.
 
 
-For the JSONLD-Java component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/ext/java/
-
-    Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz
-    GmbH, http://github.com/tristan/jsonld-java
-
-    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. Neither the name of the Deutsches Forschungszentrum für Künstliche 
-        Intelligenz GmbH nor the names of its contributors may be used to endorse 
-        or promote products derived from this software without specific prior 
-        written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
-        
-
-For the marmotta-commons component,
+For the Javolution component,
 
     located at commons/marmotta-commons/src/ext/java
 
@@ -556,139 +520,10 @@ of subcomponents from external projects with separate copyright notices and lice
 terms. Your use of the code for the these subcomponents is subject to the terms and 
 conditions of the following licenses.
 
-For the JSON-LD component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/
-
-    Public Domain (Creative Commons Zero license) without copyright, 
-    http://json-ld.org/test-suite
-
-    CC0 1.0 Universal
-
-        CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-        LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-        ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-        INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-        REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-        PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-        THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-        HEREUNDER.
-
-    Statement of Purpose
-
-    The laws of most jurisdictions throughout the world automatically confer
-    exclusive Copyright and Related Rights (defined below) upon the creator
-    and subsequent owner(s) (each and all, an "owner") of an original work of
-    authorship and/or a database (each, a "Work").
-
-    Certain owners wish to permanently relinquish those rights to a Work for
-    the purpose of contributing to a commons of creative, cultural and
-    scientific works ("Commons") that the public can reliably and without fear
-    of later claims of infringement build upon, modify, incorporate in other
-    works, reuse and redistribute as freely as possible in any form whatsoever
-    and for any purposes, including without limitation commercial purposes.
-    These owners may contribute to the Commons to promote the ideal of a free
-    culture and the further production of creative, cultural and scientific
-    works, or to gain reputation or greater distribution for their Work in
-    part through the use and efforts of others.
-
-    For these and/or other purposes and motivations, and without any
-    expectation of additional consideration or compensation, the person
-    associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-    is an owner of Copyright and Related Rights in the Work, voluntarily
-    elects to apply CC0 to the Work and publicly distribute the Work under its
-    terms, with knowledge of his or her Copyright and Related Rights in the
-    Work and the meaning and intended legal effect of CC0 on those rights.
-
-    1. Copyright and Related Rights. A Work made available under CC0 may be
-    protected by copyright and related or neighboring rights ("Copyright and
-    Related Rights"). Copyright and Related Rights include, but are not
-    limited to, the following:
-
-      i. the right to reproduce, adapt, distribute, perform, display,
-         communicate, and translate a Work;
-     ii. moral rights retained by the original author(s) and/or performer(s);
-    iii. publicity and privacy rights pertaining to a person's image or
-         likeness depicted in a Work;
-     iv. rights protecting against unfair competition in regards to a Work,
-         subject to the limitations in paragraph 4(a), below;
-      v. rights protecting the extraction, dissemination, use and reuse of data
-         in a Work;
-     vi. database rights (such as those arising under Directive 96/9/EC of the
-         European Parliament and of the Council of 11 March 1996 on the legal
-         protection of databases, and under any national implementation
-         thereof, including any amended or successor version of such
-         directive); and
-    vii. other similar, equivalent or corresponding rights throughout the
-         world based on applicable law or treaty, and any national
-         implementations thereof.
-
-    2. Waiver. To the greatest extent permitted by, but not in contravention
-    of, applicable law, Affirmer hereby overtly, fully, permanently,
-    irrevocably and unconditionally waives, abandons, and surrenders all of
-    Affirmer's Copyright and Related Rights and associated claims and causes
-    of action, whether now known or unknown (including existing as well as
-    future claims and causes of action), in the Work (i) in all territories
-    worldwide, (ii) for the maximum duration provided by applicable law or
-    treaty (including future time extensions), (iii) in any current or future
-    medium and for any number of copies, and (iv) for any purpose whatsoever,
-    including without limitation commercial, advertising or promotional
-    purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-    member of the public at large and to the detriment of Affirmer's heirs and
-    successors, fully intending that such Waiver shall not be subject to
-    revocation, rescission, cancellation, termination, or any other legal or
-    equitable action to disrupt the quiet enjoyment of the Work by the public
-    as contemplated by Affirmer's express Statement of Purpose.
-
-    3. Public License Fallback. Should any part of the Waiver for any reason
-    be judged legally invalid or ineffective under applicable law, then the
-    Waiver shall be preserved to the maximum extent permitted taking into
-    account Affirmer's express Statement of Purpose. In addition, to the
-    extent the Waiver is so judged Affirmer hereby grants to each affected
-    person a royalty-free, non transferable, non sublicensable, non exclusive,
-    irrevocable and unconditional license to exercise Affirmer's Copyright and
-    Related Rights in the Work (i) in all territories worldwide, (ii) for the
-    maximum duration provided by applicable law or treaty (including future
-    time extensions), (iii) in any current or future medium and for any number
-    of copies, and (iv) for any purpose whatsoever, including without
-    limitation commercial, advertising or promotional purposes (the
-    "License"). The License shall be deemed effective as of the date CC0 was
-    applied by Affirmer to the Work. Should any part of the License for any
-    reason be judged legally invalid or ineffective under applicable law, such
-    partial invalidity or ineffectiveness shall not invalidate the remainder
-    of the License, and in such case Affirmer hereby affirms that he or she
-    will not (i) exercise any of his or her remaining Copyright and Related
-    Rights in the Work or (ii) assert any associated claims and causes of
-    action with respect to the Work, in either case contrary to Affirmer's
-    express Statement of Purpose.
-
-    4. Limitations and Disclaimers.
-
-     a. No trademark or patent rights held by Affirmer are waived, abandoned,
-        surrendered, licensed or otherwise affected by this document.
-     b. Affirmer offers the Work as-is and makes no representations or
-        warranties of any kind concerning the Work, express, implied,
-        statutory or otherwise, including without limitation warranties of
-        title, merchantability, fitness for a particular purpose, non
-        infringement, or the absence of latent or other defects, accuracy, or
-        the present or absence of errors, whether or not discoverable, all to
-        the greatest extent permissible under applicable law.
-     c. Affirmer disclaims responsibility for clearing rights of other persons
-        that may apply to the Work or any use thereof, including without
-        limitation any person's Copyright and Related Rights in the Work.
-        Further, Affirmer disclaims responsibility for obtaining any necessary
-        consents, permissions or other rights required for any use of the
-        Work.
-     d. Affirmer understands and acknowledges that Creative Commons is not a
-        party to this document and has no duty or obligation with respect to
-        this CC0 or use of the Work.
-
-
 For the ical4j component,
 
     located at:
-        commons/sesame-tools-rio-vcard/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/
+        commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/
 
     Copyright (c) 2011 Ben Fortuna, http://ical4j.googlecode.com
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/9fc4a5eb/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 eb2dfca..7dbafbf 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
@@ -2297,6 +2297,52 @@ For the Hamcrest component,
     DAMAGE.
 
 
+For the jQuery component,
+
+    Copyright (c) 2013 jQuery Foundation, 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.
+
+
+For the CodeMirror component,
+
+    Copyright (c) 2013 Marijn Haverbeke, http://codemirror.net
+
+    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.
+
+
 Apache Marmotta code subcomponents:
 ===================================
 
@@ -2308,8 +2354,7 @@ following licenses.
 For the D3.js component,
 
     located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib/
-        platform/marmotta-sparql/src/main/resources/web/admin/sgvizler/0.5/lib/
+        extras/webjars/sgvizler/src/main/resources/lib/
 
     Copyright (c) 2013 Michael Bostock, http://d3js.org
 
@@ -2341,7 +2386,7 @@ For the D3.js component,
 For the Dracula Graph Library component,
 
     located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib/
+        extras/webjars/sgvizler/src/main/resources/lib/
 
     Copyright (c) 2013 Johann Philipp Strathausen, http://www.graphdracula.net
 
@@ -2367,7 +2412,7 @@ For the Dracula Graph Library component,
 For the strftime component,
 
     located at:
-        platform/marmotta-core/src/main/resources/web/public/js/lib
+        extras/webjars/strftime/src/main/resources/
 
     Copyright (c) 2008 Philip S Tellis, http://hacks.bluesmoon.info/strftime
 
@@ -2393,64 +2438,10 @@ For the strftime component,
     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-For the jQuery component,
-
-    located at:
-        platform/marmotta-core/src/main/resources/web/public/js/lib
-
-    Copyright (c) 2013 jQuery Foundation, 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.
-
-
-For the CodeMirror component,
-
-    located at:
-        platform/marmotta-ldpath/src/main/resources/web/cm
-        platform/marmotta-sparql/src/main/resources/web/cm
-        platform/marmotta-sparql/src/main/resources/web/admin/editor/sparql/lib
-
-    Copyright (c) 2013 Marijn Haverbeke, http://codemirror.net
-
-    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.
-
-
 For the D2R Snorql component,
 
     located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql
+        extras/webjars/snorql/src/main/resources/
 
     Copyright (c) 2007 Richard Cyganiak, http://www4.wiwiss.fu-berlin.de/bizer/d2r-server/
     with some minor modifications for Apache Marmotta.
@@ -2461,7 +2452,7 @@ For the D2R Snorql component,
 For the script.aculo.us component,
 
     located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous
+        extras/webjars/snorql/src/main/resources/scriptaculous/
 
     Copyright (c) 2010 Thomas Fuchs, http://script.aculo.us
 
@@ -2487,7 +2478,7 @@ For the script.aculo.us component,
 For the Prototype component,
 
     located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/snorql
+        extras/webjars/snorql/src/main/resources/
 
     Copyright (c) 2010 Sam Stephenson, http://prototypejs.org
 
@@ -2510,37 +2501,10 @@ For the Prototype component,
     SOFTWARE.    
 
 
-For the SPARQL Flint Editor component, 
-
-    located at:
-        platform/marmotta-sparql/src/main/resources/web/admin/editor/
-
-    Copyright (c) 2011 TSO Ltd, http://github.com/TSO-Openup/FlintSparqlEditor
-
-    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.   
-
-
 For the Sgvizler component,
 
     located at:
-        platform/marmotta-core/src/main/resources/web/admin/js/lib
-        platform/marmotta-sparql/src/main/resources/web/admin/sgvizler
+        extras/webjars/sgvizler/src/main/resources/
 
     Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com
 
@@ -2648,7 +2612,7 @@ For the SwingBits component,
 For the ROME component,
 
     located at:
-        commons/sesame-tools-rio-rss/src/ext/java/
+        commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/
 
     Copyright (c) 2004 Sun Microsystems, http://rometools.jira.com
     with some minor modifications for Apache Marmotta.
@@ -2656,43 +2620,7 @@ For the ROME component,
     ROME is provided under the Apache License, version 2.0.
 
 
-For the JSONLD-Java component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/ext/java/
-
-    Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz
-    GmbH, http://github.com/tristan/jsonld-java
-
-    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. Neither the name of the Deutsches Forschungszentrum für Künstliche 
-        Intelligenz GmbH nor the names of its contributors may be used to endorse 
-        or promote products derived from this software without specific prior 
-        written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
-        
-
-For the marmotta-commons component,
+For the Javolution component,
 
     located at commons/marmotta-commons/src/ext/java
 
@@ -2732,139 +2660,10 @@ of subcomponents from external projects with separate copyright notices and lice
 terms. Your use of the code for the these subcomponents is subject to the terms and 
 conditions of the following licenses.
 
-For the JSON-LD component,
-
-    located at:
-        commons/sesame-tools-rio-jsonld/src/test/resources/org/apache/marmotta/commons/sesame/rio/jsonld/
-
-    Public Domain (Creative Commons Zero license) without copyright, 
-    http://json-ld.org/test-suite
-
-    CC0 1.0 Universal
-
-        CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-        LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-        ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-        INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-        REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-        PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-        THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-        HEREUNDER.
-
-    Statement of Purpose
-
-    The laws of most jurisdictions throughout the world automatically confer
-    exclusive Copyright and Related Rights (defined below) upon the creator
-    and subsequent owner(s) (each and all, an "owner") of an original work of
-    authorship and/or a database (each, a "Work").
-
-    Certain owners wish to permanently relinquish those rights to a Work for
-    the purpose of contributing to a commons of creative, cultural and
-    scientific works ("Commons") that the public can reliably and without fear
-    of later claims of infringement build upon, modify, incorporate in other
-    works, reuse and redistribute as freely as possible in any form whatsoever
-    and for any purposes, including without limitation commercial purposes.
-    These owners may contribute to the Commons to promote the ideal of a free
-    culture and the further production of creative, cultural and scientific
-    works, or to gain reputation or greater distribution for their Work in
-    part through the use and efforts of others.
-
-    For these and/or other purposes and motivations, and without any
-    expectation of additional consideration or compensation, the person
-    associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-    is an owner of Copyright and Related Rights in the Work, voluntarily
-    elects to apply CC0 to the Work and publicly distribute the Work under its
-    terms, with knowledge of his or her Copyright and Related Rights in the
-    Work and the meaning and intended legal effect of CC0 on those rights.
-
-    1. Copyright and Related Rights. A Work made available under CC0 may be
-    protected by copyright and related or neighboring rights ("Copyright and
-    Related Rights"). Copyright and Related Rights include, but are not
-    limited to, the following:
-
-      i. the right to reproduce, adapt, distribute, perform, display,
-         communicate, and translate a Work;
-     ii. moral rights retained by the original author(s) and/or performer(s);
-    iii. publicity and privacy rights pertaining to a person's image or
-         likeness depicted in a Work;
-     iv. rights protecting against unfair competition in regards to a Work,
-         subject to the limitations in paragraph 4(a), below;
-      v. rights protecting the extraction, dissemination, use and reuse of data
-         in a Work;
-     vi. database rights (such as those arising under Directive 96/9/EC of the
-         European Parliament and of the Council of 11 March 1996 on the legal
-         protection of databases, and under any national implementation
-         thereof, including any amended or successor version of such
-         directive); and
-    vii. other similar, equivalent or corresponding rights throughout the
-         world based on applicable law or treaty, and any national
-         implementations thereof.
-
-    2. Waiver. To the greatest extent permitted by, but not in contravention
-    of, applicable law, Affirmer hereby overtly, fully, permanently,
-    irrevocably and unconditionally waives, abandons, and surrenders all of
-    Affirmer's Copyright and Related Rights and associated claims and causes
-    of action, whether now known or unknown (including existing as well as
-    future claims and causes of action), in the Work (i) in all territories
-    worldwide, (ii) for the maximum duration provided by applicable law or
-    treaty (including future time extensions), (iii) in any current or future
-    medium and for any number of copies, and (iv) for any purpose whatsoever,
-    including without limitation commercial, advertising or promotional
-    purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-    member of the public at large and to the detriment of Affirmer's heirs and
-    successors, fully intending that such Waiver shall not be subject to
-    revocation, rescission, cancellation, termination, or any other legal or
-    equitable action to disrupt the quiet enjoyment of the Work by the public
-    as contemplated by Affirmer's express Statement of Purpose.
-
-    3. Public License Fallback. Should any part of the Waiver for any reason
-    be judged legally invalid or ineffective under applicable law, then the
-    Waiver shall be preserved to the maximum extent permitted taking into
-    account Affirmer's express Statement of Purpose. In addition, to the
-    extent the Waiver is so judged Affirmer hereby grants to each affected
-    person a royalty-free, non transferable, non sublicensable, non exclusive,
-    irrevocable and unconditional license to exercise Affirmer's Copyright and
-    Related Rights in the Work (i) in all territories worldwide, (ii) for the
-    maximum duration provided by applicable law or treaty (including future
-    time extensions), (iii) in any current or future medium and for any number
-    of copies, and (iv) for any purpose whatsoever, including without
-    limitation commercial, advertising or promotional purposes (the
-    "License"). The License shall be deemed effective as of the date CC0 was
-    applied by Affirmer to the Work. Should any part of the License for any
-    reason be judged legally invalid or ineffective under applicable law, such
-    partial invalidity or ineffectiveness shall not invalidate the remainder
-    of the License, and in such case Affirmer hereby affirms that he or she
-    will not (i) exercise any of his or her remaining Copyright and Related
-    Rights in the Work or (ii) assert any associated claims and causes of
-    action with respect to the Work, in either case contrary to Affirmer's
-    express Statement of Purpose.
-
-    4. Limitations and Disclaimers.
-
-     a. No trademark or patent rights held by Affirmer are waived, abandoned,
-        surrendered, licensed or otherwise affected by this document.
-     b. Affirmer offers the Work as-is and makes no representations or
-        warranties of any kind concerning the Work, express, implied,
-        statutory or otherwise, including without limitation warranties of
-        title, merchantability, fitness for a particular purpose, non
-        infringement, or the absence of latent or other defects, accuracy, or
-        the present or absence of errors, whether or not discoverable, all to
-        the greatest extent permissible under applicable law.
-     c. Affirmer disclaims responsibility for clearing rights of other persons
-        that may apply to the Work or any use thereof, including without
-        limitation any person's Copyright and Related Rights in the Work.
-        Further, Affirmer disclaims responsibility for obtaining any necessary
-        consents, permissions or other rights required for any use of the
-        Work.
-     d. Affirmer understands and acknowledges that Creative Commons is not a
-        party to this document and has no duty or obligation with respect to
-        this CC0 or use of the Work.
-
-
 For the ical4j component,
 
     located at:
-        commons/sesame-tools-rio-vcard/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/
+        commons/marmotta-sesame-tools/marmotta-rio-vcard/src/test/resources/org/apache/marmotta/commons/sesame/rio/vcard/
 
     Copyright (c) 2011 Ben Fortuna, http://ical4j.googlecode.com
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/9fc4a5eb/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
index 6b85159..f7ffa1b 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
@@ -659,7 +659,7 @@ the following licenses.
 For the ROME component,
 
     located at:
-        commons/sesame-tools-rio-rss/src/ext/java/
+        commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/
 
     Copyright (c) 2004 Sun Microsystems, http://rometools.jira.com
     with some minor modifications for Apache Marmotta.
@@ -667,44 +667,10 @@ For the ROME component,
     ROME is provided under the Apache License, version 2.0.
 
 
-For the JSONLD-Java component,
+For the Javolution component,
 
     located at:
-        commons/sesame-tools-rio-jsonld/src/ext/java/
-
-    Copyright (c) 2012, Deutsches Forschungszentrum für Künstliche Intelligenz
-    GmbH, http://github.com/tristan/jsonld-java
-
-    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. Neither the name of the Deutsches Forschungszentrum für Künstliche 
-        Intelligenz GmbH nor the names of its contributors may be used to endorse 
-        or promote products derived from this software without specific prior 
-        written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.
-
-For the Marmotta Commons component,
-
-    located at commons/marmotta-commons/src/ext/java
+        commons/marmotta-commons/src/ext/java
 
    Javolution - Java(tm) Solution for Real-Time and Embedded Systems
    Copyright (c) 2012, Javolution (http://javolution.org/)
@@ -733,4 +699,3 @@ For the Marmotta Commons component,
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-