Fix atomic JNLP files

12 files changed, 697 insertions, 326 deletions

diff --git a/jnlp-files/atomic/jogl-awt.jnlp b/jnlp-files/atomic/jogl-awt.jnlp
new file mode 100644
index 000000000..7a2576117
--- /dev/null
+++ b/jnlp-files/atomic/jogl-awt.jnlp
@@ -0,0 +1,98 @@
+<?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 - 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="jar/atomic/jogl.core.jar" />
+      <jar href="jar/atomic/jogl.sdk.jar" />
+      <jar href="jar/atomic/jogl.util.jar" />
+      <jar href="jar/atomic/jogl.awt.jar" />
+      <jar href="jar/atomic/jogl.util.awt.jar" />
+      <jar href="jar/atomic/jogl.glutess.jar" />
+      <jar href="jar/atomic/jogl.glumipmap.jar" />
+      <jar href="jar/atomic/jogl.gldesktop.jar" />
+      <jar href="jar/atomic/jogl.gldesktop.dbg.jar" />
+      <jar href="jar/atomic/jogl.glugldesktop.jar" />
+      <jar href="jar/atomic/jogl.util.gldesktop.jar" />
+
+      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/jogl.os.osx.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.osx.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/jogl-noawt.jnlp b/jnlp-files/atomic/jogl-noawt.jnlp
new file mode 100644
index 000000000..e3c45f5b7
--- /dev/null
+++ b/jnlp-files/atomic/jogl-noawt.jnlp
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG/"
+      href="jogl-noawt.jnlp" version="JOGAMP_VERSION">
+  <information>
+    <title>Java(tm) Binding to the OpenGL(r) API (NO_AWT)</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
+    <description>Java Binding to the OpenGL API - 2.0.0 - NO_AWT</description>
+    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - NO_AWT</description>
+    <offline-allowed/>
+  </information>
+  <update check="background" policy="always"/>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="jar/atomic/jogl.core.jar" />
+      <jar href="jar/atomic/jogl.sdk.jar" />
+      <jar href="jar/atomic/jogl.util.jar" />
+      <jar href="jar/atomic/jogl.glutess.jar" />
+      <jar href="jar/atomic/jogl.glumipmap.jar" />
+      <jar href="jar/atomic/jogl.gldesktop.jar" />
+      <jar href="jar/atomic/jogl.gldesktop.dbg.jar" />
+      <jar href="jar/atomic/jogl.glugldesktop.jar" />
+      <jar href="jar/atomic/jogl.util.gldesktop.jar" />
+
+      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-noawt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.win.jar" />
+      <nativelib href = "jar/jogl-all-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <jar href="jar/atomic/jogl.os.x11.jar" />
+      <nativelib href = "jar/jogl-all-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/jogl.os.osx.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/jogl.os.osx.jar" />
+      <nativelib href = "jar/jogl-all-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/nativewindow-all-awt.jnlp b/jnlp-files/atomic/nativewindow-all-awt.jnlp
deleted file mode 100644
index 2e9134d20..000000000
--- a/jnlp-files/atomic/nativewindow-all-awt.jnlp
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG"
-      href="nativewindow-all-awt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
-    <description kind="short">Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jar/nativewindow.core.jar" />
-      <jar href="jar/nativewindow.awt.jar"/>
-      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <nativelib href = "jar/nativewindow-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <nativelib href = "jar/nativewindow-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jar/nativewindow-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <nativelib href = "jar/nativewindow-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="arm">
-      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Linux" arch="armv7">
-      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/atomic/nativewindow-awt.jnlp b/jnlp-files/atomic/nativewindow-awt.jnlp
new file mode 100644
index 000000000..db80b644f
--- /dev/null
+++ b/jnlp-files/atomic/nativewindow-awt.jnlp
@@ -0,0 +1,72 @@
+<?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="jar/atomic/nativewindow.core.jar" />
+      <jar href="jar/atomic/nativewindow.awt.jar"/>
+      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/nativewindow-noawt.jnlp b/jnlp-files/atomic/nativewindow-noawt.jnlp
new file mode 100644
index 000000000..fed731042
--- /dev/null
+++ b/jnlp-files/atomic/nativewindow-noawt.jnlp
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG"
+      href="nativewindow-noawt.jnlp" version="JOGAMP_VERSION">
+  <information>
+    <title>Java(tm) NativeWindow Interface API (NO_AWT)</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
+    <description>Java API for a binding to a native windowing system - 2.0 - NO_AWT</description>
+    <description kind="short">Java API for a binding to a native windowing system - 2.0 - NO_AWT</description>
+    <offline-allowed/>
+  </information>
+  <update check="background" policy="always"/>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="jar/atomic/nativewindow.core.jar" />
+      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/nativewindow.os.win.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/nativewindow.os.win.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/nativewindow.os.win.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/nativewindow.os.x11.jar" />
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jar/atomic/nativewindow-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <nativelib href = "jar/atomic/nativewindow-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/nativewindow.jnlp b/jnlp-files/atomic/nativewindow.jnlp
deleted file mode 100644
index 8d8c69fc9..000000000
--- a/jnlp-files/atomic/nativewindow.jnlp
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG"
-      href="nativewindow.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>Java(tm) NativeWindow Interface API (CORE)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>Java API for a binding to a native windowing system - 2.0 - CORE</description>
-    <description kind="short">Java API for a binding to a native windowing system - 2.0 - CORE</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jar/nativewindow.core.jar" />
-      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <jar href="jar/nativewindow.os.win.jar" />
-      <nativelib href = "jar/nativewindow-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <jar href="jar/nativewindow.os.win.jar" />
-      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <jar href="jar/nativewindow.os.win.jar" />
-      <nativelib href = "jar/nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <jar href="jar/nativewindow.os.x11.jar" />
-      <nativelib href = "jar/nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="arm">
-      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Linux" arch="armv7">
-      <nativelib href = "jar/nativewindow-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jar/nativewindow-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/atomic/newt-all-awt.jnlp b/jnlp-files/atomic/newt-all-awt.jnlp
deleted file mode 100644
index 8e56b52f2..000000000
--- a/jnlp-files/atomic/newt-all-awt.jnlp
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG"
-      href="newt-all-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="jar/newt.core.jar" />
-      <jar href="jar/newt.awt.jar" />
-      <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="arm">
-      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Linux" arch="armv7">
-      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <jar href="jar/newt.driver.osx.jar" />
-      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <jar href="jar/newt.driver.osx.jar" />
-      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/atomic/newt-awt-jogl.jnlp b/jnlp-files/atomic/newt-awt-jogl.jnlp
new file mode 100644
index 000000000..69406e43c
--- /dev/null
+++ b/jnlp-files/atomic/newt-awt-jogl.jnlp
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG"
+      href="newt-awt-jogl.jnlp" version="JOGAMP_VERSION">
+  <information>
+    <title>NEWT - New Windowing Toolkit (AWT, JOGL)</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
+    <description>NEWT - A NativeWindow Interface implementation - AWT, JOGL</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - AWT, JOGL</description>
+    <offline-allowed/>
+  </information>
+  <update check="background" policy="always"/>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="jar/atomic/newt.core.jar" />
+      <jar href="jar/atomic/newt.ogl.jar" />
+      <jar href="jar/atomic/newt.awt.jar" />
+      <extension name="jogl-awt" href="JOGL_CODEBASE_TAG/jogl-awt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/newt-awt.jnlp b/jnlp-files/atomic/newt-awt.jnlp
new file mode 100644
index 000000000..26e45e3fc
--- /dev/null
+++ b/jnlp-files/atomic/newt-awt.jnlp
@@ -0,0 +1,86 @@
+<?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="jar/atomic/newt.core.jar" />
+      <jar href="jar/atomic/newt.awt.jar" />
+      <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/newt-noawt-jogl.jnlp b/jnlp-files/atomic/newt-noawt-jogl.jnlp
new file mode 100644
index 000000000..ced8b29c7
--- /dev/null
+++ b/jnlp-files/atomic/newt-noawt-jogl.jnlp
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG"
+      href="newt-noawt-jogl.jnlp" version="JOGAMP_VERSION">
+  <information>
+    <title>NEWT - New Windowing Toolkit (NO_AWT, JOGL)</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
+    <description>NEWT - A NativeWindow Interface implementation - NO_AWT, JOGL</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - NO_AWT, JOGL</description>
+    <offline-allowed/>
+  </information>
+  <update check="background" policy="always"/>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="jar/atomic/newt.core.jar" />
+      <jar href="jar/atomic/newt.ogl.jar" />
+      <extension name="jogl-noawt" href="JOGL_CODEBASE_TAG/jogl-noawt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/newt-noawt.jnlp b/jnlp-files/atomic/newt-noawt.jnlp
new file mode 100644
index 000000000..1616dff88
--- /dev/null
+++ b/jnlp-files/atomic/newt-noawt.jnlp
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG"
+      href="newt-noawt.jnlp" version="JOGAMP_VERSION">
+  <information>
+    <title>NEWT - New Windowing Toolkit (NO_AWT)</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
+    <description>NEWT - A NativeWindow Interface implementation - NO_AWT</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - NO_AWT</description>
+    <offline-allowed/>
+  </information>
+  <update check="background" policy="always"/>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="jar/atomic/newt.core.jar" />
+      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow-noawt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.win.jar" />
+      <nativelib href = "jar/atomic/newt-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.x11.jar" />
+      <nativelib href = "jar/atomic/newt-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="arm">
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Linux" arch="armv7">
+      <nativelib href = "jar/atomic/newt-natives-linux-armv7.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <jar href="jar/atomic/newt.driver.osx.jar" />
+      <nativelib href = "jar/atomic/newt-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/atomic/newt.jnlp b/jnlp-files/atomic/newt.jnlp
deleted file mode 100644
index 55fc12ae6..000000000
--- a/jnlp-files/atomic/newt.jnlp
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG"
-      href="newt.jnlp" version="JOGAMP_VERSION">
-  <information>
-    <title>NEWT - New Windowing Toolkit (CORE)</title>
-    <vendor>JogAmp Community</vendor>
-    <homepage href="http://jogamp.org/"/>
-    <description>NEWT - A NativeWindow Interface implementation - CORE</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation - CORE</description>
-    <offline-allowed/>
-  </information>
-  <update check="background" policy="always"/>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jar/newt.core.jar" />
-      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <jar href="jar/newt.driver.win.jar" />
-      <nativelib href = "jar/newt-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <jar href="jar/newt.driver.x11.jar" />
-      <nativelib href = "jar/newt-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="arm">
-      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Linux" arch="armv7">
-      <nativelib href = "jar/newt-natives-linux-armv7.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <jar href="jar/newt.driver.osx.jar" />
-      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <jar href="jar/newt.driver.osx.jar" />
-      <nativelib href = "jar/newt-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>