Fix JNLP files

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@2024 232f8b59-042b-4e1e-8c03-345bb8c30851

6 files changed, 146 insertions, 48 deletions

diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 2101fd84e..9c5962581 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -13,11 +13,54 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.awt.jar" />
-      <jar href="jogl.util.awt.jar" />
+      <jar href="jogl.all.jar" />
 
-      <extension name="jogl-all" href="JOGL_CODEBASE_TAG/jogl-all.jnlp" />
+      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
       <extension name="nativewindow-awt" href="JOGL_CODEBASE_TAG/nativewindow-awt.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-all.jnlp b/jnlp-files/jogl-all.jnlp
index 032cdd03e..744492675 100644
--- a/jnlp-files/jogl-all.jnlp
+++ b/jnlp-files/jogl-all.jnlp
@@ -13,42 +13,53 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.glu.mipmap.jar" />
-      <jar href="jogl.glu.tess.jar" />
+      <jar href="jogl.all.jar" />
 
-      <jar href="jogl.util.fixedfuncemu.jar" />
-
-      <!-- jar href="jogl.sdk.jar" /-->
-
-      <jar href="jogl.cg.jar" />
-
-      <extension name="jogl-core" href="JOGL_CODEBASE_TAG/jogl-core.jnlp" />
+      <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
+      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
     </resources>
 
-    <resources os="Mobile-Embedded">
-      <jar href="jogl.egl.jar" />
-      <jar href="jogl.gles1.jar" />
-      <jar href="jogl.gles1.dbg.jar" />
-      <jar href="jogl.gles2.jar" />
-      <jar href="jogl.gles2.dbg.jar" />
-    </resources>
-    <resources os="Windows">
-      <jar href="jogl.gl2.win.jar" />
-      <jar href="jogl.util.gl2.jar" />
-      <jar href="jogl.glu.gl2.jar" />
-      <jar href="jogl.gl2.dbg.jar" />
-    </resources>
-    <resources os="SunOS Linux">
-      <jar href="jogl.gl2.x11.jar" />
-      <jar href="jogl.util.gl2.jar" />
-      <jar href="jogl.glu.gl2.jar" />
-      <jar href="jogl.gl2.dbg.jar" />
-    </resources>
-    <resources os="Mac OS X">
-      <jar href="jogl.gl2.osx.jar" />
-      <jar href="jogl.util.gl2.jar" />
-      <jar href="jogl.glu.gl2.jar" />
-      <jar href="jogl.gl2.dbg.jar" />
+    <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 />
diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp
index a2d3cf652..b77e40e04 100644
--- a/jnlp-files/jogl-awt.jnlp
+++ b/jnlp-files/jogl-awt.jnlp
@@ -14,7 +14,7 @@
   </security>
     <resources>
       <jar href="jogl.awt.jar" />
-      <jar href="jogl.util.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" />
diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp
index 2a0031613..8f6832e42 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-core.jnlp
@@ -14,7 +14,7 @@
   </security>
     <resources>
       <jar href="jogl.core.jar" main="true"/>
-      <jar href="jogl.util.jar" />
+      <jar href="jogl.util.jar" download="lazy"/>
 
       <extension name="gluegen-rt"   href="GLUEGEN_CODEBASE_TAG/gluegen-rt.jnlp" />
       <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp
index 153d02821..2ae20531e 100644
--- a/jnlp-files/jogl-gl2es12.jnlp
+++ b/jnlp-files/jogl-gl2es12.jnlp
@@ -13,10 +13,10 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="jogl.glu.mipmap.jar" />
-      <jar href="jogl.glu.tess.jar" />
+      <jar href="jogl.glu.mipmap.jar" download="lazy"/>
+      <jar href="jogl.glu.tess.jar" download="lazy"/>
 
-      <jar href="jogl.util.fixedfuncemu.jar" />
+      <jar href="jogl.util.fixedfuncemu.jar" download="lazy"/>
 
       <!-- jar href="jogl.sdk.jar" /-->
 
@@ -26,21 +26,21 @@
     <resources os="Mobile-Embedded">
       <jar href="jogl.egl.jar" />
       <jar href="jogl.gles1.jar" />
-      <jar href="jogl.gles1.dbg.jar" />
+      <jar href="jogl.gles1.dbg.jar" download="lazy"/>
       <jar href="jogl.gles2.jar" />
-      <jar href="jogl.gles2.dbg.jar" />
+      <jar href="jogl.gles2.dbg.jar" download="lazy"/>
     </resources>
     <resources os="Windows">
       <jar href="jogl.gl2es12.win.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" />
+      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
     </resources>
     <resources os="SunOS Linux">
       <jar href="jogl.gl2es12.x11.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" />
+      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
     </resources>
     <resources os="Mac OS X">
       <jar href="jogl.gl2es12.osx.jar" />
-      <jar href="jogl.gl2es12.dbg.jar" />
+      <jar href="jogl.gl2es12.dbg.jar" download="lazy"/>
     </resources>
 
   <component-desc />
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
index d64b6b479..b78dad9e4 100644
--- a/jnlp-files/nativewindow-awt.jnlp
+++ b/jnlp-files/nativewindow-awt.jnlp
@@ -13,8 +13,52 @@
       <all-permissions/>
   </security>
     <resources>
-      <jar href="nativewindow.awt.jar" main="true" />
-      <extension name="nativewindow" href="JOGL_CODEBASE_TAG/nativewindow.jnlp" />
+      <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>