You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/09 13:20:14 UTC
[14/15] git commit: updated LICENSE and NOTICE files
updated LICENSE and NOTICE files
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/84011103
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/84011103
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/84011103
Branch: refs/heads/develop
Commit: 840111038ea1538a73cdabf6bd040bcc9f61bd4b
Parents: e60b1a9a
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 9 13:19:28 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 9 13:19:28 2013 +0200
----------------------------------------------------------------------
NOTICE.txt | 1 -
.../src/main/resources/installer/LICENSE.txt | 31 ++++++++++++++++++++
.../src/main/resources/installer/NOTICE.txt | 3 ++
.../src/main/webapp/META-INF/LICENSE | 31 ++++++++++++++++++++
.../src/main/webapp/META-INF/NOTICE | 3 ++
5 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/84011103/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 4c9d58f..544564f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -120,7 +120,6 @@ of the javolution library. Javolution has copyright (c) 2012, Javolution and
is licensed under BSD license. The original source code is available at
http://javolution.org/
-
The module commons/sesame-tools-rio-rss contains source code from the
orphaned ROME project. ROME has copyright 2004 Sun Microsystems, Inc.
and copyright 2011 The ROME Team, and is licensed under Apache License 2.0.
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/84011103/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 4a0bf89..9e10bdc 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt
@@ -2692,6 +2692,37 @@ For the JSONLD-Java component,
THE POSSIBILITY OF SUCH DAMAGE.
+For the marmotta-commons component,
+
+ 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/)
+ All rights reserved.
+
+ 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.
+
+ 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 OWNER 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.
+
+
Apache Marmotta 3rd party data files:
====================================
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/84011103/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
index 4f1eabe..f88874c 100644
--- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
+++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt
@@ -302,3 +302,6 @@ This product also includes the following third-party components:
Copyright (c) 2011 Ben Fortuna
+* Javolution, http://javolution.org/
+
+ Copyright (c) 2012 Javolution
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/84011103/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 9631d61..28c0c4f 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
@@ -2689,6 +2689,37 @@ For the JSONLD-Java component,
THE POSSIBILITY OF SUCH DAMAGE.
+For the marmotta-commons component,
+
+ 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/)
+ All rights reserved.
+
+ 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.
+
+ 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 OWNER 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.
+
+
Apache Marmotta 3rd party data files:
====================================
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/84011103/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
index 8ecf0d1..cf429e7 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE
@@ -259,3 +259,6 @@ This product also includes the following third-party components:
Copyright (c) 2011 Ben Fortuna
+* Javolution, http://javolution.org/
+
+ Copyright (c) 2012 Javolution