You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2013/12/13 18:14:59 UTC
[15/18] git commit: update LICENSE/NOTICE to assume source-only
distribution
update LICENSE/NOTICE to assume source-only distribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/080cec2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/080cec2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/080cec2d
Branch: refs/heads/master
Commit: 080cec2dcf98ec4b258d0f1c8447ff7a03a4ce96
Parents: 009f924
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Dec 11 10:46:27 2013 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Dec 11 10:46:27 2013 -0500
----------------------------------------------------------------------
LICENSE | 74 +++++++++++++++++++++++++-----------------------------------
NOTICE | 23 -------------------
2 files changed, 31 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/080cec2d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index ff9c5ea..5e54a98 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,48 +203,6 @@
-----------------------------------------------------------------------
-logback License
-
-Logback: the reliable, generic, fast and flexible logging framework.
-Copyright (C) 1999-2012, QOS.ch. All rights reserved.
-
-This program and the accompanying materials are dual-licensed under
-either the terms of the Eclipse Public License v1.0 as published by
-the Eclipse Foundation
-
- or (per the licensee's choosing)
-
-under the terms of the GNU Lesser General Public License version 2.1
-as published by the Free Software Foundation.
-
------------------------------------------------------------------------
-
-slf4j License
-
-Copyright (c) 2004-2013 QOS.ch
-All rights reserved.
-
-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.
-
------------------------------------------------------------------------
-
For jQuery 1.6.2 (storm-core/src/ui/public/js/jquery-1.6.2.min.js)
@@ -294,4 +252,34 @@ 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.
------------------------------------------------------------------------
\ No newline at end of file
+-----------------------------------------------------------------------
+
+For jQuery TableSorter 2.0.5b (storm-core/src/ui/public/js/jquery.tablesorter.min.js)
+
+Copyright (c) 2007 Christian Bach
+Examples and docs at: http://tablesorter.com
+Dual licensed under the MIT and GPL licenses:
+http://www.opensource.org/licenses/mit-license.php
+http://www.gnu.org/licenses/gpl.html
+
+MIT license selected:
+
+Copyright (c) 2007 Christian Bach
+
+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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/080cec2d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0eec476..4f3e648 100644
--- a/NOTICE
+++ b/NOTICE
@@ -11,26 +11,3 @@ Copyright 2011-2013 Nathan Marz
This product includes software developed by Yahoo! Inc. (www.yahoo.com)
Copyright © 2012-2013 Yahoo! Inc. All rights reserved.
-
-YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/).
-Copyright (c) 2008-2010 Andrey Somov
-
-The Netty transport uses Netty
-(https://netty.io/)
-Copyright (C) 2011 The Netty Project
-
-This product uses LMAX Disruptor
-(http://lmax-exchange.github.io/disruptor/)
-Copyright 2011 LMAX Ltd.
-
-This product includes the Jetty HTTP server
-(http://jetty.codehaus.org/jetty/).
-Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-
-JSON (de)serialization by json-simple from
-(http://code.google.com/p/json-simple).
-Copyright (C) 2009 Fang Yidong and Chris Nokleberg
-
-Alternative collection types provided by google-collections from
-http://code.google.com/p/google-collections/.
-Copyright (C) 2007 Google Inc.
\ No newline at end of file