Merge branch 'master' of http://github.com/sgothel/jogl

17 files changed, 134 insertions, 239 deletions

diff --git a/jnlp-files/applet-version-jnlp.html b/jnlp-files/applet-version-jnlp.html
index 218f21fa5..eb3089ce1 100644
--- a/jnlp-files/applet-version-jnlp.html
+++ b/jnlp-files/applet-version-jnlp.html
@@ -19,9 +19,7 @@ JNLP Applet with AppletLauncher fallback version.
       width=800
       height=600
       archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar,
-               JOGL_CODEBASE_TAG/newt.all.jar,
                JOGL_CODEBASE_TAG/jogl.all.jar,
-               JOGL_CODEBASE_TAG/nativewindow.all.jar,
                JOGL_CODEBASE_TAG/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="jogamp.newt.awt.opengl.VersionApplet">
@@ -29,7 +27,7 @@ JNLP Applet with AppletLauncher fallback version.
    <!-- param name="noddraw.check" value="true" -->
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
-   <param name="jnlpExtension1" value="JOGL_CODEBASE_TAG/jogl-core.jnlp">
+   <param name="jnlpExtension1" value="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp">
    <!-- param name="java_arguments" value="-Dsun.java2d.noddraw=true" -->
    <param name="jnlp_href" value="JOGL_CODEBASE_TAG/applet-version.jnlp">
 </applet>
diff --git a/jnlp-files/applet-version-lancheronly.html b/jnlp-files/applet-version-lancheronly.html
index 718e9eba8..eb6c195bd 100644
--- a/jnlp-files/applet-version-lancheronly.html
+++ b/jnlp-files/applet-version-lancheronly.html
@@ -19,9 +19,7 @@ AppletLauncher only version.
       width=800
       height=600
       archive="JOGL_CODEBASE_TAG/../util/applet-launcher.jar,
-               JOGL_CODEBASE_TAG/newt.all.jar,
                JOGL_CODEBASE_TAG/jogl.all.jar,
-               JOGL_CODEBASE_TAG/nativewindow.all.jar,
                JOGL_CODEBASE_TAG/gluegen-rt.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="jogamp.newt.awt.opengl.VersionApplet">
@@ -29,7 +27,7 @@ AppletLauncher only version.
    <!-- param name="noddraw.check" value="true" -->
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
-   <param name="jnlpExtension1" value="JOGL_CODEBASE_TAG/jogl-core.jnlp">
+   <param name="jnlpExtension1" value="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp">
 </applet>
 
 
diff --git a/jnlp-files/applet-version.jnlp b/jnlp-files/applet-version.jnlp
index c621b46bb..622c7bb7a 100644
--- a/jnlp-files/applet-version.jnlp
+++ b/jnlp-files/applet-version.jnlp
@@ -12,7 +12,7 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <!-- property name="sun.java2d.noddraw" value="true"/-->
-      <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+      <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
   <applet-desc 
diff --git a/jnlp-files/application-version.jnlp b/jnlp-files/application-version.jnlp
index 3fac56c29..dfe203cd4 100644
--- a/jnlp-files/application-version.jnlp
+++ b/jnlp-files/application-version.jnlp
@@ -12,7 +12,7 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <!-- property name="sun.java2d.noddraw" value="true"/-->
-      <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+      <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
   <application-desc main-class="jogamp.newt.awt.opengl.VersionApplet"/>
diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/atomic/nativewindow-all-awt.jnlp
index 57a189530..bdda477ef 100644
--- a/jnlp-files/nativewindow-all-awt.jnlp
+++ b/jnlp-files/atomic/nativewindow-all-awt.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
+<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
       href="nativewindow-all-awt.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
@@ -14,7 +14,8 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.all.jar"/>
+      <jar href="nativewindow.core.jar" />
+      <jar href="nativewindow.awt.jar"/>
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
     </resources>
 
@@ -54,6 +55,12 @@
     <resources os="Linux" arch="x86_64">
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+    </resources>
     <resources os="Mac OS X" arch="i386">
       <nativelib href = "nativewindow-natives-macosx-universal.jar" />
     </resources>
diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/atomic/nativewindow.jnlp
index a2b0c79de..109be0373 100644
--- a/jnlp-files/nativewindow.jnlp
+++ b/jnlp-files/atomic/nativewindow.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
+<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
       href="nativewindow.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>Java(tm) NativeWindow Interface API (CORE)</title>
@@ -66,6 +66,12 @@
       <jar href="nativewindow.os.x11.jar" />
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "nativewindow-natives-linux-armv7.jar" />
+    </resources>
     <resources os="Mac OS X" arch="i386">
       <nativelib href = "nativewindow-natives-macosx-universal.jar" />
     </resources>
diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/atomic/newt-all-awt.jnlp
index c4444ff63..378e2270e 100644
--- a/jnlp-files/newt-all-awt.jnlp
+++ b/jnlp-files/atomic/newt-all-awt.jnlp
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
+<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
       href="newt-all-awt.jnlp" version="JOGAMP_VERSION">
   <information>
-    <title>NEWT - New Windowing Toolkit (ALL.AWT)</title>
+    <title>NEWT - New Windowing Toolkit (AWT)</title>
     <vendor>JogAmp Community</vendor>
     <homepage href="http://jogamp.org/"/>
-    <description>NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
+    <description>NEWT - A NativeWindow Interface implementation - AWT</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description>
     <offline-allowed/>
   </information>
   <update check="background" policy="always"/>
@@ -14,50 +14,71 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="newt.all.jar" />
-      <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
+      <jar href="newt.core.jar" />
+      <jar href="newt.awt.jar" />
+      <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "newt-natives-linux-armv7.jar" />
+    </resources>
     <resources os="Mac OS X" arch="i386">
+      <jar href="newt.driver.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
+      <jar href="newt.driver.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
 
diff --git a/jnlp-files/newt.jnlp b/jnlp-files/atomic/newt.jnlp
index 9decf249d..914d9dcf2 100644
--- a/jnlp-files/newt.jnlp
+++ b/jnlp-files/atomic/newt.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
+<jnlp codebase="JOGL_CODEBASE_TAG/atomic"
       href="newt.jnlp" version="JOGAMP_VERSION">
   <information>
     <title>NEWT - New Windowing Toolkit (CORE)</title>
@@ -19,59 +19,65 @@
     </resources>
 
     <resources os="Windows" arch="x86">
-      <jar href="newt.os.win.jar" />
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <jar href="newt.os.win.jar" />
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <jar href="newt.os.win.jar" />
+      <jar href="newt.driver.win.jar" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <jar href="newt.os.x11.jar" />
+      <jar href="newt.driver.x11.jar" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "newt-natives-linux-armv7.jar" />
+    </resources>
     <resources os="Mac OS X" arch="i386">
-      <jar href="newt.os.osx.jar" />
+      <jar href="newt.driver.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <jar href="newt.os.osx.jar" />
+      <jar href="newt.driver.osx.jar" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
 
diff --git a/jnlp-files/javaws-version.jnlp b/jnlp-files/javaws-version.jnlp
index fa14f95ab..4074477ef 100755
--- a/jnlp-files/javaws-version.jnlp
+++ b/jnlp-files/javaws-version.jnlp
@@ -12,7 +12,7 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <!-- property name="sun.java2d.noddraw" value="true"/-->
-      <extension name="newt-all-awt" href="JOGL_CODEBASE_TAG/newt-all-awt.jnlp" />
+      <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
     </resources>
 
   <application-desc main-class="jogamp.newt.awt.opengl.VersionApplet"/>
diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 822c26abf..871464251 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -17,50 +17,55 @@
       <jar href="jogl.all.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-      <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-natives-windows-i586.jar" />
+      <nativelib href = "jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-natives-solaris-sparc.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-natives-solaris-i586.jar" />
+      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-all-mobile.jnlp
index 464c65c94..602a327e3 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-all-mobile.jnlp
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="jogl-core.jnlp" version="JOGAMP_VERSION">
+      href="jogl-all-mobile.jnlp" version="JOGAMP_VERSION">
   <information>
-    <title>Java(tm) Binding to the OpenGL(r) API (CORE)</title>
+    <title>Java(tm) Binding to the OpenGL(r) API (ALL.MOBILE)</title>
     <vendor>JogAmp Community</vendor>
     <homepage href="http://jogamp.org/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - CORE</description>
