move MIT/BSD license copywrite info out of NOTICE Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ed456111 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ed456111 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ed456111
Branch: refs/heads/release1.0.0 Commit: ed456111d8be7b5a4d0404b327b4b5fc2ca719f6 Parents: 50d637e Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Wed Nov 9 14:54:03 2016 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Wed Nov 9 14:54:03 2016 -0500 ---------------------------------------------------------------------- LICENSE | 68 ++++++++++++++++++++++++++++++++++++++++++++ NOTICE | 33 --------------------- console/servlets/README | 3 +- 3 files changed, 69 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ed456111/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index a79ba52..56211db 100644 --- a/LICENSE +++ b/LICENSE @@ -205,9 +205,43 @@ This product contains content covered by other licenses as follows ====================================== console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom +License type: MIT + + Copyright jQuery Foundation and other contributors, https://jquery.org/ + + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery-ui + + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery + + 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. + +====================================== console/servlets/webapp_content/js/ext/d3.legend.js License type: MIT + Copyright (c) 2012 ziggy.jonsson....@gmail.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 @@ -229,9 +263,43 @@ License type: MIT ====================================== console/servlets/webapp_content/js/ext/d3.min.js +License type: BSD 3-Clause license + + Copyright 2010-2016 Mike Bostock + 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. + + * Neither the name of the author nor the names of contributors may 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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. + +====================================== console/servlets/webapp_content/js/ext/sankey_edgent.js License type: BSD 3-Clause license + Copyright 2015, Mike Bostock + All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ed456111/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 3db7f48..9ddbaa5 100644 --- a/NOTICE +++ b/NOTICE @@ -9,36 +9,3 @@ The Apache Software Foundation (http://www.apache.org/). Portions of this software were developed by IBM Corp. Copyright IBM Corp. 2015, 2016 - -====================================== -console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom - - Copyright jQuery Foundation and other contributors, https://jquery.org/ - - This software consists of voluntary contributions made by many - individuals. For exact contribution history, see the revision history - available at https://github.com/jquery/jquery-ui - - This software consists of voluntary contributions made by many - individuals. For exact contribution history, see the revision history - available at https://github.com/jquery/jquery - -====================================== -console/servlets/webapp_content/js/ext/d3.legend.js - - Copyright (c) 2012 ziggy.jonsson....@gmail.com - -====================================== -console/servlets/webapp_content/js/ext/d3.min.js - - Copyright 2010-2016 Mike Bostock - All rights reserved. - -====================================== -console/servlets/webapp_content/js/ext/sankey_edgent.js - - Copyright 2015, Mike Bostock - All rights reserved. - -====================================== - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ed456111/console/servlets/README ---------------------------------------------------------------------- diff --git a/console/servlets/README b/console/servlets/README index 7c44a09..144b0cd 100644 --- a/console/servlets/README +++ b/console/servlets/README @@ -1,7 +1,6 @@ This component includes external content. -The external content's license and notices are incorporated into the -top level LICENSE and NOTICE files. +The external content's licenses are incorporated into the top level LICENSE file. The origin of the content is as follows: