Fix for JOGL2

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

1 files changed, 27 insertions, 21 deletions

diff --git a/www/index.html b/www/index.html
index 0d2f31b..34d1d8d 100644
--- a/www/index.html
+++ b/www/index.html
@@ -76,8 +76,11 @@ and  on any of Solaris/SPARC, Solaris/x86, Linux/x86, Windows/x86, and Macintosh
 
 <P> It is now possible to deploy unsigned applets using JOGL with no
 manual installation of any software on the end user's machine! Please
-see the <a href="applettest.html">JOGL applet test page</a> for more
-information. </P>
+see the following test pages for more information:
+<ul>
+    <li> <a href="applettest-jnlp.html">JNLP Applet test page (standard JNLP Applet with Applet-Launcher fallback)</a></li>
+    <li> <a href="applettest.html">Applet-Launcher only test page (pls use variant above)</a></li>
+</P>
                                                                         
                           
                   <p>The source code for these demonstrations is available 
@@ -135,7 +138,10 @@ information. </P>
 documentation</a><br>
                     </li>
 
-                    <li><a href="applettest.html">JOGL Applet test</a>
+                    <li><a href="applettest-jnlp.html">JOGL JNLP Applet test incl. Applet-Launcher fallback</a>
+                    </li>
+
+                    <li><a href="applettest.html">JOGL Applet-Launcher only test</a>
                     </li>
 
                     <li><a href="applettest-joal.html">JOGL / JOAL Applet test</a>
@@ -252,7 +258,7 @@ documentation</a><br>
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/Gears.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/Gears.jnlp">  			       <img
  src="gears_sm.jpg" width="160" height="163" alt="Launch Gears demo">
                        </a> 			       </td>
       			       <td width="45%">Classic OpenGL demo. Original source code 
@@ -381,7 +387,7 @@ by Brian Paul; converted to Java by Ron Cemer and Sven Goethel.
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/HWShadowmapsSimple.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/HWShadowmapsSimple.jnlp">
 			       <img src="shadowmaps_sm.jpg" width="160" height="160"
  alt="Launch Hardware Shadow Mapping demo">
                        </a> 			       </td>
@@ -447,7 +453,7 @@ by Brian Paul; converted to Java by Ron Cemer and Sven Goethel.
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/HDR.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/HDR.jnlp">
 			       <img src="hdr_sm.jpg" width="160" height="120"
  alt="Launch High Dynamic Range Rendering demo">
                        </a> 			       </td>
@@ -512,7 +518,7 @@ by Brian Paul; converted to Java by Ron Cemer and Sven Goethel.
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/InfiniteShadowVolumes.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/InfiniteShadowVolumes.jnlp">
    			       <img src="shadowvolumes_sm.jpg" width="160" height="161"
  alt="Launch Infinite Shadow Volumes demo">
                        </a> 			       </td>
@@ -578,7 +584,7 @@ technique  of infinite shadow volumes. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/JRefractNoOGL.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/JRefractNoOGL.jnlp">
    			       <img src="jrefract_sm.jpg" width="160" height="120"
  alt="Launch JRefract demo">
                        </a> 			       </td>
@@ -586,7 +592,7 @@ technique  of infinite shadow volumes. <a
  href="vtxprog_warp.zip">Original 
  source code</a> supplied in NVidia's <a href="http://developer.nvidia.com/object/sdk_home.html">SDK</a>.
 <P>
-If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, try the <a href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/JRefract.jnlp">fully OpenGL-accelerated version</a> of this demo using the new <a href="http://192.18.37.44/forums/index.php?topic=10813.0">Java2D/JOGL interoperability</a> support!
+If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, try the <a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/JRefract.jnlp">fully OpenGL-accelerated version</a> of this demo using the new <a href="http://192.18.37.44/forums/index.php?topic=10813.0">Java2D/JOGL interoperability</a> support!
 </td>
       			       <td width="5%"><br>
                     </td>
