Skip to content

Commit f0c95bc

Browse files
committed
JOGL and Java 11+ updates
1 parent 1099819 commit f0c95bc

File tree

238 files changed

+3175
-2658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+3175
-2658
lines changed

GDAL_README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ GDAL bundle in the sub-folders. Therefore we recommend one of two options:
4141
1) Place the GDAL libraries in the folder "lib-external/gdal".
4242
2) Place the GDAL libraries in the application's root folder.
4343

44+
When running WWJ with GDAL on Java 9+, WWJ can no longer automatically locate GDAL bundles during startup. Applications
45+
must either place the GDAL libraries in the root folder, or specify a VM argument to the GDAL bundle
46+
(e.g. -Djava.library.path=lib-external/gdal)
4447

4548
Deploying with Java Web Start
4649
------------------------------------------------------------
4750

4851
Instructions for using the WorldWind GDAL libraries with a Java Web Start application are available at
49-
https://goworldwind.org/getting-started/
52+
https://worldwind.arc.nasa.gov/java/get-started/

WorldWind.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module relativePaths="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="false">
3+
<component name="NewModuleRootManager">
44
<output url="file://$MODULE_DIR$/classes" />
55
<output-test url="file://$MODULE_DIR$/testClasses" />
66
<exclude-output />
@@ -12,8 +12,8 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" name="jogl" level="project" />
1615
<orderEntry type="library" name="gdal" level="project" />
1716
<orderEntry type="library" scope="TEST" name="junit4" level="project" />
17+
<orderEntry type="library" name="jogl-gluegen-worldwind231" level="project" />
1818
</component>
1919
</module>

build.xml

Lines changed: 72 additions & 548 deletions
Large diffs are not rendered by default.

gluegen.LICENSE.txt

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
21
The GlueGen source code is mostly licensed under the New BSD 2-clause license,
32
however it contains other licensed material as well.
43

4+
Other licensed material is compatible with the 'New BSD 2-Clause License',
5+
if not stated otherwise.
6+
7+
'New BSD 2-Clause License' incompatible materials are optional, they are:
8+
9+
NONE
10+
511
Below you find a detailed list of licenses used in this project.
612

713
+++
@@ -131,3 +137,46 @@ L.3) The GlueGen source tree contains CGRAM http://www.antlr.org/grammar/cgram/,
131137
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
132138
POSSIBILITY OF SUCH DAMAGE.
133139

140+
A.1) The GlueGen source tree contains code from The Apache Software Foundation
141+
which is covered by the Apache License Version 2.0
142+
143+
Apache Harmony - Open Source Java SE
144+
=====================================
145+
146+
<http://harmony.apache.org/>
147+
148+
Author: The Apache Software Foundation (http://www.apache.org/).
149+
150+
Copyright 2006, 2010 The Apache Software Foundation.
151+
152+
Apache License Version 2.0, January 2004
153+
http://www.apache.org/licenses/LICENSE-2.0
154+
Or within this repository: doc/licenses/Apache.LICENSE-2.0
155+
156+
Files:
157+
- src/java/com/jogamp/common/net/Uri.java
158+
(derived from java.net.URI.Helper and heavily modified)
159+
160+
A.2) The GlueGen source tree contains code from Ben Mankin, a.k.a 'Shevek',
161+
which is covered by the Apache License Version 2.0
162+
163+
JCPP - A Java C Preprocessor
164+
=============================
165+
166+
<http://www.anarres.org/projects/jcpp/>
167+
<https://github.com/shevek/jcpp>
168+
169+
Author: Ben Mankin, a.k.a 'Shevek' (http://www.anarres.org/about/).
170+
171+
Copyright (c) 2007-2008, Shevek
172+
173+
Apache License Version 2.0, January 2004
174+
http://www.apache.org/licenses/LICENSE-2.0
175+
Or within this repository: doc/licenses/Apache.LICENSE-2.0
176+
177+
Files:
178+
The complete git submodule 'jcpp',
179+
which is a patched version of the original mentioned above.
180+
181+
Used for the compile-time module gluegen.jar only.
182+

jogl.LICENSE.txt

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
The JOGL source code is mostly licensed under the New BSD 2-clause license,
1+
The JOGL source code is mostly licensed under the 'New BSD 2-Clause License',
22
however it contains other licensed material as well.
33

4+
Other licensed material is compatible with the 'New BSD 2-Clause License',
5+
if not stated otherwise.
6+
7+
'New BSD 2-Clause License' incompatible materials are optional, they are:
8+
9+
A.7) The JOGL source tree _may_ contain code from Oculus VR, Inc.
10+
which is covered by it's own permissive Oculus VR Rift SDK Software License.
11+
(Optional, see A.7 below for details)
12+
413
Below you find a detailed list of licenses used in this project.
514

