Merge branch 'master' into newt_display_unkey_thread

1 files changed, 52 insertions, 39 deletions

diff --git a/LICENSE.txt b/LICENSE.txt
index 4fadc202c..5584bf389 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,45 @@
-JOGL is released under the BSD license. The full license terms follow:
+JOGL as a whole may be used under the terms of the New BSD 3-clause license,
+which is the common denominator of the following used 5 BSD licenses.
+
+L.1) The JOGL source tree contains code from the JogAmp Community
+     which is covered by the Simplified BSD 2-clause license:
+
+   Copyright 2010 JogAmp Community. All rights reserved.
+  
+   Redistribution and use in source and binary forms, with or without modification, are
+   permitted provided that the following conditions are met:
+   
+      1. Redistributions of source code must retain the above copyright notice, this list of
+         conditions and the following disclaimer.
+   
+      2. 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.
+   
+   THIS SOFTWARE IS PROVIDED BY JogAmp Community ``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 JogAmp Community 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.
+   
+   The views and conclusions contained in the software and documentation are those of the
+   authors and should not be interpreted as representing official policies, either expressed
+   or implied, of JogAmp Community.
+
+   You can address the JogAmp Community via:
+       Web                http://jogamp.org/
+       Forum/Mailinglist  http://jogamp.762907.n3.nabble.com/
+       JogAmp Channel     server: conference.jabber.org room: jogamp
+       Repository         http://jogamp.org/git/
+       Email              mediastream _at_ jogamp _dot_ org
+
+
+L.2) The JOGL source tree contains code from Sun Microsystems, Inc. 
+     which is covered by the New BSD 3-clause license:
 
    Copyright (c) 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
  
@@ -34,15 +75,13 @@ JOGL is released under the BSD license. The full license terms follow:
    in the design, construction, operation or maintenance of any nuclear
    facility.
 
-The JOGL source tree contains code ported from the OpenGL sample
-implementation by Silicon Graphics, Inc. This code is licensed under
-the SGI Free Software License B (Sun is redistributing the modified code 
-under a slightly modified, alternative license, which is described two
-paragraphs below after "NOTE:"):
+L.3) The JOGL source tree contains code ported from the OpenGL sample
+     implementation by Silicon Graphics, Inc. This code is licensed under
+     the SGI Free Software License B, Version 2.0
 
    License Applicability. Except to the extent portions of this file are
    made subject to an alternative license as permitted in the SGI Free
-   Software License B, Version 1.1 (the "License"), the contents of this
+   Software License B, Version 2.0 (the "License"), the contents of this
    file are subject only to the provisions of the License. You may not use
    this file except in compliance with the License. You may obtain a copy
    of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
@@ -56,35 +95,8 @@ paragraphs below after "NOTE:"):
    CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
    PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
 
-   NOTE:  The Original Code (as defined below) has been licensed to Sun 
-   Microsystems, Inc. ("Sun") under the SGI Free Software License B 
-   (Version 1.1), shown above ("SGI License").   Pursuant to Section  
-   3.2(3) of the SGI License, Sun is distributing the Covered Code to 
-   you under an alternative license ("Alternative License").  This 
-   Alternative License includes all of the provisions of the SGI License 
-   except that Section 2.2 and 11 are omitted.  Any differences between 
-   the Alternative License and the SGI License are offered solely by Sun 
-   and not by SGI.
-   
-   Original Code. The Original Code is: OpenGL Sample Implementation,
-   Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-   Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-   Copyright in any portions created by third parties is as indicated
-   elsewhere herein. All Rights Reserved.
-   
-   Additional Notice Provisions: The application programming interfaces
-   established by SGI in conjunction with the Original Code are The
-   OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-   April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-   1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-   Window System(R) (Version 1.3), released October 19, 1998. This software
-   was created using the OpenGL(R) version 1.2.1 Sample Implementation
-   published by SGI, but has not been independently verified as being
-   compliant with the OpenGL(R) version 1.2.1 Specification.
-
-
-The JOGL source tree contains code from the LWJGL project which is
-similarly covered by the BSD license:
+L.4) The JOGL source tree contains code from the LWJGL project which is
+     similarly covered by the New BSD 3-clause license:
 
    Copyright (c) 2002-2004 LWJGL Project
    All rights reserved.
@@ -116,9 +128,9 @@ similarly covered by the BSD license:
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The JOGL source tree also contains a Java port of Brian Paul's Tile
-Rendering library, used with permission of the author under the BSD
-license instead of the original LGPL:
+L.5) The JOGL source tree also contains a Java port of Brian Paul's Tile
+     Rendering library, used with permission of the author under the 
+     New BSD 3-clause license instead of the original LGPL:
 
    Copyright (c) 1997-2005 Brian Paul. All Rights Reserved.
  
@@ -150,3 +162,4 @@ license instead of the original LGPL:
    REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
    INABILITY TO USE THIS SOFTWARE, EVEN IF THE COPYRIGHT HOLDERS OR
    CONTRIBUTORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+