Repository: marmotta
Updated Branches:
  refs/heads/develop de57f1fcc -> a8055f3e2


MARMOTTA-476: Updated L&N of ldpath-backend-linkeddata


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

Branch: refs/heads/develop
Commit: a8055f3e201867e8d3bbd5a80836f4d72c5b7f58
Parents: c8023a1
Author: Jakob Frank <[email protected]>
Authored: Wed Mar 26 17:25:09 2014 +0100
Committer: Jakob Frank <[email protected]>
Committed: Wed Mar 26 17:29:12 2014 +0100

----------------------------------------------------------------------
 .../src/main/webapp/META-INF/LICENSE            |   3 +-
 .../src/main/doc/LICENSE.txt                    | 157 +++++++++++++------
 2 files changed, 107 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/a8055f3e/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 d0b60cc..7baf7a1 100644
--- a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
+++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE
@@ -2531,7 +2531,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/a8055f3e/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 f7ffa1b..e103479 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
+++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/LICENSE.txt
@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -200,11 +201,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
 The Apache License, Version 2.0, also applies to the following subcomponents:
 
  * Guava, http://guava-libraries.googlecode.com
  * Jackson, http://jackson.codehaus.org
  * Semargl, http://semarglproject.org
+ * Infinispan, http://infinispan.org
+ * JBoss Marshalling, https://github.com/jboss-remoting/jboss-marshalling/
+ * JGroups, http://www.jgroups.org
 
 
 Apache Marmotta subcomponents:
@@ -455,6 +460,59 @@ For the Logback component,
     in any resulting litigation.
 
 
+For the JDOM component,
+
+    Copyright (c) 2012 Jason Hunter & Brett McLaughlin, http://www.jdom.org
+
+    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 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 <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 <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 
+    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 
+    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
+    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.
+
+    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/>.
+
+
+
 For the OneJAR component, 
 
     Copyright (c) 2004-2010 P. Simon Tuffs, http://one-jar.sourceforge.net
@@ -544,59 +602,8 @@ For the Jaxen component,
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-For the JDOM component,
 
-    Copyright (c) 2012 Jason Hunter & Brett McLaughlin, http://www.jdom.org
-
-    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 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 <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 <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 
-    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 
-    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
-    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.
-
-    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/>.
-
-
-For ther JSoup component, 
+For the JSoup component,
 
     Copyright (c) 2013 Jonathan Hedley, http://jsoup.org
 
@@ -646,6 +653,52 @@ For the OpenRDF Sesame component,
     (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 "jsonld-java" component,
+
+    Copyright (c) 2012, Deutsche Forschungszentrum für Künstliche 
Intelligenz GmbH
+    https://github.com/jsonld-java/jsonld-java
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+        * Redistributions of source code must retain the above copyright
+          notice, this list of conditions and the following disclaimer.
+        * 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.
+        * Neither the name of the <organization> 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 <COPYRIGHT HOLDER> 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 JBoss Transaction API,
+
+    Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+
+    The component is subject to the terms of either the GNU
+    General Public License Version 2 only ("GPL") or the Common Development
+    and Distribution License("CDDL") (collectively, the "License"). You
+    may not use this file except in compliance with the License. You can
+    obtain a copy of the License at
+
+        https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    Apache Marmotta elects to include this software in this distribution
+    under the CDDL license.
+
 
 Apache Marmotta 3rd party source code:
 =====================================

Reply via email to