Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unify JNI Library Loading into JNILibLoaderBase and use it for the gl…
…uegen-rt native lib as well - removed redundance - move proper JNLPAppletLauncher custom libloader code into JNILibLoaderBase - prepares for new JAR temp cache ..
- Loading branch information
Showing
10 changed files
with
104 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/java/com/jogamp/gluegen/runtime/GlueGenJNILibLoader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright (c) 2006 Sun Microsystems, Inc. All Rights Reserved. | ||
* Copyright (c) 2011 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: | ||
* | ||
* - Redistribution of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* | ||
* - Redistribution 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 Sun Microsystems, Inc. or the names of | ||
* contributors may be used to endorse or promote products derived from | ||
* this software without specific prior written permission. | ||
* | ||
* 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. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR | ||
* ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR | ||
* DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN 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 THIS SOFTWARE, EVEN IF | ||
* SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | ||
* | ||
* You acknowledge that this software is not designed or intended for use | ||
* in the design, construction, operation or maintenance of any nuclear | ||
* facility. | ||
* | ||
* Sun gratefully acknowledges that this software was originally authored | ||
* and developed by Kenneth Bradley Russell and Christopher John Kline. | ||
*/ | ||
|
||
package com.jogamp.gluegen.runtime; | ||
|
||
import java.security.*; | ||
|
||
import com.jogamp.common.jvm.JNILibLoaderBase; | ||
|
||
/** Class providing control over whether GlueGen loads the native code | ||
associated with the NativeLibrary implementation. Alternative app | ||
launchers such as those running within applets may want to disable | ||
this default loading behavior and load the native code via another | ||
(manual) mechanism. */ | ||
public class GlueGenJNILibLoader extends JNILibLoaderBase { | ||
|
||
public static void loadGlueGenRT() { | ||
AccessController.doPrivileged(new PrivilegedAction<Object>() { | ||
public Object run() { | ||
loadLibrary("gluegen-rt", false); | ||
return null; | ||
} | ||
}); | ||
} | ||
} |
120 changes: 0 additions & 120 deletions
120
src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters