You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2014/11/27 15:43:34 UTC
[1/2] marmotta git commit: refresh dependencies (squebi,requirejs)
Repository: marmotta
Updated Branches:
refs/heads/develop 43d5235c4 -> adea1f5a4
refresh dependencies (squebi,requirejs)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/56a05e75
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/56a05e75
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/56a05e75
Branch: refs/heads/develop
Commit: 56a05e757383c91b74ecc5fbc41e8140aaff9a63
Parents: 9b4e0a8
Author: tkurz <tk...@apache.org>
Authored: Thu Nov 27 15:15:03 2014 +0100
Committer: tkurz <tk...@apache.org>
Committed: Thu Nov 27 15:15:03 2014 +0100
----------------------------------------------------------------------
.../src/main/resources/installer/LICENSE.txt | 100 ++-----------------
.../src/main/webapp/META-INF/LICENSE | 98 ++----------------
2 files changed, 15 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/56a05e75/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 5da062e..c906585 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
+ * RequireJS Webjar, https://github.com/webjars/requirejs
Apache Marmotta subcomponents:
@@ -2407,8 +2408,13 @@ 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/
+
the requirejs, requirejs-plugins, jquery, angular, bootstrap, codemirror,
- fontawsome, angular-ui-codemirror, angular-bootstrap and require-css
+ angular-ui-codemirror, angular-bootstrap, angular-bootstrap,
+ angular-local-storage and require-css
packaged in the squebi webjar (https://github.com/tkurz/squebi)
the MIT License applies:
@@ -2476,97 +2482,7 @@ For the Sgvizler webjar,
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 fontawesome desktop and webfont files
- packaged in the squebi webjar (https://github.com/tkurz/squebi)
-
- -----------------------------------------------------------
- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
- -----------------------------------------------------------
-
- PREAMBLE
- The goals of the Open Font License (OFL) are to stimulate worldwide
- development of collaborative font projects, to support the font creation
- efforts of academic and linguistic communities, and to provide a free and
- open framework in which fonts may be shared and improved in partnership
- with others.
-
- The OFL allows the licensed fonts to be used, studied, modified and
- redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded,
- redistributed and/or sold with any software provided that any reserved
- names are not used by derivative works. The fonts and derivatives,
- however, cannot be released under any other type of license. The
- requirement for fonts to remain under this license does not apply
- to any document created using the fonts or their derivatives.
-
- DEFINITIONS
- "Font Software" refers to the set of files released by the Copyright
- Holder(s) under this license and clearly marked as such. This may
- include source files, build scripts and documentation.
-
- "Reserved Font Name" refers to any names specified as such after the
- copyright statement(s).
-
- "Original Version" refers to the collection of Font Software components as
- distributed by the Copyright Holder(s).
-
- "Modified Version" refers to any derivative made by adding to, deleting,
- or substituting -- in part or in whole -- any of the components of the
- Original Version, by changing formats or by porting the Font Software to a
- new environment.
-
- "Author" refers to any designer, engineer, programmer, technical
- writer or other person who contributed to the Font Software.
-
- PERMISSION & CONDITIONS
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the Font Software, to use, study, copy, merge, embed, modify,
- redistribute, and sell modified and unmodified copies of the Font
- Software, subject to the following conditions:
-
- 1) Neither the Font Software nor any of its individual components,
- in Original or Modified Versions, may be sold by itself.
-
- 2) Original or Modified Versions of the Font Software may be bundled,
- redistributed and/or sold with any software, provided that each copy
- contains the above copyright notice and this license. These can be
- included either as stand-alone text files, human-readable headers or
- in the appropriate machine-readable metadata fields within text or
- binary files as long as those fields can be easily viewed by the user.
-
- 3) No Modified Version of the Font Software may use the Reserved Font
- Name(s) unless explicit written permission is granted by the corresponding
- Copyright Holder. This restriction only applies to the primary font name as
- presented to the users.
-
- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- Software shall not be used to promote, endorse or advertise any
- Modified Version, except to acknowledge the contribution(s) of the
- Copyright Holder(s) and the Author(s) or with their explicit written
- permission.
-
- 5) The Font Software, modified or unmodified, in part or in whole,
- must be distributed entirely under this license, and must not be
- distributed under any other license. The requirement for fonts to
- remain under this license does not apply to any document created
- using the Font Software.
-
- TERMINATION
- This license becomes null and void if any of the above conditions are
- not met.
-
- DISCLAIMER
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- OTHER DEALINGS IN THE FONT SOFTWARE.
+ SOFTWARE.
Apache Marmotta code subcomponents:
===================================
http://git-wip-us.apache.org/repos/asf/marmotta/blob/56a05e75/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 6ebac84..9225f92 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
+ * RequireJS Webjar, https://github.com/webjars/requirejs
Apache Marmotta subcomponents:
@@ -2404,8 +2405,13 @@ 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/
+
the requirejs, requirejs-plugins, jquery, angular, bootstrap, codemirror,
- fontawsome, angular-ui-codemirror, angular-bootstrap and require-css
+ angular-ui-codemirror, angular-bootstrap, angular-bootstrap,
+ angular-local-storage and require-css
packaged in the squebi webjar (https://github.com/tkurz/squebi)
the MIT License applies:
@@ -2475,96 +2481,6 @@ For the Sgvizler webjar,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-For the fontawesome desktop and webfont files
- packaged in the squebi webjar (https://github.com/tkurz/squebi)
-
- -----------------------------------------------------------
- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
- -----------------------------------------------------------
-
- PREAMBLE
- The goals of the Open Font License (OFL) are to stimulate worldwide
- development of collaborative font projects, to support the font creation
- efforts of academic and linguistic communities, and to provide a free and
- open framework in which fonts may be shared and improved in partnership
- with others.
-
- The OFL allows the licensed fonts to be used, studied, modified and
- redistributed freely as long as they are not sold by themselves. The
- fonts, including any derivative works, can be bundled, embedded,
- redistributed and/or sold with any software provided that any reserved
- names are not used by derivative works. The fonts and derivatives,
- however, cannot be released under any other type of license. The
- requirement for fonts to remain under this license does not apply
- to any document created using the fonts or their derivatives.
-
- DEFINITIONS
- "Font Software" refers to the set of files released by the Copyright
- Holder(s) under this license and clearly marked as such. This may
- include source files, build scripts and documentation.
-
- "Reserved Font Name" refers to any names specified as such after the
- copyright statement(s).
-
- "Original Version" refers to the collection of Font Software components as
- distributed by the Copyright Holder(s).
-
- "Modified Version" refers to any derivative made by adding to, deleting,
- or substituting -- in part or in whole -- any of the components of the
- Original Version, by changing formats or by porting the Font Software to a
- new environment.
-
- "Author" refers to any designer, engineer, programmer, technical
- writer or other person who contributed to the Font Software.
-
- PERMISSION & CONDITIONS
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the Font Software, to use, study, copy, merge, embed, modify,
- redistribute, and sell modified and unmodified copies of the Font
- Software, subject to the following conditions:
-
- 1) Neither the Font Software nor any of its individual components,
- in Original or Modified Versions, may be sold by itself.
-
- 2) Original or Modified Versions of the Font Software may be bundled,
- redistributed and/or sold with any software, provided that each copy
- contains the above copyright notice and this license. These can be
- included either as stand-alone text files, human-readable headers or
- in the appropriate machine-readable metadata fields within text or
- binary files as long as those fields can be easily viewed by the user.
-
- 3) No Modified Version of the Font Software may use the Reserved Font
- Name(s) unless explicit written permission is granted by the corresponding
- Copyright Holder. This restriction only applies to the primary font name as
- presented to the users.
-
- 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- Software shall not be used to promote, endorse or advertise any
- Modified Version, except to acknowledge the contribution(s) of the
- Copyright Holder(s) and the Author(s) or with their explicit written
- permission.
-
- 5) The Font Software, modified or unmodified, in part or in whole,
- must be distributed entirely under this license, and must not be
- distributed under any other license. The requirement for fonts to
- remain under this license does not apply to any document created
- using the Font Software.
-
- TERMINATION
- This license becomes null and void if any of the above conditions are
- not met.
-
- DISCLAIMER
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- OTHER DEALINGS IN THE FONT SOFTWARE.
-
Apache Marmotta code subcomponents:
===================================
[2/2] marmotta git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/marmotta into develop
Posted by tk...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/adea1f5a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/adea1f5a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/adea1f5a
Branch: refs/heads/develop
Commit: adea1f5a431b0ec3768c07915d3da12cf092bc45
Parents: 56a05e7 43d5235
Author: tkurz <tk...@apache.org>
Authored: Thu Nov 27 15:43:19 2014 +0100
Committer: tkurz <tk...@apache.org>
Committed: Thu Nov 27 15:43:19 2014 +0100
----------------------------------------------------------------------
.../src/main/webapp/META-INF/jetty-web.xml | 30 ----------
.../src/main/webapp/WEB-INF/jetty-web.xml | 24 +++++---
.../marmotta/commons/vocabulary/SPARQL_SD.java | 2 +-
.../src/main/webapp/META-INF/jetty-web.xml | 27 ---------
.../src/main/webapp/WEB-INF/jetty-web.xml | 24 +++++---
libraries/kiwi/kiwi-loader/pom.xml | 5 ++
.../core/startup/MarmottaStartupService.java | 61 ++++++++++----------
.../marmotta/platform/core/util/CDIContext.java | 10 ++--
.../platform/core/test/base/JettyMarmotta.java | 7 ++-
pom.xml | 6 ++
10 files changed, 81 insertions(+), 115 deletions(-)
----------------------------------------------------------------------