summaryrefslogtreecommitdiffstats
path: root/LICENSE.txt
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-09-07 10:20:12 +0200
committerSven Gothel <[email protected]>2014-09-07 10:20:12 +0200
commit5205e47e8a2e84e793b26305391b1c4f8648597c (patch)
tree2487d359e99ce72f3dfe29f795da6d09f44fe54a /LICENSE.txt
parent0b07f9107c5b033913f5c4cbeb906ae6dafc2d77 (diff)
Bug 1063 - Utilize own Uri and Uri.Encoded class w/ proper encoding and differentiating encoded/decoded variants by type [Part 1]
- Add immutable com.jogamp.common.net.Uri class impl. RFC 2396 w/ encoding of RFC 3986 - Class Uri.Encoded is used to represent encoded parts - IOUtil: Remove unused methods (residing in Uri) and mark others deprecated (will move to Uri) - Adopt usage of Uri: This must be completet in follow-up commits!
Diffstat (limited to 'LICENSE.txt')
-rwxr-xr-xLICENSE.txt28
1 files changed, 27 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 8be18df..ba830c7 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,13 @@
-
The GlueGen source code is mostly licensed under the New BSD 2-clause license,
however it contains other licensed material as well.
+Other licensed material is compatible with the 'New BSD 2-Clause License',
+if not stated otherwise.
+
+'New BSD 2-Clause License' incompatible materials are optional, they are:
+
+ NONE
+
Below you find a detailed list of licenses used in this project.
+++
@@ -131,3 +137,23 @@ L.3) The GlueGen source tree contains CGRAM http://www.antlr.org/grammar/cgram/,
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+A.1) The GlueGen source tree contains code from The Apache Software Foundation
+ which is covered by the Apache License Version 2.0
+
+ Apache Harmony - Open Source Java SE
+ =====================================
+
+ <http://harmony.apache.org/>
+
+ Author: The Apache Software Foundation (http://www.apache.org/).
+
+ Copyright 2006, 2010 The Apache Software Foundation.
+
+ Apache License Version 2.0, January 2004
+ http://www.apache.org/licenses/LICENSE-2.0
+ Or within this repository: doc/licenses/Apache.LICENSE-2.0
+
+ Files:
+ src/java/com/jogamp/common/net/Uri.java
+
+