- JAR Manifest: Trusted-Library: true

- Added JAR Manifest to native libs as well,
  otherwise our chain would become mixed code.

- JNLP: Set JogAmp community as vendor ..

- JOGL Windows hack: WindowsWGLContext.java
    - temporary removed the ARB CreateContext path
      for Windows, due to a bug in this implementation.

15 files changed, 88 insertions, 78 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 760200398..a101f5ecb 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1485,26 +1485,13 @@
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.jogl}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.jogl}">
-          <include name="*_es1.${native.library.suffix-cdc}" />
-          <include name="*_es2.${native.library.suffix-cdc}" />
-          <include name="*_gl2es12.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the jogl.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="joglRIversion">
@@ -1717,6 +1704,13 @@
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.jogl}">
+              <include name="*_es1.${native.library.suffix-cdc}" />
+              <include name="*_es2.${native.library.suffix-cdc}" />
+              <include name="*_gl2es12.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
     </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
@@ -1776,6 +1770,11 @@
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
+        <jar manifest="${build.jogl}/tempversion" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.jogl}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
     </target>
 
     <!-- ================================================================== -->
@@ -1910,7 +1909,7 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,jar,c.build.jogl,generate.version.txt" />
+    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,java.compile,c.build.jogl,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 8d1639502..0fd0af79b 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -635,25 +635,13 @@
 
       <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.nativewindow}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.nativewindow}">
-          <include name="*_jvm.${native.library.suffix-cdc}" />
-          <include name="*_x11.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the nativewindow.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="nativewindowRIversion">
@@ -747,6 +735,11 @@
                      includes="${java.part.core}"
                      excludes="${java.part.awt} ${java.part.x11}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.nativewindow}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
         <delete file="tempversion"/>
     </target>
 
@@ -756,6 +749,12 @@
                      includes="${java.part.core}"
                      excludes="${java.part.awt} ${java.part.x11}"/>
         </jar>
+        <jar manifest="tempversion-cdc" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.nativewindow}">
+              <include name="*_jvm.${native.library.suffix-cdc}" />
+              <include name="*_x11.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
 
         <delete file="tempversion-cdc"/>
     </target>
@@ -828,7 +827,7 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,jar,c.build.nativewindow,generate.version.txt" />
+    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,java.compile,c.build.nativewindow,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
diff --git a/make/build-newt.xml b/make/build-newt.xml
index c6d67b85c..8bbfde2ae 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -520,24 +520,13 @@
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.newt}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.newt}">
-          <include name="*.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the newt.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="newtRIversion">
@@ -678,6 +667,11 @@
             <fileset dir="${classes}"
                      includes="${java.part.core}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.newt}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
         <delete file="tempversion"/>
     </target>
 
@@ -686,6 +680,12 @@
             <fileset dir="${classes-cdc}"
                      includes="${java.part.core}"/>
         </jar>
+        <jar manifest="tempversion-cdc" destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.newt}">
+              <include name="*.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
+        <delete file="tempversion-cdc"/>
     </target>
 
     <!-- ================================================================== -->
@@ -756,7 +756,7 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,jar,c.build.newt,generate.version.txt" />
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
diff --git a/make/joglRIversion b/make/joglRIversion
index af9e41d8d..46b64ac0d 100644
--- a/make/joglRIversion
+++ b/make/joglRIversion
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/joglRIversion-cdc b/make/joglRIversion-cdc
index 9bbb525ce..13a782ce0 100644
--- a/make/joglRIversion-cdc
+++ b/make/joglRIversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/joglversion b/make/joglversion
index b65b6e3b6..185236273 100644
--- a/make/joglversion
+++ b/make/joglversion
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/joglversion-cdc b/make/joglversion-cdc
index 5056fbaf3..17a5b918d 100644
--- a/make/joglversion-cdc
+++ b/make/joglversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/nativewindowRIversion b/make/nativewindowRIversion
index 6a29e8a69..b039954ef 100644
--- a/make/nativewindowRIversion
+++ b/make/nativewindowRIversion
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/nativewindowRIversion-cdc b/make/nativewindowRIversion-cdc
index 35ac5136e..4e9760c29 100644
--- a/make/nativewindowRIversion-cdc
+++ b/make/nativewindowRIversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/nativewindowversion b/make/nativewindowversion
index 0180d3368..7872a7656 100644
--- a/make/nativewindowversion
+++ b/make/nativewindowversion
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/nativewindowversion-cdc b/make/nativewindowversion-cdc
index 7213cf6f0..0354559c7 100644
--- a/make/nativewindowversion-cdc
+++ b/make/nativewindowversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment CDC
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/newtRIversion b/make/newtRIversion
index 82cc0c0e9..73d9bc8ac 100644
--- a/make/newtRIversion
+++ b/make/newtRIversion
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/newtRIversion-cdc b/make/newtRIversion-cdc
index 5dcfecad8..a5bdfaeeb 100644
--- a/make/newtRIversion-cdc
+++ b/make/newtRIversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/newtversion b/make/newtversion
index d1734f756..b2985621d 100644
--- a/make/newtversion
+++ b/make/newtversion
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
index 8227a4d42..89ca1db12 100644
--- a/make/newtversion-cdc
+++ b/make/newtversion-cdc
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true