MARMOTTA-321: updated license files with the webjar changes in MARMOTTA-416, MARMOTTA-468
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/93cd20a2 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/93cd20a2 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/93cd20a2 Branch: refs/heads/develop Commit: 93cd20a25b253f6fe3d203d0b48f70a97ccb6f47 Parents: c4efc81 Author: Jakob Frank <[email protected]> Authored: Mon Mar 17 11:57:13 2014 +0100 Committer: Jakob Frank <[email protected]> Committed: Mon Mar 17 11:57:13 2014 +0100 ---------------------------------------------------------------------- LICENSE.txt | 85 -------------------- .../src/main/resources/installer/LICENSE.txt | 60 +++----------- 2 files changed, 13 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/93cd20a2/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 7779dd8..9e657aa 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -211,64 +211,6 @@ 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 D3.js component, - - located at: - extras/webjars/sgvizler/src/main/resources/lib/ - - Copyright (c) 2013 Michael Bostock, http://d3js.org - - 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. - - * The name Michael Bostock may not 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 MICHAEL BOSTOCK 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 Dracula Graph Library component, - - located at: - extras/webjars/sgvizler/src/main/resources/lib/ - - Copyright (c) 2013 Johann Philipp Strathausen, http://www.graphdracula.net - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - For the strftime component, located at: @@ -362,33 +304,6 @@ For the Prototype component, SOFTWARE. -For the Sgvizler component, - - located at: - extras/webjars/sgvizler/src/main/resources/ - - Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - - Apache Marmotta 3rd party source code: ===================================== http://git-wip-us.apache.org/repos/asf/marmotta/blob/93cd20a2/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 ac64adc..47d8139 100644 --- a/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt +++ b/launchers/marmotta-installer/src/main/resources/installer/LICENSE.txt @@ -2342,19 +2342,7 @@ For the CodeMirror component, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Apache Marmotta code subcomponents: -=================================== - -The Apache Marmotta project includes the code of 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 D3.js component, - - located at: - extras/webjars/sgvizler/src/main/resources/lib/ +For the D3js webjar, Copyright (c) 2013 Michael Bostock, http://d3js.org @@ -2382,13 +2370,9 @@ For the D3.js component, 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 Sgvizler webjar, -For the Dracula Graph Library component, - - located at: - extras/webjars/sgvizler/src/main/resources/lib/ - - Copyright (c) 2013 Johann Philipp Strathausen, http://www.graphdracula.net + Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in @@ -2406,9 +2390,18 @@ For the Dracula Graph Library component, AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. + SOFTWARE. + +Apache Marmotta code subcomponents: +=================================== + +The Apache Marmotta project includes the code of 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, located at: @@ -2501,33 +2494,6 @@ For the Prototype component, SOFTWARE. -For the Sgvizler component, - - located at: - extras/webjars/sgvizler/src/main/resources/ - - Copyright (c) 2011 Martin G. Skjæveland, http://sgvizler.googlecode.com - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - - Apache Marmotta 3rd party source code: =====================================
