Bring back JOAL (code fixes and project structure)

- Use GlueGen DynamicLibraryBundle
- Fix alGetString
- Proper test/junit structure
- NB project fix
- add artifacts.properties and jar's manifest
- proper ZIP file structure

TODO:
    - check on windows and osx
    - actually hear a sound
    - add jnlp file template
    - joal-demos

5 files changed, 112 insertions, 294 deletions

diff --git a/src/java/com/jogamp/openal/ALFactory.java b/src/java/com/jogamp/openal/ALFactory.java
index f58fe4b..64da325 100644
--- a/src/java/com/jogamp/openal/ALFactory.java
+++ b/src/java/com/jogamp/openal/ALFactory.java
@@ -53,7 +53,9 @@ public class ALFactory {
   private static synchronized void initialize() throws ALException {
     try {
       if (!initialized) {
-        NativeLibLoader.load();
+        if(null == ALImpl.getALProcAddressTable()) {
+            throw new RuntimeException("AL not initialized (ProcAddressTable null)");
+        }
         initialized = true;
       }
     } catch (UnsatisfiedLinkError e) {
diff --git a/src/java/com/jogamp/openal/impl/ALCImpl.java b/src/java/com/jogamp/openal/impl/ALCImpl.java
index 208e64f..75fc47d 100644
--- a/src/java/com/jogamp/openal/impl/ALCImpl.java
+++ b/src/java/com/jogamp/openal/impl/ALCImpl.java
@@ -3,6 +3,7 @@
  */
 package com.jogamp.openal.impl;
 
+import com.jogamp.common.nio.Buffers;
 import com.jogamp.openal.ALException;
 import com.jogamp.openal.ALCdevice;
 import java.io.UnsupportedEncodingException;
@@ -33,6 +34,23 @@ public class ALCImpl extends ALCAbstractImpl {
         }
     }
 
+    /** Entry point (through function pointer) to C language function: <br> <code> const ALCchar *  alcGetString(ALCdevice *  device, ALCenum param); </code>    */
+    public ByteBuffer alcGetStringImpl(ALCdevice device, int param) {
+
+        final long __addr_ = getALCProcAddressTable()._addressof_alcGetString;
+        if (__addr_ == 0) {
+            throw new UnsupportedOperationException("Method \"alcGetStringImpl\" not available");
+        }
+        ByteBuffer _res;
+        _res = dispatch_alcGetStringImpl1(((device == null) ? null : device.getBuffer()), param, __addr_);
+        if (_res == null) {
+            return null;
+        }
+        Buffers.nativeOrder(_res);
+        return _res;
+    }
+    private native java.nio.ByteBuffer dispatch_alcGetStringImpl1(ByteBuffer deviceBuffer, int param, long addr);
+
     /**
      * Fetches the names of the available ALC device specifiers.
      * Equivalent to the C call alcGetString(NULL, ALC_DEVICE_SPECIFIER).
diff --git a/src/java/com/jogamp/openal/impl/ALDynamicLibraryBundleInfo.java b/src/java/com/jogamp/openal/impl/ALDynamicLibraryBundleInfo.java
new file mode 100644
index 0000000..9d41a69
--- /dev/null
+++ b/src/java/com/jogamp/openal/impl/ALDynamicLibraryBundleInfo.java
@@ -0,0 +1,91 @@
+/**
+ * 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.
+ */
+ 
+package com.jogamp.openal.impl;
+
+import com.jogamp.common.os.DynamicLibraryBundleInfo;
+import java.util.*;
+
+public class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInfo  {
+    private static List/*<String>*/ glueLibNames;
+    static {
+        glueLibNames = new ArrayList();
+
+        glueLibNames.add("joal");
+    }
+
+    protected ALDynamicLibraryBundleInfo() {
+    }
+
+    /** FIXME: not default, maybe local ? **/
+    public boolean shallLinkGlobal() { return true; }
+
+    /** default **/
+    public boolean shallLookupGlobal() { return false; }
+
+    public final List/*<String>*/ getGlueLibNames() {
+        return glueLibNames;
+    }
+
+    public List getToolLibNames() {
+        List/*<List>*/ libNamesList = new ArrayList();
+
+        List/*<String>*/ alLibNames = new ArrayList();
+
+        // this is the default AL lib name, according to the spec
+        alLibNames.add("libopenal.so.1"); // unix
+        alLibNames.add("OpenAL32"); // windows
+        alLibNames.add("OpenAL"); // OSX
+
+        // try this one as well, if spec fails
+        alLibNames.add("libOpenAL.so.1");
+        alLibNames.add("libopenal.so");
+        alLibNames.add("libOpenAL.so");
+
+        // last but not least .. the generic one
+        alLibNames.add("openal");
+        alLibNames.add("OpenAL");
+
+        libNamesList.add(alLibNames);
+
+        return libNamesList;
+    }
+
+    public final List getToolGetProcAddressFuncNameList() {
+        List res = new ArrayList();
+        res.add("alGetProcAddress");
+        return res;
+    }
+
+    public final long toolDynamicLookupFunction(long toolGetProcAddressHandle, String funcName) {
+        return ALImpl.alGetProcAddress(toolGetProcAddressHandle, funcName);
+    }
+
+}
+
+
diff --git a/src/java/com/jogamp/openal/impl/ALProcAddressLookup.java b/src/java/com/jogamp/openal/impl/ALProcAddressLookup.java
deleted file mode 100755
index 45718dd..0000000
--- a/src/java/com/jogamp/openal/impl/ALProcAddressLookup.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Copyright (c) 2003-2005 Sun Microsystems, Inc. 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.
- */
-
-package com.jogamp.openal.impl;
-
-import com.jogamp.common.os.DynamicLookupHelper;
-import com.jogamp.common.os.NativeLibrary;
-import java.lang.reflect.Field;
-
-import com.jogamp.openal.*;
-import com.jogamp.gluegen.runtime.*;
-
-/** Helper class for managing OpenAL-related proc address tables. */
-
-public class ALProcAddressLookup {
-
-    private static final ALProcAddressTable alTable;
-    private static final ALCProcAddressTable alcTable;
-
-    private static volatile boolean alTableInitialized = false;
-    private static volatile boolean alcTableInitialized = false;
-
-    private static final DynamicLookup lookup;
-    private static volatile NativeLibrary openAL;
-
-    static {
-        //workaround: map renamed fooImpl back to the real function name
-        FunctionAddressResolver resolver = new FunctionAddressResolver() {
-            public long resolve(String string, DynamicLookupHelper dlh) {
-                if (string.endsWith("Impl")) {
-                    string = string.substring(0, string.length() - 4);
-                }
-                return dlh.dynamicLookupFunction(string);
-            }
-        };
-        alcTable = new ALCProcAddressTable(resolver);
-        alTable = new ALProcAddressTable();
-        lookup = new DynamicLookup();
-    }
-
-  static class DynamicLookup implements DynamicLookupHelper {
-    public long dynamicLookupFunction(String functionName) {
-      // At some point this may require an OpenAL context to be
-      // current as we will actually use alGetProcAddress. Since
-      // this routine is currently broken and there are no
-      // per-context function pointers anyway we could actually do
-      // this work anywhere.
-      if (openAL == null) {
-        // We choose not to search the system path first because we
-        // bundle a very recent version of OpenAL which we would like
-        // to override existing installations
-        openAL = NativeLibrary.open("OpenAL32", "openal", "OpenAL",
-                                    false,
-                                    ALProcAddressLookup.class.getClassLoader());
-        if (openAL == null) {
-          throw new RuntimeException("Unable to find and load OpenAL library");
-        }
-      }
-      return openAL.dynamicLookupFunction(functionName);
-    }
-  }
-  
-  public static void resetALProcAddressTable() {
-    if (!alTableInitialized) {
-      synchronized (ALProcAddressLookup.class) {
-        if (!alTableInitialized) {
-          // At some point this may require an OpenAL context to be
-          // current as we will actually use alGetProcAddress. Since
-          // this routine is currently broken and there are no
-          // per-context function pointers anyway we could actually do
-          // this work anywhere. We should also in theory have
-          // per-ALcontext ALProcAddressTables and per-ALCdevice
-          // ALCProcAddressTables.
-          alTable.reset(lookup);
-
-          // The above only manages to find addresses for the core OpenAL
-          // functions.  The below uses alGetProcAddress() to find the addresses
-          // of extensions such as EFX, just as in the C++ examples of the
-          // OpenAL 1.1 SDK.
-          useALGetProcAddress();
-
-          alTableInitialized = true;
-        }
-      }
-    }
-  }
-
-  public static void resetALCProcAddressTable() {
-    if (!alcTableInitialized) {
-      synchronized (ALProcAddressLookup.class) {
-        if (!alcTableInitialized) {
-          // At some point this may require an OpenAL device to be
-          // created as we will actually use alcGetProcAddress. Since
-          // this routine is currently broken and there are no
-          // per-device function pointers anyway we could actually do
-          // this work anywhere. We should also in theory have
-          // per-ALcontext ALProcAddressTables and per-ALCdevice
-          // ALCProcAddressTables.
-          alcTable.reset(lookup);
-          alcTableInitialized = true;
-        }
-      }
-    }
-  }
-
-  public static ALProcAddressTable getALProcAddressTable() {
-    return alTable;
-  }
-
-  public static ALCProcAddressTable getALCProcAddressTable() {
-    return alcTable;
-  }
-
-
-  /**
-   * Retrieves the values of the OpenAL functions using alGetProcAddress().
-   */
-  private static void useALGetProcAddress() {
-    String addrOfPrefix = "_addressof_";
-    ALImpl al = (ALImpl) ALFactory.getAL();
-
-    Field[] fields = ALProcAddressTable.class.getFields();
-    for (int i = 0; i < fields.length; i++) {
-      Field field = fields[i];
-
-      // Skip non-address fields
-      String fieldname = field.getName();
-      if (!fieldname.startsWith(addrOfPrefix)) {
-        continue;
-      }
-      try {
-        String functionname = fieldname.substring(addrOfPrefix.length());
-        long fieldval = field.getLong(alTable);
-
-        // Skip fields which have already been valued
-        if (fieldval != 0) {
-          continue;
-        }
-
-        // Get the address
-        long procAddressVal = al.alGetProcAddress(functionname);
-        field.setLong(alTable, procAddressVal);
-      }
-      catch (Exception ex) {
-        throw new RuntimeException("Unable to repopulate ALProcAddressTable values", ex);
-      }
-    }
-  }
-}
diff --git a/src/java/com/jogamp/openal/impl/NativeLibLoader.java b/src/java/com/jogamp/openal/impl/NativeLibLoader.java
deleted file mode 100755
index 38e0e69..0000000
--- a/src/java/com/jogamp/openal/impl/NativeLibLoader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2003 Sun Microsystems, Inc. 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.
- */
-
-package com.jogamp.openal.impl;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.*;
-
-import com.jogamp.gluegen.runtime.*;
-
-public class NativeLibLoader {
-  private static volatile boolean loadingEnabled = true;
-  private static volatile boolean didLoading;
-
-  private NativeLibLoader() {}
-
-  public static void disableLoading() {
-    loadingEnabled = false;
-  }
-
-  public static void enableLoading() {
-    loadingEnabled = true;
-  }
-
-  public static void load() {
-    if (!didLoading && loadingEnabled) {
-      synchronized (NativeLibLoader.class) {
-        if (!didLoading && loadingEnabled) {
-          didLoading = true;
-          AccessController.doPrivileged(new PrivilegedAction() {
-              public Object run() {
-                // Workaround for problem in OpenAL32.dll, which is actually
-                // the "wrapper" DLL which looks for real OpenAL
-                // implementations like nvopenal.dll and "*oal.dll".
-                // joal.dll matches this wildcard and a bug in OpenAL32.dll
-                // causes a call through a null function pointer.
-                loadLibraryInternal("joal");
-
-                // Workaround for 4845371.
-                // Make sure the first reference to the JNI GetDirectBufferAddress is done
-                // from a privileged context so the VM's internal class lookups will succeed.
-                // FIXME: need to figure out an appropriate entry point to call for JOAL
-                //          JAWT jawt = new JAWT();
-                //          JAWTFactory.JAWT_GetAWT(jawt);
-
-                return null;
-              }
-            });
-        }
-      }
-    }
-  }
-
-  private static void loadLibraryInternal(String libraryName) {
-    String sunAppletLauncher = System.getProperty("sun.jnlp.applet.launcher");
-    boolean usingJNLPAppletLauncher = Boolean.valueOf(sunAppletLauncher).booleanValue();
-
-    if (usingJNLPAppletLauncher) {
-        try {
-          Class jnlpAppletLauncherClass = Class.forName("org.jdesktop.applet.util.JNLPAppletLauncher");
-          Method jnlpLoadLibraryMethod = jnlpAppletLauncherClass.getDeclaredMethod("loadLibrary", new Class[] { String.class });
-          jnlpLoadLibraryMethod.invoke(null, new Object[] { libraryName });
-        } catch (Exception e) {
-          Throwable t = e;
-          if (t instanceof InvocationTargetException) {
-            t = ((InvocationTargetException) t).getTargetException();
-          }
-          if (t instanceof Error)
-            throw (Error) t;
-          if (t instanceof RuntimeException) {
-            throw (RuntimeException) t;
-          }
-          // Throw UnsatisfiedLinkError for best compatibility with System.loadLibrary()
-          throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e);
-        }
-    } else {
-      System.loadLibrary(libraryName);
-    }
-  }
-}