Repository: accumulo Updated Branches: refs/heads/1.5 9d9118d4e -> 298f95fff
ACCUMULO-3990. ADDENDUM include module-specific additions for jar LICENSE/NOTICE Signed-off-by: Josh Elser <els...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/298f95ff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/298f95ff Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/298f95ff Branch: refs/heads/1.5 Commit: 298f95fff18fe7ba9990d271472ba5c976d52f2a Parents: 9d9118d Author: Sean Busbey <bus...@cloudera.com> Authored: Fri Sep 11 00:26:38 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Sep 12 18:17:05 2015 -0400 ---------------------------------------------------------------------- .../main/appended-resources/META-INF/LICENSE | 46 ++++++++++++ .../main/appended-resources/META-INF/LICENSE | 74 ++++++++++++++++++++ .../src/main/appended-resources/META-INF/NOTICE | 9 +++ 3 files changed, 129 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/298f95ff/core/src/main/appended-resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/core/src/main/appended-resources/META-INF/LICENSE b/core/src/main/appended-resources/META-INF/LICENSE new file mode 100644 index 0000000..af566f0 --- /dev/null +++ b/core/src/main/appended-resources/META-INF/LICENSE @@ -0,0 +1,46 @@ +---- + +APACHE ACCUMULO SUBCOMPONENTS: + +The Apache Accumulo project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +This product bundles software from the European Commission project OneLab +(http://www.one-lab.org), + +* BloomFilter.java +* DynamicBloomFilter.java +* Filter.java + +Copyright (c) 2005, European Commission project OneLab under contract 034819 + +available under the following BSD 3-Clause style 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 University Catholique de Louvain - UCL + * nor the names of its 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. + http://git-wip-us.apache.org/repos/asf/accumulo/blob/298f95ff/server/src/main/appended-resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/server/src/main/appended-resources/META-INF/LICENSE b/server/src/main/appended-resources/META-INF/LICENSE new file mode 100644 index 0000000..974cb4b --- /dev/null +++ b/server/src/main/appended-resources/META-INF/LICENSE @@ -0,0 +1,74 @@ +---- + +APACHE ACCUMULO SUBCOMPONENTS: + +The Apache Accumulo project contains subcomponents with separate copyright +notices and license terms. Your use of the source code for the these +subcomponents is subject to the terms and conditions of the following +licenses. + +---- + +This product bundles JQuery + + * Copyright 2011, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2011, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + +Distributed under the MIT License: + +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. + + +---- +This product bundles Flot, + +Copyright (c) 2007-2009 IOLA and Ole Laursen + +Available under the MIT License (see above) + +Flot bundles additional works: + +jquery.pie.js +* Created by Brian Medendorp, June 2009 +* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars + +jquery.flot.resize.js +* Inline dependency: + * jQuery resize event - v1.1 - 3/14/2010 + * http://benalman.com/projects/jquery-resize-plugin/ + * + * Copyright (c) 2010 "Cowboy" Ben Alman + * Dual licensed under the MIT and GPL licenses. + * http://benalman.com/about/license/ + +distributed under the MIT license (see above) + +For details, see + server/src/main/resources/web/flot/ + +---- http://git-wip-us.apache.org/repos/asf/accumulo/blob/298f95ff/server/src/main/appended-resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/server/src/main/appended-resources/META-INF/NOTICE b/server/src/main/appended-resources/META-INF/NOTICE new file mode 100644 index 0000000..a4f1f1a --- /dev/null +++ b/server/src/main/appended-resources/META-INF/NOTICE @@ -0,0 +1,9 @@ +---- + +This product includes the following work from the Apache Thrift project: + +TNonblockingServerSocket.java + +Apache Thrift +Copyright 2006-2010 The Apache Software Foundation. +
