Repository: incubator-edgent Updated Branches: refs/heads/release1.0.0 49384a5fe -> 68c722c9c
[Edgent-272] source: conform to license¬ice standards Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/50d637e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/50d637e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/50d637e5 Branch: refs/heads/release1.0.0 Commit: 50d637e5f9ff0a6f17a60fe707fd384d08cb3573 Parents: a0fcd31 Author: Dale LaBossiere <[email protected]> Authored: Tue Nov 8 16:55:30 2016 -0500 Committer: Dale LaBossiere <[email protected]> Committed: Tue Nov 8 16:55:30 2016 -0500 ---------------------------------------------------------------------- LICENSE | 61 +++++++++++++++++++++++++++++++++++++++++-- NOTICE | 33 +++++++++++++++++++++++ console/servlets/LICENSE | 31 ---------------------- console/servlets/README | 22 ++++++++++++++++ 4 files changed, 114 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/50d637e5/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 4f0e108..a79ba52 100644 --- a/LICENSE +++ b/LICENSE @@ -200,5 +200,62 @@ See the License for the specific language governing permissions and limitations under the License. - ====================================== - This product contains content covered by MIT and "BSD 3 Clause" licenses. See console/servlets/LICENSE. +====================================== +This product contains content covered by other licenses as follows + +====================================== +console/servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom +console/servlets/webapp_content/js/ext/d3.legend.js +License type: MIT + + 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.min.js +console/servlets/webapp_content/js/ext/sankey_edgent.js +License type: BSD 3-Clause license + + 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. + +====================================== + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/50d637e5/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 9ddbaa5..3db7f48 100644 --- a/NOTICE +++ b/NOTICE @@ -9,3 +9,36 @@ 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 [email protected] + +====================================== +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/50d637e5/console/servlets/LICENSE ---------------------------------------------------------------------- diff --git a/console/servlets/LICENSE b/console/servlets/LICENSE deleted file mode 100644 index 44687a9..0000000 --- a/console/servlets/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -This product contains content covered by MIT/BSD-3-Clause licenses. -The files under servlets/webapp_content/ext are: - -d3.legend.js: -Obtained from: https://github.com/jieter/d3-legend/blob/master/d3.legend.js -License type: MIT license -License: https://opensource.org/licenses/MIT - - -d3.min.js: -Obtained from: https://github.com/d3/d3/releases/tag/v3.5.9 -License type: BSD license -License: https://github.com/d3/d3/blob/master/LICENSE - -sankey_edgent.js : -Originally obtained sankey.js from: https://github.com/d3/d3-sankey -Modified it and renamed it to sankey_edgent.js -License type: BSD license -License: https://github.com/d3/d3-sankey/blob/master/LICENSE - -jquery-ui.min.js (located in jquery-ui-1.11.4.custom): -Obtained from: http://jqueryui.com (select 'Custom Download') -License type: MIT license -License: https://github.com/jquery/jquery-ui/blob/master/LICENSE.txt -All of the css files were objtained from the same url: http://jqueryui.com - -jquery.js (located in jquery-ui-1.11.4.custom/external/jquery/): -Obtained from: https://code.jquery.com/jquery/ -License type:MIT -License: https://github.com/jquery/jquery/blob/master/LICENSE.txt - http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/50d637e5/console/servlets/README ---------------------------------------------------------------------- diff --git a/console/servlets/README b/console/servlets/README new file mode 100644 index 0000000..7c44a09 --- /dev/null +++ b/console/servlets/README @@ -0,0 +1,22 @@ +This component includes external content. + +The external content's license and notices are incorporated into the +top level LICENSE and NOTICE files. + +The origin of the content is as follows: + +servlets/webapp_content/js/ext/d3.legend.js: +Obtained from: https://github.com/jieter/d3-legend/blob/master/d3.legend.js + +servlets/webapp_content/js/ext/d3.min.js: +Obtained from: https://github.com/d3/d3/releases/tag/v3.5.9 + +servlets/webapp_content/js/ext/sankey_edgent.js: +Originally obtained sankey.js from: https://github.com/d3/d3-sankey +Modified it and renamed it to sankey_edgent.js + +servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom: +Obtained from: http://jqueryui.com (select 'Custom Download') + +servlets/webapp_content/js/ext/jquery-ui-1.11.4.custom/external/jquery/jquery.js: +Obtained from: https://code.jquery.com/jquery/
