Add: Extended support for CVM crosscompile:

    - Clean up X11 dependency
    - NativeWindow:
        - Seperate X11 out of core.
        - Add nativewindow.x11.jar and nativewindow.x11.cdc.jar
    - Newt:
        - Seperate X11,win,osx out of core.
        - Add newt.x11.jar, newt.win.jar, newt.osx.jar and the CDC variants

Fix: External Context & Drawable (X11 and Windows)
    - Properly fetch current context values (ctx, display, drawable, ..)
    - Create GraphicsConfiguration based on the given pixelformat/FBConfig

Fix: Java2D OpenGL Usage
    - Using the external context as shared for the external drawable
    - JAWTUtil: Skip locking in case of OGL-Flush-Queue
    - TODO: Windows FBO still does not work .. (X11 is fine)

12 files changed, 168 insertions, 126 deletions

diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 9c5962581..125980882 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -5,7 +5,7 @@
     <title>Java(tm) Binding to the OpenGL(r) API (ALL.AWT)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 (beta2) - ALL.AWT</description>
+    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.AWT</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.AWT</description>
     <offline-allowed/>
   </information>
@@ -16,7 +16,7 @@
       <jar href="jogl.all.jar" />
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-      <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.jnlp" />
+      <extension name="nativewindow-all-awt" href="JOGL_CODEBASE_TAG/nativewindow-all-awt.jnlp" />
     </resources>
 
     <resources os="Windows" arch="x86">
diff --git a/jnlp-files/jogl-all.jnlp b/jnlp-files/jogl-all.jnlp
deleted file mode 100644
index 744492675..000000000
--- a/jnlp-files/jogl-all.jnlp
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="JOGL_CODEBASE_TAG/"
-      href="jogl-all.jnlp">
-  <information>
-    <title>Java(tm) Binding to the OpenGL(r) API (ALL)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 (beta2) - ALL</description>
-    <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.</description>
-    <offline-allowed/>
-  </information>
-  <security>
-      <all-permissions/>
-  </security>
-    <resources>
-      <jar href="jogl.all.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" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <nativelib href = "jogl-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <nativelib href = "jogl-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "jogl-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <nativelib href = "jogl-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <nativelib href = "jogl-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <nativelib href = "jogl-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <nativelib href = "jogl-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "jogl-natives-macosx-universal.jar" />
-    </resources>
-
-  <component-desc />
-</jnlp>
diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp
index b77e40e04..03c61b37a 100644
--- a/jnlp-files/jogl-awt.jnlp
+++ b/jnlp-files/jogl-awt.jnlp
@@ -5,7 +5,7 @@
     <title>Java(tm) Binding to the OpenGL(r) API (AWT)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 (beta2) - AWT</description>
+    <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>
diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp
index 8f6832e42..c1dbcfc1d 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-core.jnlp
@@ -5,7 +5,7 @@
     <title>Java(tm) Binding to the OpenGL(r) API (CORE)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 (beta2) - CORE</description>
+    <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>
     <offline-allowed/>
   </information>
diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp
index 2ae20531e..25402adcb 100644
--- a/jnlp-files/jogl-gl2es12.jnlp
+++ b/jnlp-files/jogl-gl2es12.jnlp
@@ -5,7 +5,7 @@
     <title>Java(tm) Binding to the OpenGL(r) API (GL2ES12)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 (beta2) - GL2ES12</description>
+    <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - GL2ES12</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - GL2ES12.</description>
     <offline-allowed/>
   </information>
diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/nativewindow-all-awt.jnlp
new file mode 100644
index 000000000..f22166ecb
--- /dev/null
+++ b/jnlp-files/nativewindow-all-awt.jnlp
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG/"
+      href="nativewindow-all-awt.jnlp">
+  <information>
+    <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="http://nativewindow.dev.java.net/"/>
+    <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>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="nativewindow.all.jar" main="true" />
+      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
+    </resources>
+
+    <resources os="Windows" arch="x86">
+      <nativelib href = "nativewindow-natives-windows-i586.jar" />
+    </resources>
+    <resources os="Windows" arch="amd64">
+      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="Windows" arch="x86_64">
+      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparc">
+      <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
+    </resources>
+    <resources os="SunOS" arch="sparcv9">
+      <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86">
+      <nativelib href = "nativewindow-natives-solaris-i586.jar" />
+    </resources>
+    <resources os="SunOS" arch="amd64">
+      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="SunOS" arch="x86_64">
+      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="i386">
+      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="x86">
+      <nativelib href = "nativewindow-natives-linux-i586.jar" />
+    </resources>
+    <resources os="Linux" arch="amd64">
+      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Linux" arch="x86_64">
+      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="i386">
+      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+    </resources>
+    <resources os="Mac OS X" arch="x86_64">
+      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+    </resources>
+
+  <component-desc />
+</jnlp>
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
index b78dad9e4..aa07c3a24 100644
--- a/jnlp-files/nativewindow-awt.jnlp
+++ b/jnlp-files/nativewindow-awt.jnlp
@@ -5,59 +5,16 @@
     <title>Java(tm) NativeWindow Interface API (AWT)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://nativewindow.dev.java.net/"/>
