Fix JNLP applet

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@363 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4

6 files changed, 65 insertions, 10 deletions

diff --git a/www/applettest-jnlp-next.html b/www/applettest-jnlp-next.html
index ae80cf1..9df3922 100644
--- a/www/applettest-jnlp-next.html
+++ b/www/applettest-jnlp-next.html
@@ -11,6 +11,7 @@
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x-next/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/jogl-demos.jar">
@@ -19,8 +20,10 @@
    <param name="subapplet.displayname" value="JOGL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.jnlp">
+   <param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
    <param name="jnlp_href" value="applet-gears-next.jnlp">
 </applet>
diff --git a/www/applettest-jnlp.html b/www/applettest-jnlp.html
index e18774c..8584a16 100644
--- a/www/applettest-jnlp.html
+++ b/www/applettest-jnlp.html
@@ -18,6 +18,7 @@ otherwise it shall fallback to <a href="http://applet-launcher.dev.java.net">JNL
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar">
@@ -26,8 +27,10 @@ otherwise it shall fallback to <a href="http://applet-launcher.dev.java.net">JNL
    <param name="subapplet.displayname" value="JOGL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.jnlp">
+   <param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
    <param name="jnlp_href" value="applet-gears.jnlp">
 </applet>
@@ -42,6 +45,7 @@ The applet above is instantiated with the following code:
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar"&gt;
@@ -50,13 +54,46 @@ The applet above is instantiated with the following code:
    &lt;param name="subapplet.displayname" value="JOGL Gears Applet"&gt;
    &lt;param name="noddraw.check" value="true"&gt;
    &lt;param name="progressbar" value="true"&gt;
-   &lt;param name="jnlpNumExtensions" value="1"&gt;
+   &lt;param name="jnlpNumExtensions" value="2"&gt;
    &lt;param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.jnlp"&gt;
+   &lt;param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"&gt;
    &lt;param name="jnlp_href" value="applet-gears.jnlp"&gt;
 &lt;/applet&gt;
 </pre>
 
+Where the referenced JNLP file <em>applet-gears.jnlp</em> looks as follow:
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;jnlp href="applet-gears.jnlp"&gt;
+  &lt;information&gt;
+    &lt;title&gt;JOGL JNLP Applet Gears Demo&lt;/title&gt;
+    &lt;vendor&gt;Sun Microsystems, Inc.&lt;/vendor&gt;
+    &lt;homepage href="http://jogl-demos.dev.java.net/"/&gt;
+    &lt;description&gt;Gears Demo&lt;/description&gt;
+    &lt;description kind="short"&gt;Brian Paul's Gears demo ported to Java and JOGL.&lt;/description&gt;
+    &lt;offline-allowed/&gt;
+  &lt;/information&gt;
+
+    &lt;resources&gt;
+      &lt;j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/&gt;
+      &lt;property name="sun.java2d.noddraw" value="true"/&gt;
+      &lt;jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar" main="true"/&gt;
+      &lt;jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos-util.jar"/&gt;
+      &lt;extension name="jogl-all-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-all-awt.jnlp" /&gt;
+    &lt;/resources&gt;
+
+  &lt;applet-desc 
+      name="Gears-Applet"
+      main-class="demos.applets.GearsApplet"
+      width="640" 
+      height="480"&gt;
+  &lt;/applet-desc&gt;
+&lt;/jnlp&gt;
+</pre>
+
 </P>
 <P>
 
diff --git a/www/applettest-joal-next.html b/www/applettest-joal-next.html
index 3cc96ee..120e806 100644
--- a/www/applettest-joal-next.html
+++ b/www/applettest-joal-next.html
@@ -11,6 +11,7 @@
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x-next/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/jogl-demos.jar,
@@ -21,10 +22,12 @@
    <param name="subapplet.displayname" VALUE="JOGL / JOAL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="2">
+   <param name="jnlpNumExtensions" value="3">
    <param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.jnlp">
    <param name="jnlpExtension2"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
+   <param name="jnlpExtension3"
           value="http://download.java.net/media/joal/webstart/joal.jnlp">
 </applet>
 
diff --git a/www/applettest-joal.html b/www/applettest-joal.html
index 6a3d517..b2c68a7 100644
--- a/www/applettest-joal.html
+++ b/www/applettest-joal.html
@@ -30,6 +30,7 @@ rendering and OpenAL audio:
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar,
@@ -40,10 +41,12 @@ rendering and OpenAL audio:
    <param name="subapplet.displayname" VALUE="JOGL / JOAL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="2">
+   <param name="jnlpNumExtensions" value="3">
    <param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.jnlp">
    <param name="jnlpExtension2"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
+   <param name="jnlpExtension3"
           value="http://download.java.net/media/joal/webstart/joal.jnlp">
 </applet>
 
diff --git a/www/applettest-next.html b/www/applettest-next.html
index 227dd13..1bacbc0 100644
--- a/www/applettest-next.html
+++ b/www/applettest-next.html
@@ -11,6 +11,7 @@
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x-next/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/jogl-demos.jar">
@@ -19,8 +20,10 @@
    <param name="subapplet.displayname" value="JOGL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/nativewindow.jnlp">
+   <param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
 </applet>
 
diff --git a/www/applettest.html b/www/applettest.html
index 81fbce9..49cb302 100644
--- a/www/applettest.html
+++ b/www/applettest.html
@@ -24,6 +24,7 @@ as an applet:
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar">
@@ -32,8 +33,10 @@ as an applet:
    <param name="subapplet.displayname" value="JOGL Gears Applet">
    <param name="noddraw.check" value="true">
    <param name="progressbar" value="true">
-   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.jnlp">
+   <param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
 </applet>
 
@@ -47,6 +50,7 @@ The applet above is instantiated with the following code:
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
+               http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.all.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl.all.jar,
                http://download.java.net/media/gluegen/webstart-2.x/gluegen-rt.jar,
                http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar"&gt;
@@ -55,8 +59,10 @@ The applet above is instantiated with the following code:
    &lt;param name="subapplet.displayname" value="JOGL Gears Applet"&gt;
    &lt;param name="noddraw.check" value="true"&gt;
    &lt;param name="progressbar" value="true"&gt;
-   &lt;param name="jnlpNumExtensions" value="1"&gt;
+   &lt;param name="jnlpNumExtensions" value="2"&gt;
    &lt;param name="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/nativewindow.jnlp"&gt;
+   &lt;param name="jnlpExtension2"
           value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"&gt;
 &lt;/applet&gt;
 </pre>