Add AppletLauncher to launcher applets ; Make JOGL Test page look nice

8 files changed, 290 insertions, 25 deletions

diff --git a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html
index 5c0c088cb..6a5c03c1f 100644
--- a/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html
+++ b/jnlp-files/jogl-applet-runner-newt-ElektronenMultiplizierer.html
@@ -10,7 +10,21 @@ Demoscene Passivist's Elektronen-Multiplizierer
 </P>
 
 <P>
-<applet width=640 height=480>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=640 height=480
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="ElektronenMultiplizierer">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.ElektronenMultiplizierer">
    <param name="gl_profile" value="GL2ES2">
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
index 15abfc143..04ce7a00d 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphTextDemo01.html
@@ -10,7 +10,21 @@ JOGL Graph Text Demo 01
 </P>
 
 <P>
-<applet width=800 height=400>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=800 height=400
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="JOGL Graph Text Demo01">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.graph.demos.GPUTextGLListener0A">
    <param name="gl_profile" value="GL2ES2">
diff --git a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html
index 4fde41a12..f2e73019d 100644
--- a/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html
+++ b/jnlp-files/jogl-applet-runner-newt-GraphUISceneDemo01.html
@@ -10,7 +10,21 @@ JOGL Graph UI-Scene Demo 01
 </P>
 
 <P>
-<applet width=640 height=480>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=640 height=480
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="JOGL Graph UI Demo01">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.graph.demos.GPUUISceneGLListener0A">
    <param name="gl_profile" value="GL2ES2">
diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html b/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html
new file mode 100644
index 000000000..c4f4207a4
--- /dev/null
+++ b/jnlp-files/jogl-applet-runner-newt-gears-normal-launcheronly.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>JOGL NEWT JNLP Applet Runner - GearsES2 - normal - launcheronly</title>
+</head>
+<body  BGCOLOR="#ffffff">
+
+<P>
+JOGL NEWT JNLP Applet Runner Special Keys:<br>
+<ul>
+    <li> d - toggle decoration </li>
+    <li> f - toggle fullscreen </li>
+    <li> r - in/out browser window </li>
+    <li> a - on/off always-on-top </li>
+</ul>
+</P>
+
+<P>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=200 height=200
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="JOGL GearsES2 Applet">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
+   <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
+   <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2">
+   <param name="gl_profile" value="GL2ES2">
+   <param name="gl_swap_interval" value="1">
+   <param name="gl_debug" value="false">
+   <param name="gl_trace" value="false">
+</applet>
+</P>
+
+<P>
+
+The applet above is instantiated with the following code:
+
+<pre>
+&lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+      width=200 height=200
+      archive="http://jogamp.org/deployment/jogamp-current/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/junit.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/jogl.test.jar"&gt;
+   &lt;param name="codebase_lookup" value="false"&gt;
+   &lt;param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"&gt;
+   &lt;param name="subapplet.displayname" value="JOGL GearsES2 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="jnlpExtension1"
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
+   &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
+   &lt;param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"&gt;
+   &lt;param name="gl_profile" value="GL2ES2"&gt;
+   &lt;param name="gl_swap_interval" value="1"&gt;
+   &lt;param name="gl_debug" value="false"&gt;
+   &lt;param name="gl_trace" value="false"&gt;
+   &lt;param name="jnlp_href" value="jogl-applet-runner-newt.jnlp"&gt;
+&lt;/applet&gt;
+</pre>
+
+</P>
+<P>
+
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! JogAmp Community signs
+applet-launcher.jar, jogl.jar and gluegen-rt.jar, which contain the
+JNLPAppletLauncher and JOGL's supporting classes; this is the only
+Java code which needs to be signed in order to deploy applets using
+JOGL and is the only certificate the end user must accept.
+
+</P>
+<P>
+
+The <a href="http://jogamp.org/applet-launcher/www/">JNLPAppletLauncher
+home page</a> contains more information about what files must be
+placed on the web server in order to enable the deployment of applets
+using JOGL and other extensions.
+
+</P>
+
+</body>
+</html>
diff --git a/jnlp-files/jogl-applet-runner-newt-gears-normal.html b/jnlp-files/jogl-applet-runner-newt-gears-normal.html
index c0720933d..646263fe2 100644
--- a/jnlp-files/jogl-applet-runner-newt-gears-normal.html
+++ b/jnlp-files/jogl-applet-runner-newt-gears-normal.html
@@ -6,8 +6,45 @@
 <body  BGCOLOR="#ffffff">
 
 <P>
+In case your <a href="https://jdk6.dev.java.net/plugin2/jnlp/">Java Plugin supports JNLP</a>, 
+the <em>jogl-applet-runner-newt.jnlp</em> is used, 
+otherwise it shall fallback to <a href="http://jogamp.org/applet-launcher/www/">JNLPAppletLauncher</a>.
+</P>
 