-    <description>Java API for a binding to a native windowing system - 2.0 (beta2) - AWT</description>
-    <description kind="short">Java API for a binding to a native windowing system - 2.0 (beta2) - AWT</description>
+    <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>
   <security>
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.all.jar" main="true" />
-      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
-    </resources>
-
-    <resources os="Windows" arch="x86">
-      <nativelib href = "nativewindow-natives-windows-i586.jar" />
-    </resources>
-    <resources os="Windows" arch="amd64">
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="Windows" arch="x86_64">
-      <nativelib href = "nativewindow-natives-windows-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparc">
-      <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
-    </resources>
-    <resources os="SunOS" arch="sparcv9">
-      <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86">
-      <nativelib href = "nativewindow-natives-solaris-i586.jar" />
-    </resources>
-    <resources os="SunOS" arch="amd64">
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="SunOS" arch="x86_64">
-      <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="i386">
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="x86">
-      <nativelib href = "nativewindow-natives-linux-i586.jar" />
-    </resources>
-    <resources os="Linux" arch="amd64">
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Linux" arch="x86_64">
-      <nativelib href = "nativewindow-natives-linux-amd64.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="i386">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
-    </resources>
-    <resources os="Mac OS X" arch="x86_64">
-      <nativelib href = "nativewindow-natives-macosx-universal.jar" />
+      <jar href="nativewindow.awt.jar" main="true" />
+      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp
index e49d6c4ac..60a07aede 100644
--- a/jnlp-files/nativewindow.jnlp
+++ b/jnlp-files/nativewindow.jnlp
@@ -5,8 +5,8 @@
     <title>Java(tm) NativeWindow Interface API (CORE)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://nativewindow.dev.java.net/"/>
-    <description>Java API for a binding to a native windowing system - 2.0 (beta2) - CORE</description>
-    <description kind="short">Java API for a binding to a native windowing system - 2.0 (beta2) - CORE</description>
+    <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>
   <security>
@@ -27,30 +27,39 @@
       <nativelib href = "nativewindow-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
+      <jar href="nativewindow.x11.jar" main="true" />
       <nativelib href = "nativewindow-natives-linux-amd64.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/newt-all-awt.jnlp
new file mode 100644
index 000000000..7378e8ca2
--- /dev/null
+++ b/jnlp-files/newt-all-awt.jnlp
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="JOGL_CODEBASE_TAG/"
+      href="newt-all-awt.jnlp">
+  <information>
+    <title>NEWT - New Windowing Toolkit (ALL.AWT)</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="http://jogl.dev.java.net/"/>
+    <description>NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
+    <offline-allowed/>
+  </information>
+  <security>
+      <all-permissions/>
+  </security>
+    <resources>
+      <jar href="newt.all.jar" main="true"/>
+      <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.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
index 9df4e9495..28bb8e706 100644
--- a/jnlp-files/newt-awt.jnlp
+++ b/jnlp-files/newt-awt.jnlp
@@ -5,8 +5,8 @@
     <title>NEWT - New Windowing Toolkit (AWT)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>NEWT - A NativeWindow Interface implementation (beta2) - AWT</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation (beta2) - AWT</description>
+    <description>NEWT - A NativeWindow Interface implementation - AWT</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description>
     <offline-allowed/>
   </information>
   <security>
diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp
index ed5cc6d35..1ac69781a 100644
--- a/jnlp-files/newt-jogl.jnlp
+++ b/jnlp-files/newt-jogl.jnlp
@@ -5,8 +5,8 @@
     <title>NEWT - New Windowing Toolkit (JOGL)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>NEWT - A NativeWindow Interface implementation (beta2) - JOGL</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation (beta2) - JOGL</description>
+    <description>NEWT - A NativeWindow Interface implementation - JOGL</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - JOGL</description>
     <offline-allowed/>
   </information>
   <security>
diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp
index 538760369..cb6899256 100644
--- a/jnlp-files/newt.jnlp
+++ b/jnlp-files/newt.jnlp
@@ -5,8 +5,8 @@
     <title>NEWT - New Windowing Toolkit (CORE)</title>
     <vendor>Sun Microsystems, Inc.</vendor>
     <homepage href="http://jogl.dev.java.net/"/>
-    <description>NEWT - A NativeWindow Interface implementation (beta2) - CORE</description>
-    <description kind="short">NEWT - A NativeWindow Interface implementation (beta2) - CORE</description>
+    <description>NEWT - A NativeWindow Interface implementation - CORE</description>
+    <description kind="short">NEWT - A NativeWindow Interface implementation - CORE</description>
     <offline-allowed/>
   </information>
   <security>
@@ -18,45 +18,59 @@
     </resources>
 
     <resources os="Windows" arch="x86">
+      <jar href="newt.win.jar" main="true" />
       <nativelib href = "newt-natives-windows-i586.jar" />
     </resources>
     <resources os="Windows" arch="amd64">
+      <jar href="newt.win.jar" main="true" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="Windows" arch="x86_64">
+      <jar href="newt.win.jar" main="true" />
       <nativelib href = "newt-natives-windows-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="sparc">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-solaris-sparc.jar" />
     </resources>
     <resources os="SunOS" arch="sparcv9">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-solaris-sparcv9.jar" />
     </resources>
     <resources os="SunOS" arch="x86">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-solaris-i586.jar" />
     </resources>
     <resources os="SunOS" arch="amd64">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="SunOS" arch="x86_64">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-solaris-amd64.jar" />
     </resources>
     <resources os="Linux" arch="i386">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="x86">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-linux-i586.jar" />
     </resources>
     <resources os="Linux" arch="amd64">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Linux" arch="x86_64">
+      <jar href="newt.x11.jar" main="true" />
       <nativelib href = "newt-natives-linux-amd64.jar" />
     </resources>
     <resources os="Mac OS X" arch="i386">
+      <jar href="newt.osx.jar" main="true" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>
     <resources os="Mac OS X" arch="x86_64">
+      <jar href="newt.osx.jar" main="true" />
       <nativelib href = "newt-natives-macosx-universal.jar" />
     </resources>