615
+++
@@ -246,7 +255,7 @@ A.3) The JOGL source tree contains code from David Schweinsberg
246255

247256
Typecast is a font development environment for OpenType font technology.
248257

249-
<http://typecast.dev.java.net/>
258+
<https://java.net/projects/typecast>
250259

251260
Author: David Schweinsberg
252261

@@ -363,3 +372,59 @@ A.6) The JOGL source tree contains code from Hernan J. Gonzalez and Shawn Hartso
363372
src/jogl/classes/jogamp/opengl/util/pngj/**
364373

365374

375+
A.7) The JOGL source tree _may_ contain code from Oculus VR, Inc.
376+
which is covered by it's own permissive Oculus VR Rift SDK Software License.
377+
378+
This code _can_ be included to produce a binding
379+
and hence support for the Oculus VR Rift.
380+
381+
The code is included _and_ it's build artifacts will be released,
382+
if the git sub-module oculusvr-sdk is included in the jogl source repository
383+
as true for current official JogAmp builds and releases!
384+
385+
If using JogAmp JOGL builds with oculusvr-sdk support,
386+
but the user prefers to _not_ use it for license or other reasons,
387+
the user can simply remove the artifacts 'jar/atomics/oculusvr*jar'.
388+
No other produced artifact is affected.
389+
390+
While the Oculus VR Rift SDK Software License is permissive,
391+
it's differences to the New BSD license shall be mentioned, see below!
392+
393+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
394+
395+
Copyright © 2014 Oculus VR, Inc. All rights reserved.
396+
397+
Oculus VR, Inc. Software Development Kit License Agreement
398+
399+
Human-Readable Summary:
400+
401+
- You are Free to:
402+
403+
- Use, modify, and distribute the Oculus VR Rift SDK in source and binary
404+
form with your applications/software.
405+
406+
- With the Following Restrictions:
407+
408+
- You can only distribute or re-distribute the source code to LibOVR in
409+
whole, not in part.
410+
411+
- Modifications to the Oculus VR Rift SDK in source or binary form must
412+
be shared with Oculus VR.
413+
414+
- If your applications cause health and safety issues, you may lose your
415+
right to use the Oculus VR Rift SDK, including LibOVR.
416+
417+
- The Oculus VR Rift SDK may not be used to interface with unapproved commercial
418+
virtual reality mobile or non-mobile products or hardware.
419+
420+
- This human-readable Summary is not a license. It is simply a convenient
421+
reference for understanding the full Oculus VR Rift SDK License Agreement.
422+
The Summary is written as a user-friendly interface to the full Oculus VR Rift
423+
SDK License below. This Summary itself has no legal value, and its contents do
424+
not appear in the actual license.
425+
426+
Full-length Legal Copy may be found at:
427+
http://www.oculusvr.com/licenses/LICENSE-3.1
428+
http://jogamp.org/git/?p=oculusvr-sdk.git;a=blob;f=LICENSE.txt;hb=HEAD
429+
Or within this repository: oculusvr-sdk/LICENSE.txt
430+

jogl.README.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
Java (TM) Binding for the OpenGL (r) API, version 2.1
1+
2+
Java (TM) Binding for the OpenGL (r) API, version 2.3
23
-----------------------------------------------------------------------------
34

45
This software is licensed as specified in the LICENSE.txt file.
56
You must use this software in accordance with the terms
67
under which the code is licensed.
78

8-
This is build version 2.1.5, based on:
9+
This is build version 2.3.2, based on:
910
branch origin/master
10-
commit ba0dc6462a88ee7512a087deaaca760239915548
11+
commit e794fc40ba723f2fca4ac892e873975fb393e007
1112

12-
Instructions for unzipping Java Binding for the OpenGL API, version 2.1
13+
Instructions for unzipping Java Binding for the OpenGL API, version 2.3
1314
----------------------------------------------------------------------------------
1415

1516
After downloading and unzipping the zip file containing the

0 commit comments

Comments
 (0)