-    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - CORE.</description>
+    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.MOBILE</description>
+    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.MOBILE</description>
     <offline-allowed/>
   </information>
   <update check="background" policy="always"/>
@@ -14,54 +14,58 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.core.jar"/>
-      <jar href="jogl.util.jar" download="lazy"/>
+      <jar href="jogl.all-mobile.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-natives-windows-i586.jar" />
+      <nativelib href = "jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-natives-solaris-sparc.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-natives-solaris-i586.jar" />
+      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp
index 55b548f50..99e7816d6 100644
--- a/jnlp-files/jogl-all-noawt.jnlp
+++ b/jnlp-files/jogl-all-noawt.jnlp
@@ -17,50 +17,55 @@
       <jar href="jogl.all-noawt.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
-      <nativelib href = "jogl-natives-windows-i586.jar" />
+      <nativelib href = "jogl-all-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
+      <nativelib href = "jogl-all-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-natives-solaris-sparc.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-natives-solaris-sparcv9.jar" />
+      <nativelib href = "jogl-all-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-natives-solaris-i586.jar" />
+      <nativelib href = "jogl-all-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
+      <nativelib href = "jogl-all-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
+      <nativelib href = "jogl-all-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
+      <nativelib href = "jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jogl-all-natives-linux-armv7.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
+      <nativelib href = "jogl-all-natives-macosx-universal.jar" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp
deleted file mode 100644
index ffdaee0cc..000000000
--- a/jnlp-files/jogl-awt.jnlp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="jogl-awt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>Java(tm) Binding to the OpenGL(r) API (AWT)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - AWT</description>
-    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - AWT.</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jogl.awt.jar" />
-      <jar href="jogl.util.awt.jar" download="lazy"/>
-
-      <extension name="jogl-core" href="JOGL_CODEBASE_TAG/jogl-core.jnlp" />
-      <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
-    </resources>
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
deleted file mode 100644
index d37446c5a..000000000
--- a/jnlp-files/nativewindow-awt.jnlp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="nativewindow-awt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>Java(tm) NativeWindow Interface API (AWT)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>Java API for a binding to a native windowing system - 2.0 - AWT</description>
-    <description kind="short">Java API for a binding to a native windowing system - 2.0 - AWT</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="nativewindow.awt.jar"/>
-      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp
deleted file mode 100644
index c67c7ac08..000000000
--- a/jnlp-files/newt-all-noawt.jnlp
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="newt-all-noawt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>NEWT - New Windowing Toolkit (ALL.NO_AWT)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="newt.all-noawt.jar" />
-      <extension name="jogl-all-noawt" href="JOGL_CODEBASE_TAG/jogl-all-noawt.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <nativelib href = "newt-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <nativelib href = "newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <nativelib href = "newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <nativelib href = "newt-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "newt-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <nativelib href = "newt-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <nativelib href = "newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <nativelib href = "newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <nativelib href = "newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <nativelib href = "newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <nativelib href = "newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <nativelib href = "newt-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "newt-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/newt-awt.jnlp b/jnlp-files/newt-awt.jnlp
deleted file mode 100644
index fc5b7f178..000000000
--- a/jnlp-files/newt-awt.jnlp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="newt-awt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>NEWT - New Windowing Toolkit (AWT)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>NEWT - A NativeWindow Interface implementation - AWT</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="newt.awt.jar" />
-      <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
-      <extension name="newt" href="JOGL_CODEBASE_TAG/newt.jnlp" />
-    </resources>
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp
deleted file mode 100644
index cd0f5d633..000000000
--- a/jnlp-files/newt-jogl.jnlp
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="newt-jogl.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>NEWT - New Windowing Toolkit (JOGL)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>NEWT - A NativeWindow Interface implementation - JOGL</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation - JOGL</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="newt.ogl.jar" />
-      <extension name="newt" href="JOGL_CODEBASE_TAG/newt.jnlp" />
-      <extension name="jogl-core" href="JOGL_CODEBASE_TAG/jogl-core.jnlp" />
-    </resources>
-  <component-desc />
-</jnlp>