[2/2] git commit: Updated license and notice files

[ve...@apache.org]

Updated license and notice files


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/1d6e9acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/1d6e9acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/1d6e9acb

Branch: refs/heads/branch-0.4
Commit: 1d6e9acb0844444a65870f5ad3a9bdd5bf9865d5
Parents: 7c6a9e1
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Mon Jan 20 16:48:37 2014 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Mon Jan 20 16:48:37 2014 -0800

----------------------------------------------------------------------
 LICENSE.txt | 105 +++++++++++++++++--------------------------------------
 NOTICE.txt  |  29 ++++-----------
 2 files changed, 38 insertions(+), 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1d6e9acb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 2dc0cea..7fbb494 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1089,88 +1089,47 @@ THE SOFTWARE.
 
 
 ================================
-For the ANTLR libraries:
+For the Bootstrap Library:
 
-Copyright (c) 2003-2008, Terence Parr
-All rights reserved.
+Bootstrap is released under the Apache 2 license and is copyright 2013 Twitter.
+Boiled down to smaller chunks, it can be described with the following conditions.
 
-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 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://getbootstrap.com/getting-started/#license-faqs
 
 
 ================================
-TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC.
-TO DOUG LEA
-Whereas Doug Lea desires to utlized certain Java Software technologies in the util.concurrent
-technology; and
-Whereas Sun Microsystems, Inc. (“Sun”) desires that Doug Lea utilize certain Java Software
-technologies in the util.concurrent technology;
-Therefore the parties agree as follows, effective May 31, 2002:
-“Java Software technologies” means
-classes/java/util/ArrayList.java, and
-classes/java/util/HashMap.java.
-The Java Software technologies are Copyright (c) 1994-2000 Sun Microsystems, Inc. All rights
-reserved.
-Sun hereby grants Doug Lea a non-exclusive, worldwide, non-transferrable license to use,
-reproduce, create derivate works of, and distribute the Java Software and derivative works
-thereof in source and binary forms as part of a larger work, and to sublicense the right to use,
-reproduce and distribute the Java Software and Doug Lea's derivative works as the part of larger
-works through multiple tiers of sublicensees provided that the following conditions are met:
--Neither the name of or trademarks of Sun may be used to endorse or promote products including
-or derived from the Java Software technology without specific prior written permission; and
--Redistributions of source or binary code must contain the above copyright notice, this notice and
-and the following disclaimers:
-This software is provided "AS IS," without a warranty of any kind. ALL EXPRESS OR
-IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
-DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
-DISTRIBUTING THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN
-MICROSYSTEMS, INC. OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
-THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
-SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC. HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-You acknowledge that Software is not designed,licensed or intended for use in the design,
-construction, operation or maintenance of any nuclear facility.
+For the DustJS Library:
 
+Copyright (c) 2010 Aleksander Williams
 
-================================
-Packages cern.colt* , cern.jet*, cern.clhep
+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:
 
-Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+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.
+
+https://github.com/akdubya/dustjs/blob/master/LICENSE
+
+================================
+For the Glyphicons library:
 
-Permission to use, copy, modify, distribute and sell this software and
-its documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation. CERN makes no representations about the suitability
-of this software for any purpose. It is provided "as is" without
-expressed or implied warranty.
+GLYPHICONS FREE are released under the Creative Commons Attribution 3.0
+Unported (CC BY 3.0). The GLYPHICONS FREE can be used both commercially and
+for personal use, but you must always add a link to GLYPHICONS.com in a
+prominent place (e.g. the footer of a website), include the CC-BY license
+and the reference to GLYPHICONS.com on every page using icons.
 
 
 ================================

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1d6e9acb/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 20e5932..3c24c7c 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -40,31 +40,14 @@ HSQLDB License
 This product includes/uses org.json (http://www.json.org/java/index.html),
 Copyright (c) 2002 JSON.org
 
-This product includes/uses JLine (http://jline.sourceforge.net/),
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>.
+This product includes/uses DustJS (https://github.com/akdubya/dustjs/blob/master/LICENSE),
+Copyright (c) 2010 Aleksander Williams
 
-This product includes DataNucleus (http://www.datanucleus.org/)
-Copyright 2008-2008 DataNucleus
+This product includes/uses D3.Js (http://d3js.org/),
+Library released under BSD license. Copyright 2013 Mike Bostock.
 
-This product includes Guava (http://code.google.com/p/guava-libraries/)
-Copyright (C) 2006 Google Inc.
-
-This product includes JavaEWAH (http://code.google.com/p/javaewah/)
-Copyright (C) 2011 Google Inc.
-
-This product includes/uses ANTLR (http://www.antlr.org/),
-Copyright (c) 2003-2008, Terrence Parr.
-
-This product includes/uses Bootstrap (http://twitter.github.com/bootstrap/),
-Copyright (c) 2012 Twitter, Inc.
+This product includes/uses Bootstrap (http://getbootstrap.com/),
+Copyright (c) 2013 Twitter, Inc.
 
 This product includes/uses Glyphicons (http://glyphicons.com/),
 Copyright (c) 2010 - 2012 Jan Kovarík
-
-This product includes/uses concurrent libraris from DOUG LEA
-(http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/sun-u.c.license.pdf)
-
-This product includes/uses packages cern.colt* , cern.jet*, cern.clhep
-Copyright (c) 1999 CERN - European Organization for Nuclear Research.
-(http://acs.lbl.gov/software/colt/license.html)
-