You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/06/23 08:53:27 UTC
[13/14] incubator-taverna-databundle-viewer git commit: Added BSD-3
license to sankey.js
Added BSD-3 license to sankey.js
From
https://github.com/d3/d3-plugins/blob/master/LICENSE
added additional (c) holders of git commit log from
https://github.com/kunalb/d3-plugins/blob/sankey/sankey/sankey.js
.. in addition to Stefan, who then made vertical_sankey.js
as a derivative.
See discussion in #3
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/50486001
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/50486001
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/50486001
Branch: refs/heads/master
Commit: 50486001b908d6dad30a8515407fb095f6cac84b
Parents: ccf12b3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jun 23 09:45:36 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jun 23 09:52:42 2016 +0100
----------------------------------------------------------------------
LICENSE | 5 +++++
app/assets/javascripts/sankey.js | 30 ++++++++++++++++++++++++++
app/assets/javascripts/vertical_sankey.js | 28 ++++++++++++++++++++++++
3 files changed, 63 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/50486001/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..5eed59f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+---------------------------------------------------
+app/assets/javascripts/sankey.js and vertical_sankey.js
+are licensed as BSD-3 clause
+https://github.com/d3/d3-plugins/blob/master/LICENSE
+---------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/50486001/app/assets/javascripts/sankey.js
----------------------------------------------------------------------
diff --git a/app/assets/javascripts/sankey.js b/app/assets/javascripts/sankey.js
index 7f3580b..693505f 100644
--- a/app/assets/javascripts/sankey.js
+++ b/app/assets/javascripts/sankey.js
@@ -1,3 +1,33 @@
+// Copyright (c) 2012-2015, Michael Bostock,
+// Nathan Malkin, Kunal Bhalla, Claudiu Stefan Padurariu
+// All rights reserved.
+//
+// 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.
+
+// Adapted from https://github.com/kunalb/d3-plugins/blob/sankey/sankey/sankey.js
+
d3.sankey = function() {
var sankey = {},
nodeWidth = 24,
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/blob/50486001/app/assets/javascripts/vertical_sankey.js
----------------------------------------------------------------------
diff --git a/app/assets/javascripts/vertical_sankey.js b/app/assets/javascripts/vertical_sankey.js
index 67fa517..6b29b62 100644
--- a/app/assets/javascripts/vertical_sankey.js
+++ b/app/assets/javascripts/vertical_sankey.js
@@ -1,3 +1,31 @@
+// Copyright (c) 2012-2015, Michael Bostock,
+// Nathan Malkin, Kunal Bhalla, Claudiu Stefan Padurariu
+// All rights reserved.
+//
+// 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.
+
d3.vertical_sankey = function() {
var sankey = {},
nodeWidth = 24,