-<applet width=200 height=200>
+<P>
+Note that it is important for the startup time to have the same JVM arguments in the applet tags,
+as well as within the JNLP applet description, here see property <em>sun.java2d.noddraw</em>. <br>
+Only if JVM arguments of the JNLP applet description are satisfied by the applet tag's JVM,<br>
+the plugin will not need to start a new JVM. OF course, the applet tag's JVM spec may exceed the
+JNLP applet's one.
+</P>
+
+<P>
+JOGL NEWT JNLP Applet Runner Special Keys:<br>
+<ul>
+    <li> d - toggle decoration </li>
+    <li> f - toggle fullscreen </li>
+    <li> r - in/out browser window </li>
+    <li> a - on/off always-on-top </li>
+</ul>
+</P>
+
+<P>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=200 height=200
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="JOGL GearsES2 Applet">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2">
    <param name="gl_profile" value="GL2ES2">
@@ -15,17 +52,88 @@
    <param name="gl_debug" value="false">
    <param name="gl_trace" value="false">
    <param name="jnlp_href" value="jogl-applet-runner-newt.jnlp">
-</applet>Hello Gears !
+</applet>
+</P>
+
+<P>
+
+The applet above is instantiated with the following code:
+
+<pre>
+&lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+      width=200 height=200
+      archive="http://jogamp.org/deployment/jogamp-current/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/junit.jar,
+               http://jogamp.org/deployment/jogamp-current/jar/jogl.test.jar"&gt;
+   &lt;param name="codebase_lookup" value="false"&gt;
+   &lt;param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"&gt;
+   &lt;param name="subapplet.displayname" value="JOGL GearsES2 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="jnlpExtension1"
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
+   &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
+   &lt;param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2"&gt;
+   &lt;param name="gl_profile" value="GL2ES2"&gt;
+   &lt;param name="gl_swap_interval" value="1"&gt;
+   &lt;param name="gl_debug" value="false"&gt;
+   &lt;param name="gl_trace" value="false"&gt;
+   &lt;param name="jnlp_href" value="jogl-applet-runner-newt.jnlp"&gt;
+&lt;/applet&gt;
+</pre>
+
+Where the referenced JNLP file <em>jogl-applet-runner-newt.jnlp</em> looks as follow:
+
+<pre>
+&lt;?xml version="1.0" encoding="utf-8"?&gt;
+&lt;jnlp codebase="http://jogamp.org/deployment/jogamp-current" href="jogl-applet-runner-newt.jnlp" version="v2.0-rc3"&gt;
+  &lt;information&gt;
+    &lt;title&gt;JOGL JNLP Applet Runner NEWT&lt;/title&gt;
+    &lt;vendor&gt;JogAmp Community&lt;/vendor&gt;
+    &lt;homepage href="http://jogamp.org/"/&gt;
+    &lt;description&gt;JOGL JNLP Applet Runner NEWT&lt;/description&gt;
+    &lt;offline-allowed/&gt;
+  &lt;/information&gt;
+  &lt;update check="background" policy="always"/&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="jar/jogl.test.jar" main="true"/&gt;
+      &lt;jar href="jar/junit.jar" /&gt;
+      &lt;extension name="jogl-all-awt" href="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp" /&gt;
+    &lt;/resources&gt;
+
+  &lt;applet-desc 
+      name="JOGLNewtApplet1Run-Applet"
+      main-class="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"
+      width="200" 
+      height="200"&gt;
+  &lt;/applet-desc&gt;
+&lt;/jnlp&gt;
+</pre>
 
 </P>
 <P>
-JOGL NEWT JNLP Applet Runner Special Keys:<br>
-<ul>
-    <li> d - toggle decoration </li>
-    <li> f - toggle fullscreen </li>
-    <li> r - in/out browser window </li>
-    <li> a - on/off always-on-top </li>
-</ul>
+
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! JogAmp Community signs
+applet-launcher.jar, jogl.jar and gluegen-rt.jar, which contain the
+JNLPAppletLauncher and JOGL's supporting classes; this is the only
+Java code which needs to be signed in order to deploy applets using
+JOGL and is the only certificate the end user must accept.
+
+</P>
+<P>
+
+The <a href="http://jogamp.org/applet-launcher/www/">JNLPAppletLauncher
+home page</a> contains more information about what files must be
+placed on the web server in order to enable the deployment of applets
+using JOGL and other extensions.
+
 </P>
 
 </body>
diff --git a/jnlp-files/jogl-applet-runner-newt-gears-special.html b/jnlp-files/jogl-applet-runner-newt-gears-special.html
index 033d15b6f..dd979c282 100644
--- a/jnlp-files/jogl-applet-runner-newt-gears-special.html
+++ b/jnlp-files/jogl-applet-runner-newt-gears-special.html
@@ -7,7 +7,21 @@
 
 <P>
 JOGL NEWT JNLP Applet Runner Special Keys:
-<applet width=1 height=1>
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher" 
+      width=1 height=1
+      archive="jar/applet-launcher.jar,
+               jar/gluegen-rt.jar,
+               jar/jogl.all.jar,
+               jar/junit.jar,
+               jar/jogl.test.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run">
+   <param name="subapplet.displayname" value="JOGL GearsES2 Applet Transparent">
+   <param name="noddraw.check" value="true">
+   <param name="progressbar" value="true">
+   <param name="jnlpNumExtensions" value="1">
+   <param name="jnlpExtension1"
+          value="jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="gl_event_listener_class" value="com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2">
    <param name="gl_profile" value="GL2ES2">
diff --git a/jnlp-files/jogl-applet-runner-newt.jnlp b/jnlp-files/jogl-applet-runner-newt.jnlp
index 77f8c32c0..199d49196 100644
--- a/jnlp-files/jogl-applet-runner-newt.jnlp
+++ b/jnlp-files/jogl-applet-runner-newt.jnlp
@@ -18,7 +18,7 @@
     </resources>
 
   <applet-desc 
-      name="JOGLNewtApplet2Run-Applet"
+      name="JOGLNewtApplet1Run-Applet"
       main-class="com.jogamp.newt.awt.applet.JOGLNewtApplet1Run"
       width="200" 
       height="200">
diff --git a/jnlp-files/jogl-test-applets.html b/jnlp-files/jogl-test-applets.html
index e0e250722..71af89539 100644
--- a/jnlp-files/jogl-test-applets.html
+++ b/jnlp-files/jogl-test-applets.html
@@ -14,6 +14,16 @@
         <div id="logo"><a href="http://jogamp.org/"><img src="../../images/jogamp_symbols/website_final_blue_jogl_346x70pel.png" alt="JOGL Symbol"/></a></div>
     </div>
     <div id="menu">
+        <ul>
+            <li><a href="../../">Home</a></li>
+            <li><a href="../../jogl/">JOGL</a></li>
+            <li><a href="../../jogl-demos/www/">Demos</a></li>
+            <li><a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/">JavaDoc</a></li>
+            <li><a href="../../gluegen/www/">Gluegen</a></li>
+            <li><a href="../../wiki/">Wiki</a></li>
+            <li><a href="../../blog/">Blogs</a></li>
+            <li><a href="../../forum.html">Forums</a></li>
+        </ul>
     </div>
     <div id="main">
         <div id="sidebar">
@@ -57,7 +67,8 @@ See Legend below table
                 </a>
             </td>
             <td>
-                <a href="jogl-applet-runner-newt-gears-normal.html">JApplet</a><br>
+                <a href="jogl-applet-runner-newt-gears-normal.html">Dual</a><br>
+                <a href="jogl-applet-runner-newt-gears-normal-launcheronly.html">LApplet</a><br>
             </td>
             <td>
                 Classic OpenGL Gears for ES2 
@@ -71,7 +82,7 @@ See Legend below table
                 </a>
             </td>
             <td>
-                <a href="jogl-applet-runner-newt-gears-special.html">JApplet</a><br>
+                <a href="jogl-applet-runner-newt-gears-special.html">Dual</a><br>
             </td>
             <td>
                 Classic OpenGL Gears for ES2 
@@ -95,7 +106,7 @@ See Legend below table
                 </a>
             </td>
             <td>
-                <a href="jogl-applet-runner-newt-GraphTextDemo01.html">JApplet</a><br>
+                <a href="jogl-applet-runner-newt-GraphTextDemo01.html">Dual</a><br>
             </td>
             <td>
                 GPU accelerated Text Demo using JOGL's new Graph package.
@@ -108,7 +119,7 @@ See Legend below table
                 </a>
             </td>
             <td>
-                <a href="jogl-applet-runner-newt-GraphUISceneDemo01.html">JApplet</a><br>
+                <a href="jogl-applet-runner-newt-GraphUISceneDemo01.html">Dual</a><br>
             </td>
             <td>
                 Demonstration of GPU accelerated Text and UI rendering and interaction
@@ -122,7 +133,7 @@ See Legend below table
                 </a>
             </td>
             <td>
-                <a href="jogl-applet-runner-newt-ElektronenMultiplizierer.html">JApplet</a><br>
+                <a href="jogl-applet-runner-newt-ElektronenMultiplizierer.html">Dual</a><br>
             </td>
             <td>
                 Demoscene Passivist's ElektronenMultiplizierer
@@ -142,16 +153,12 @@ Click on the <i>Launch-Type</i> to actually launch the demo.<br/>
         <th align="left" ><strong>Description</strong></th>
     </tr>
     <tr>
-        <td> Applet </td>
-        <td> Traditional Applet mechanism only. </td>
-    </tr>
-    <tr>
         <td> JApplet </td>
-        <td> Applet using JNLP-Applet mechanism. </td>
+        <td> Applet using JNLP-Applet mechanism only. </td>
     </tr>
     <tr>
         <td> LApplet </td>
-        <td> Applet using JOGL's Applet Launcher mechanism. </td>
+        <td> Applet using JOGL's Applet Launcher mechanism only. </td>
     </tr>
     <tr>
         <td> Dual </td>