Updated Branches: refs/heads/develop 4d4b92e3b -> f85163903
fixed MARMOTTA-206, now all NOTICE files should have the standard header formatting Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f8516390 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f8516390 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f8516390 Branch: refs/heads/develop Commit: f851639033d4fc8a6e6d97fbb0ef78baf255a7d6 Parents: 4d4b92e Author: Sergio Fernández <[email protected]> Authored: Mon Apr 22 15:44:30 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Apr 22 15:44:30 2013 +0200 ---------------------------------------------------------------------- NOTICE.txt | 8 +++++--- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/installer/NOTICE.txt | 6 ++++-- .../src/ext/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/webapp/META-INF/NOTICE | 6 ++++-- .../src/main/doc/NOTICE.txt | 6 ++++-- 8 files changed, 21 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index 22f8d89..f092f22 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,6 +1,8 @@ -Apache Marmotta, Copyright 2012-2013 The Apache Software Foundation +Apache Marmotta +Copyright 2012-2013 The Apache Software Foundation -This product includes software developed at The Apache Software Foundation (http://www.apache.org/). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Portions of this software were originally based on the following: @@ -135,4 +137,4 @@ https://github.com/tristan/jsonld-java The test sources for commons/sesame-tools-rio-jsonld contain the data files from the JSON-LD Test Suite. The JSON-LD Test Suite is published as public domain (with a Creative Commons Zero license and without copyright). The -source code is available at https://github.com/json-ld/json-ld.org \ No newline at end of file +source code is available at https://github.com/json-ld/json-ld.org http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE index f566193..3de9434 100644 --- a/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE +++ b/commons/sesame-tools-rio-jsonld/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ Apache Marmotta JSON-LD -Copyright [2012-2013] The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE index e3cb85c..57eae48 100644 --- a/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE +++ b/commons/sesame-tools-rio-rss/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ Apache Marmotta RSS -Copyright [2012-2013] The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/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 3da7e34..4f1eabe 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt +++ b/launchers/marmotta-installer/src/main/resources/installer/NOTICE.txt @@ -1,6 +1,8 @@ -Apache Marmotta Installer, Copyright 2012-2013 The Apache Software Foundation +Apache Marmotta Installer +Copyright 2012-2013 The Apache Software Foundation -This product includes software developed at The Apache Software Foundation (http://www.apache.org). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org). Portions of this software were originally based on the following: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE index 312a0bd..4916965 100644 --- a/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE +++ b/launchers/marmotta-splash/src/ext/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ Apache Marmotta LDPath -Copyright [2012-2013] The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE index 0feb1c2..bb5f700 100644 --- a/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE +++ b/launchers/marmotta-splash/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ Apache Marmotta Splash Screen -Copyright [2012-2013] The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/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 881a91a..8ecf0d1 100644 --- a/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE +++ b/launchers/marmotta-webapp/src/main/webapp/META-INF/NOTICE @@ -1,6 +1,8 @@ -Apache Marmotta Webapp, Copyright 2012-2013 The Apache Software Foundation +Apache Marmotta Webapp +Copyright 2012-2013 The Apache Software Foundation -This product includes software developed at The Apache Software Foundation (http://www.apache.org). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org). Portions of this software were originally based on the following: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f8516390/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt index dc6c538..4ee884f 100644 --- a/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt +++ b/libraries/ldpath/ldpath-backend-linkeddata/src/main/doc/NOTICE.txt @@ -1,6 +1,8 @@ -Apache Marmotta LDPath, Copyright 2012-2013 The Apache Software Foundation +Apache Marmotta LDPath +Copyright 2012-2013 The Apache Software Foundation -This product includes software developed at The Apache Software Foundation (http://www.apache.org). +This product includes software developed at +The Apache Software Foundation (http://www.apache.org). Portions of this software were originally based on the following:
