You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/02 03:21:17 UTC
[06/50] [abbrv] incubator-edgent git commit: LICENSE tweaks for
re-addition of d3.legend.js to repo
LICENSE tweaks for re-addition of d3.legend.js to repo
- fix file path in source-release LICENSE
- retain URL to original source (to which the MIT license really
applies) in the LICENSE files
- add the source URL to modified d3.legend.js to make the origin clear
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/907b4e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/907b4e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/907b4e93
Branch: refs/heads/develop
Commit: 907b4e93f06cab8344bc9e49406b0e0b7c57d45c
Parents: 2320506
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Oct 24 08:40:37 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Oct 24 08:40:37 2017 -0400
----------------------------------------------------------------------
LICENSE | 4 +++-
console/server/src/main/remote-resources/META-INF/LICENSE | 1 +
console/servlets/src/main/remote-resources/META-INF/LICENSE | 1 +
console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ffa5058..b56042a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,7 +210,9 @@ conditions of the following licenses.
This product bundles d3-legend which is available under a separate license.
-console/servlets/src/main/webapp/js/ext/d3.legend.js
+console/servlets/src/main/webapp/js/ext/d3-legend/d3.legend.js
+https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
+With Edgent specific modifications.
License type: MIT
Copyright (c) 2012 ziggy.jonsson.nyc@gmail.com
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/server/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/server/src/main/remote-resources/META-INF/LICENSE b/console/server/src/main/remote-resources/META-INF/LICENSE
index 044c03e..8d0e1a0 100644
--- a/console/server/src/main/remote-resources/META-INF/LICENSE
+++ b/console/server/src/main/remote-resources/META-INF/LICENSE
@@ -23,6 +23,7 @@ jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
d3.legend.js (included inside the resources/servlets.war!/js/ext/d3.legend/d3.legend.js)
+ https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/servlets/src/main/remote-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/remote-resources/META-INF/LICENSE b/console/servlets/src/main/remote-resources/META-INF/LICENSE
index 8573e96..29d3c2e 100644
--- a/console/servlets/src/main/remote-resources/META-INF/LICENSE
+++ b/console/servlets/src/main/remote-resources/META-INF/LICENSE
@@ -23,6 +23,7 @@ jquery-ui (org.webjars:jquery-ui:1.11.4)
For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
d3.legend.js (src/main/webapp/js/ext/d3.legend/d3.legend.js)
+ https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
With Edgent specific modifications.
For details, see META-INF/licenses/d3.legend-MIT.txt.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/907b4e93/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
----------------------------------------------------------------------
diff --git a/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
index b225804..79c3c43 100644
--- a/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
+++ b/console/servlets/src/main/webapp/js/ext/d3.legend/d3.legend.js
@@ -2,6 +2,8 @@
// (C) 2012 ziggy.jonsson.nyc@gmail.com
// MIT licence
+// Edgent modified from https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js
+
(function() {
d3.legend = function(g, chartSvg, pItems, legendTitle) {
g.each(function() {