LICENSE.txt | 17 +- make/build-test.xml | 9 +- make/build.xml | 2 +- make/gluegen-cpptasks-base.xml | 70 +++- make/jogamp-androidtasks.xml | 11 +- make/lib/TestJarsInJar.jar | Bin 0 -> 2256 bytes make/lib/gluegen-cpptasks-android-armv7.xml | 21 +- make/scripts/java-win32.bat | 4 +- make/scripts/java-win64.bat | 4 +- make/scripts/make.gluegen.all.linux-x86_64.sh | 1 + make/scripts/make.gluegen.all.macosx.sh | 2 +- make/scripts/make.gluegen.all.win32.bat | 4 +- make/scripts/make.gluegen.all.win64.bat | 4 +- make/scripts/runtest.sh | 28 +- make/scripts/setenv-build-jogl-x86.sh | 7 + make/scripts/setenv-build-jogl-x86_64.sh | 9 + .../com/jogamp/common/jvm/JNILibLoaderBase.java | 140 +++++- src/java/com/jogamp/common/nio/AbstractBuffer.java | 3 +- src/java/com/jogamp/common/nio/Buffers.java | 5 + src/java/com/jogamp/common/nio/PointerBuffer.java | 3 +- .../com/jogamp/common/os/DynamicLibraryBundle.java | 27 +- .../com/jogamp/common/os/MachineDescription.java | 8 +- src/java/com/jogamp/common/os/NativeLibrary.java | 124 +++-- src/java/com/jogamp/common/os/Platform.java | 229 ++++++++- src/java/com/jogamp/common/util/IOUtil.java | 197 +++++++- src/java/com/jogamp/common/util/JarUtil.java | 526 ++++++++++++++++++++ .../com/jogamp/common/util/ReflectionUtil.java | 128 ++++-- src/java/com/jogamp/common/util/RunnableTask.java | 60 ++- src/java/com/jogamp/common/util/VersionNumber.java | 41 +- .../com/jogamp/common/util/cache/TempCacheReg.java | 37 ++ .../jogamp/common/util/cache/TempFileCache.java | 522 +++++++++++++++++++ .../com/jogamp/common/util/cache/TempJarCache.java | 396 +++++++++++++++ src/java/com/jogamp/common/util/locks/Lock.java | 11 +- .../com/jogamp/common/util/locks/LockFactory.java | 61 +++ .../jogamp/common/util/locks/RecursiveLock.java | 215 +-------- .../com/jogamp/gluegen/CMethodBindingEmitter.java | 30 +- src/java/com/jogamp/gluegen/JavaEmitter.java | 2 +- src/java/com/jogamp/gluegen/JavaType.java | 38 +- src/java/com/jogamp/gluegen/package.html | 3 +- .../jogamp/gluegen/runtime/NativeLibLoader.java | 119 ----- src/java/jogamp/common/Debug.java | 15 +- src/java/{com => }/jogamp/common/jvm/JVMUtil.java | 17 +- .../common/os/MachineDescriptionRuntime.java | 28 +- .../jogamp/common/util/locks/LockDebugUtil.java | 80 +++ .../locks/RecursiveLockImpl01CompleteFair.java | 312 ++++++++++++ .../util/locks/RecursiveLockImpl01Unfairish.java | 263 ++++++++++ .../common/util/locks/RecursiveLockImplJava5.java | 81 +++ .../util/locks/SingletonInstanceServerSocket.java | 9 +- src/junit/com/jogamp/common/nio/BuffersTest.java | 4 +- .../jogamp/common/nio/CachedBufferFactoryTest.java | 4 +- .../nio/TestBuffersFloatDoubleConversion.java | 4 +- .../jogamp/common/nio/TestPointerBufferEndian.java | 10 +- .../common/nio/TestStructAccessorEndian.java | 3 +- .../com/jogamp/common/util/TestArrayHashSet01.java | 4 +- src/junit/com/jogamp/common/util/TestIOUtil01.java | 3 +- .../jogamp/common/util/TestIteratorIndexCORE.java | 3 +- src/junit/com/jogamp/common/util/TestJarUtil.java | 170 +++++++ .../com/jogamp/common/util/TestPlatform01.java | 22 +- .../com/jogamp/common/util/TestRunnableTask01.java | 105 ++++ .../com/jogamp/common/util/TestTempJarCache.java | 258 ++++++++++ .../com/jogamp/common/util/TestVersionInfo.java | 4 +- .../common/util/locks/TestRecursiveLock01.java | 465 ++++++++++++++--- .../gluegen/test/junit/generation/BaseClass.java | 47 ++- .../test/junit/generation/BindingJNILibLoader.java | 4 +- .../generation/Test1p2ProcAddressEmitter.java | 16 +- .../jogamp/gluegen/test/junit/generation/test1.c | 15 +- .../jogamp/gluegen/test/junit/generation/test1.h | 7 +- src/junit/com/jogamp/junit/util/JunitTracer.java | 76 +++ src/native/common/{JVM_Tool.c => JVMUtil.c} | 4 +- test/TestJarsInJar/ClassInJar0.java | 17 + test/TestJarsInJar/ClassInJar1.java | 10 + test/TestJarsInJar/ClassInJar2.java | 10 + test/TestJarsInJar/MANIFEST.MF | 4 + test/TestJarsInJar/make.sh | 16 + .../android.ndk.env-4.4.3-androideabi.armv7-a.sh | 1 + 75 files changed, 4518 insertions(+), 691 deletions(-) create mode 100644 make/lib/TestJarsInJar.jar create mode 100644 src/java/com/jogamp/common/util/JarUtil.java create mode 100644 src/java/com/jogamp/common/util/cache/TempCacheReg.java create mode 100644 src/java/com/jogamp/common/util/cache/TempFileCache.java create mode 100644 src/java/com/jogamp/common/util/cache/TempJarCache.java create mode 100644 src/java/com/jogamp/common/util/locks/LockFactory.java delete mode 100755 src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java rename src/java/{com => }/jogamp/common/jvm/JVMUtil.java (92%) create mode 100644 src/java/jogamp/common/util/locks/LockDebugUtil.java create mode 100644 src/java/jogamp/common/util/locks/RecursiveLockImpl01CompleteFair.java create mode 100644 src/java/jogamp/common/util/locks/RecursiveLockImpl01Unfairish.java create mode 100644 src/java/jogamp/common/util/locks/RecursiveLockImplJava5.java create mode 100644 src/junit/com/jogamp/common/util/TestJarUtil.java create mode 100644 src/junit/com/jogamp/common/util/TestRunnableTask01.java create mode 100644 src/junit/com/jogamp/common/util/TestTempJarCache.java create mode 100644 src/junit/com/jogamp/junit/util/JunitTracer.java rename src/native/common/{JVM_Tool.c => JVMUtil.c} (94%) create mode 100644 test/TestJarsInJar/ClassInJar0.java create mode 100644 test/TestJarsInJar/ClassInJar1.java create mode 100644 test/TestJarsInJar/ClassInJar2.java create mode 100644 test/TestJarsInJar/MANIFEST.MF create mode 100644 test/TestJarsInJar/make.sh