@@ -646,7 +652,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/ParticleEngine.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/ParticleEngine.jnlp">  			       <img
  src="particles_sm.jpg" width="160" height="129" alt="Launch Particle Engine demo">
                        </a> 			       </td>
       			       <td width="45%">Particle engine demo controlling a set of animated particles with a Swing UI. Contributed by Ben Chappell.
@@ -709,7 +715,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/TestTextRenderer.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/TestTextRenderer.jnlp">  			       <img
  src="testtext_sm.jpg" width="160" height="152" alt="Launch TestTextRenderer demo">
                        </a> 			       </td>
       			       <td width="45%">A simple test of JOGL's new TextRenderer utility class, with text overlaid on the Gears demo.
@@ -772,7 +778,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/FlyingText.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/FlyingText.jnlp">  			       <img
  src="flyingtext_sm.jpg" width="160" height="160" alt="Launch FlyingText demo">
                        </a> 			       </td>
       			       <td width="45%">A more advanced demo of the TextRenderer, showing animated and colored text with drop shadows.
@@ -835,7 +841,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/CustomText.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/CustomText.jnlp">  			       <img
  src="customtext_sm.jpg" width="160" height="160" alt="Launch CustomText demo">
                        </a> 			       </td>
       			       <td width="45%">A more advanced demo of the TextRenderer, showing the use of a custom RenderDelegate to achieve fancy Java 2D-based font effects.
@@ -898,7 +904,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/TextFlow.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/TextFlow.jnlp">  			       <img
  src="textflow_sm.jpg" width="160" height="147" alt="Launch TextFlow demo">
                        </a> 			       </td>
       			       <td width="45%">Shows how to use the TextRenderer to draw dynamically flowing text in OpenGL.
@@ -961,7 +967,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/TextCube.jnlp">  			       <img
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/TextCube.jnlp">  			       <img
  src="textcube_sm.jpg" width="160" height="176" alt="Launch TextCube demo">
                        </a> 			       </td>
       			       <td width="45%">Shows how to use the TextRenderer to draw 2D text in 3D.
@@ -1025,7 +1031,7 @@ If running on <a href="https://mustang.dev.java.net/">Java SE 6 (Mustang)</a>, t
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/VertexProgWarp.jnlp">  			 
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/VertexProgWarp.jnlp">  			 
        <img src="warp_sm.jpg" width="160" height="142"
  alt="Launch Vertex Prog Warp demo">
                        </a> 			       </td>
@@ -1092,7 +1098,7 @@ graphics  card using vertex programs. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/VertexProgRefract.jnlp">  			
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/VertexProgRefract.jnlp">  			
       <img src="refract_sm.jpg" width="160" height="161"
  alt="Launch Vertex Prog Refract demo">
                        </a> 			       </td>
@@ -1159,7 +1165,7 @@ chromatic  aberration using vertex and fragment programs. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/ProceduralTexturePhysics.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/ProceduralTexturePhysics.jnlp">
   			       <img src="water_sm.jpg" width="160" height="160"
  alt="Launch Procedural Texture Physics demo">
                        </a> 			       </td>
@@ -1226,7 +1232,7 @@ chromatic  aberration using vertex and fragment programs. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/XTrans.jnlp">
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/XTrans.jnlp">
    			       <img src="xtrans_sm.jpg" width="160" height="130"
  alt="Launch XTrans demo">
                        </a> 			       </td>
@@ -1290,7 +1296,7 @@ chromatic  aberration using vertex and fragment programs. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/VertexBufferObject.jnlp">  			 
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/VertexBufferObject.jnlp">  			 
       <img src="VertexArrayRange_sm.jpg" width="160" height="164"
  alt="Launch Vertex Buffer Object demo">
                        </a> 			       </td>
@@ -1355,7 +1361,7 @@ using ARB_vertex_buffer_object extension. <a
       			   </tr>
       			   <tr>
       			       <td width="25%"> 			       <a
- href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.x-webstart-current/VertexArrayRange.jnlp">  			 
+ href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/VertexArrayRange.jnlp">  			 
       <img src="VertexArrayRange_sm.jpg" width="160" height="164"
  alt="Launch Vertex Array Range demo">
                        </a> 			       </td>