Removed LICENSE entry for LDP testsuite - no more datafiles from the LDP WG included.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/294abe7d Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/294abe7d Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/294abe7d Branch: refs/heads/develop Commit: 294abe7da8262efcf2d6838fc49c783c7b4428b2 Parents: 9f53b80 Author: Jakob Frank <[email protected]> Authored: Fri Dec 12 12:37:29 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Fri Dec 12 12:41:55 2014 +0100 ---------------------------------------------------------------------- LICENSE.txt | 100 +++++-------------------------------------------------- 1 file changed, 9 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/294abe7d/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index a11f8ca..8eb93a4 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -206,10 +206,10 @@ Apache Marmotta subcomponents: ============================= -The Apache Marmotta project includes a number of subcomponents (libraries) from -external projects with separate copyright notices and license terms. Your use of -the code for the these subcomponents is subject to the terms and conditions of the -following licenses. +The Apache Marmotta project includes a number of subcomponents +(libraries) from external projects with separate copyright notices +and license terms. Your use of the code for the these subcomponents is +subject to the terms and conditions of the following licenses. For the strftime component, @@ -245,11 +245,11 @@ For the strftime component, Apache Marmotta 3rd party source code: ===================================== -Due some restrictions (artifacts availability, custom patches, etc.), the Apache -Marmotta project directly includes some code of a number of subcomponents from -external projects with separate copyright notices and license terms. Your use of -the code for the these subcomponents is subject to the terms and conditions of -the following licenses. +Due some restrictions (artifacts availability, custom patches, etc.), +the Apache Marmotta project directly includes some code of a number of +subcomponents from external projects with separate copyright notices +and license terms. Your use of the code for the these subcomponents is +subject to the terms and conditions of the following licenses. For the ROME component, @@ -654,85 +654,3 @@ For the geonames data-dump this trademark restriction does not form part of this License. Creative Commons may be contacted at http://creativecommons.org/. - -For the Linked Data Platform Test Cases data file - - located at: - platform/marmotta-ldp/src/test/resources/testsuite/ - - This file contains the Turtle serialization of the Test Cases in RDFa - from https://dvcs.w3.org/hg/ldpwg/raw-file/default/Test%20Cases/LDP%20Test%20Cases.html - (cached on April 2, 2014). - - Copyright (c) 2014 W3C (MIT, ERCIM, Keio, Beihang), All Rights Reserved. - - W3C DOCUMENT LICENSE - - Public documents on the W3C site are provided by the copyright holders under - the following license. - - License - - By using and/or copying this document, or the W3C document from which - this statement is linked, you (the licensee) agree that you have read, - understood, and will comply with the following terms and conditions: - - Permission to copy, and distribute the contents of this document, or - the W3C document from which this statement is linked, in any medium - for any purpose and without fee or royalty is hereby granted, provided - that you include the following on ALL copies of the document, or portions - thereof, that you use: - - * A link or URL to the original W3C document. - - * The pre-existing copyright notice of the original author, or if it - doesn't exist, a notice (hypertext is preferred, but a textual - representation is permitted) of the form: "Copyright © [$date-of-document] - World Wide Web Consortium, (Massachusetts Institute of Technology, European - Research Consortium for Informatics and Mathematics, Keio University, Beihang). - All Rights Reserved. http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231"; - - * If it exists, the STATUS of the W3C document. - - When space permits, inclusion of the full text of this NOTICE should be - provided. We request that authorship attribution be provided in any software, - documents, or other items or products that you create pursuant to the - implementation of the contents of this document, or any portion thereof. - - No right to create modifications or derivatives of W3C documents is granted - pursuant to this license. However, if additional requirements (documented in - the Copyright FAQ) are satisfied, the right to create modifications or - derivatives is sometimes granted by the W3C to individuals complying with - those requirements. - - Disclaimers - - THIS DOCUMENT IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS - OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR TITLE; - THAT THE CONTENTS OF THE DOCUMENT ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE - IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. - - COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR - CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT OR THE PERFORMANCE - OR IMPLEMENTATION OF THE CONTENTS THEREOF. - - The name and trademarks of copyright holders may NOT be used in advertising - or publicity pertaining to this document or its contents without specific, - written prior permission. Title to copyright in this document will at all - times remain with copyright holders. - - Notes - - This version: http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231 - This formulation of W3C's notice and license became active on December 31 2002. - This version removes the copyright ownership notice such that this license can - be used with materials other than those owned by the W3C, moves information on - style sheets, DTDs, and schemas to the Copyright FAQ, reflects that ERCIM is - now a host of the W3C, includes references to this specific dated version of - the license, and removes the ambiguous grant of "use". See the older formulation - for the policy prior to this date. Please see our Copyright FAQ for common - questions about using materials from our site, such as the translating or - annotating specifications. -
