MARMOTTA-510: Updated License&Notice for new dependencies: * JodaTime * JsonSmart
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/dc7fcb58 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/dc7fcb58 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/dc7fcb58 Branch: refs/heads/master Commit: dc7fcb58c3545d9192022773696b6f6e0eed39ac Parents: f47513c Author: Jakob Frank <[email protected]> Authored: Fri Nov 28 13:55:39 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Tue Dec 2 09:17:18 2014 +0100 ---------------------------------------------------------------------- .../src/main/resources/installer/LICENSE.txt | 2 +- .../src/main/resources/installer/NOTICE.txt | 3 +++ .../src/main/webapp/META-INF/LICENSE | 3 ++- .../marmotta-webapp/src/main/webapp/META-INF/NOTICE | 3 +++ .../ldpath-ldquery-cli/src/main/doc/LICENSE.txt | 3 +++ .../ldpath-ldquery-cli/src/main/doc/NOTICE.txt | 3 +++ .../ldpath-ldquery-cli/src/main/doc/README.txt | 16 ++++++++-------- 7 files changed, 23 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/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 c906585..d420485 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt +++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt @@ -228,6 +228,7 @@ The Apache License, Version 2.0, also applies to the following subcomponents: * 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 + * Joda Time, http://www.joda.org/joda-time/ * RequireJS Webjar, https://github.com/webjars/requirejs @@ -2407,7 +2408,6 @@ For the angularjs webjar, Copyright 2014 jQuery Foundation and other contributors http://jquery.com/ - the requirejs webjar Copyright (c) 2010-2014, The Dojo Foundation. http://www.requirejs.org/ http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/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 13d6c8d..700abfd 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt +++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt @@ -40,3 +40,6 @@ This product also includes some third-party binary components: * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The original source code is available from http://javolution.org + + * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). + The original source code is available from https://github.com/JodaOrg/joda-time http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/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 9225f92..b6fc7ed 100644 --- a/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE +++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/LICENSE @@ -225,6 +225,7 @@ The Apache License, Version 2.0, also applies to the following subcomponents: * 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 + * Joda Time, http://www.joda.org/joda-time/ * RequireJS Webjar, https://github.com/webjars/requirejs @@ -2404,7 +2405,6 @@ For the angularjs webjar, Copyright 2014 jQuery Foundation and other contributors http://jquery.com/ - the requirejs webjar Copyright (c) 2010-2014, The Dojo Foundation. http://www.requirejs.org/ @@ -2481,6 +2481,7 @@ For the Sgvizler webjar, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + Apache Marmotta code subcomponents: =================================== http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/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 01864d1..14f4c00 100644 --- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE +++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE @@ -40,3 +40,6 @@ This product also includes some third-party binary components: * Javolution, Copyright (c) 2012 Javolution, is licensed under BSD license. The original source code is available from http://javolution.org + + * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). + The original source code is available from https://github.com/JodaOrg/joda-time http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/LICENSE.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/LICENSE.txt b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/LICENSE.txt index 104774b..b7bbaad 100644 --- a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/LICENSE.txt +++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/LICENSE.txt @@ -209,8 +209,11 @@ The Apache License, Version 2.0, also applies to the following subcomponents: * Semargl, http://semarglproject.org * Infinispan, http://infinispan.org * JBoss Marshalling, https://github.com/jboss-remoting/jboss-marshalling/ + * JBoss Logging 3, https://github.com/jboss-logging/jboss-logging * JGroups, http://www.jgroups.org * JsonPath, https://github.com/jayway/JsonPath + * Json Smart, https://github.com/netplex/json-smart-v1 + * Joda Time, http://www.joda.org/joda-time/ Apache Marmotta subcomponents: http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt index 16478a2..9d70078 100644 --- a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt +++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/NOTICE.txt @@ -16,3 +16,6 @@ This product also includes some third-party source components: of the Javolution library. Javolution has copyright (c) 2012, Javolution and is licensed under BSD license. The original source code is available from http://javolution.org + + * Joda-Time, which includes software developed by Joda.org (http://www.joda.org/). + The original source code is available from https://github.com/JodaOrg/joda-time http://git-wip-us.apache.org/repos/asf/marmotta/blob/dc7fcb58/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/README.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/README.txt b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/README.txt index 65968b5..177b6f6 100644 --- a/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/README.txt +++ b/libraries/ldpath/ldpath-ldquery-cli/src/main/doc/README.txt @@ -1,5 +1,5 @@ -LDPath Linked Data Backend -========================== +LDPath Linked Data Query CLI +============================ LDPath is a query language designed for querying the Linked Data Cloud. It gives you the possibility to navigate between interlinked resources by @@ -13,7 +13,7 @@ providers (currently Facebook, YouTube, Vimeo, Wikipedia). To get an overview over the available command line options, run: -java -jar ldpath-${project.version}.jar +java -jar ldquery-${project.version}.jar 1. Basic Usage @@ -24,7 +24,7 @@ For the basic usage, you need to provide the URI of a Linked Data resource rdfs:label). The following query would give you the Spanish label for Salzburg: -java -jar ldpath-${project.version}.jar \ +java -jar ldquery-${project.version}.jar \ -context http://dbpedia.org/resource/Salzburg \ -path "rdfs:label[@es]" @@ -51,7 +51,7 @@ will retrieve the label, short description, name of the country and names of the types associated with the resource. LDPath programs need to be stored in a file and can be executed using: -java -jar ldpath-${project.version}.jar \ +java -jar ldquery-${project.version}.jar \ -context http://dbpedia.org/resource/Salzburg \ -program <filename> @@ -65,13 +65,13 @@ data resources by mapping their proprietary data structures to RDF, among them Facebook, YouTube, Vimeo and Wikipedia. For example, the label of Salzburg can also be retrieved from Wikipedia: -java -jar ldpath-${project.version}.jar \ +java -jar ldquery-${project.version}.jar \ -context http://en.wikipedia.org/wiki/Salzburg \ -path "dct:title" ... or from Facebook: -java -jar ldpath-${project.version}.jar \ +java -jar ldquery-${project.version}.jar \ -context http://graph.facebook.com/102189213155511 \ -path "dct:title" @@ -89,7 +89,7 @@ locally caching data that has already been retrieved. By default, the cached data will only exist during execution of the query. If you want to create a persistent cache, you can pass a cache directory on the command line: -java -jar ldpath-${project.version}.jar \ +java -jar ldquery-${project.version}.jar \ -store /tmp/ldcache \ -context http://graph.facebook.com/102189213155511 \ -path "dct:title"
