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
author: Sven Gothel <[email protected]> 2009-07-03 01:51:22 +0000
committer: Sven Gothel <[email protected]> 2009-07-03 01:51:22 +0000
commit: 820cc25c18c4aeb70b28eeacdecf82d98a24c08c (patch)
tree: faae753462776b67d492a9a7b41b35b0ffc07f1d
parent: 087f77772f1228e7fcf4b77eb7d7d97eb90785ba (diff)
10 files changed, 262 insertions, 77 deletions
diff --git a/www/applet-gears-next.jnlp b/www/applet-gears-next.jnlp
new file mode 100644
index 0000000..c51b7b4
--- /dev/null
+++ b/www/applet-gears-next.jnlp
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp href="applet-gears.jnlp">
+  <information>
+    <title>JOGL JNLP Applet Gears Demo - NEXT</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <description>Gears Demo - NEXT</description>
+    <description kind="short">Brian Paul's Gears demo ported to Java and JOGL.</description>
+    <offline-allowed/>
+  </information>
+
+    <resources>
+      <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
+      <property name="sun.java2d.noddraw" value="true"/>
+      <jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/jogl-demos.jar" main="true"/>
+      <jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/jogl-demos-util.jar"/>
+      <extension name="jogl-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-awt.jnlp" />
+    </resources>
+
+  <applet-desc 
+      name="Gears-Applet"
+      main-class="demos.applets.GearsApplet"
+      width="640" 
+      height="480">
+  </applet-desc>
+</jnlp>
diff --git a/www/applet-gears.jnlp b/www/applet-gears.jnlp
new file mode 100644
index 0000000..76832b9
--- /dev/null
+++ b/www/applet-gears.jnlp
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp href="applet-gears.jnlp">
+  <information>
+    <title>JOGL JNLP Applet Gears Demo</title>
+    <vendor>Sun Microsystems, Inc.</vendor>
+    <homepage href="http://jogl-demos.dev.java.net/"/>
+    <description>Gears Demo</description>
+    <description kind="short">Brian Paul's Gears demo ported to Java and JOGL.</description>
+    <offline-allowed/>
+  </information>
+
+    <resources>
+      <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
+      <property name="sun.java2d.noddraw" value="true"/>
+      <jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos.jar" main="true"/>
+      <jar href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart/jogl-demos-util.jar"/>
+      <extension name="jogl-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-awt.jnlp" />
+    </resources>
+
+  <applet-desc 
+      name="Gears-Applet"
+      main-class="demos.applets.GearsApplet"
+      width="640" 
+      height="480">
+  </applet-desc>
+</jnlp>
diff --git a/www/applettest-jnlp-next.html b/www/applettest-jnlp-next.html
new file mode 100644
index 0000000..ae80cf1
--- /dev/null
+++ b/www/applettest-jnlp-next.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>JOGL JNLP Applet Test NEXT</title>
+</head>
+<body>
+
+<P>
+
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+      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/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">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="demos.applets.GearsApplet">
+   <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="jnlpExtension1"
+          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>
+
+</P>
+<P>
+
+</body>
+</html>
diff --git a/www/applettest-jnlp.html b/www/applettest-jnlp.html
new file mode 100644
index 0000000..e18774c
--- /dev/null
+++ b/www/applettest-jnlp.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>JOGL JNLP Applet Test</title>
+</head>
+<body>
+
+<P>
+
+In case your <a href="https://jdk6.dev.java.net/plugin2/jnlp/">Java Plugin supports JNLP</a>, 
+the <em>applet-gears.jnlp</em> is used, 
+otherwise it shall fallback to <a href="http://applet-launcher.dev.java.net">JNLPAppletLauncher</a>.
+
+</P>
+<P>
+
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+      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/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">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="demos.applets.GearsApplet">
+   <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="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
+   <param name="jnlp_href" value="applet-gears.jnlp">
+</applet>
+
+</P>
+<P>
+
+The applet above is instantiated with the following code:
+
+<pre>
+&lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+      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/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;
+   &lt;param name="codebase_lookup" value="false"&gt;
+   &lt;param name="subapplet.classname" value="demos.applets.GearsApplet"&gt;
+   &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="jnlpExtension1"
+          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>
+
+</P>
+<P>
+
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! Sun Microsystems, Inc. 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://applet-launcher.dev.java.net">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/www/applettest-joal-next.html b/www/applettest-joal-next.html
index ec65d7c..3cc96ee 100644
--- a/www/applettest-joal-next.html
+++ b/www/applettest-joal-next.html
@@ -8,19 +8,27 @@
 <P>
 
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
-     width=600
-     height=400
-     archive="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/applet-launcher.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/gluegen-rt.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl-demos.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/joal.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/joal-demos.jar">
-  <param name="subapplet.classname" VALUE="demos.applets.GearsJOALApplet">
-  <param name="subapplet.displayname" VALUE="JOGL / JOAL Gears Applet">
-  <param name="progressbar" value="true">
-  <param name="jnlpNumExtensions" value="2">
-  <param name="jnlpExtension1"
-         value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl.jnlp">
-  <param name="jnlpExtension2"
-         value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/joal.jnlp">
+      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/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,
+               http://download.java.net/media/joal/webstart/joal.jar,
+               http://download.java.net/media/joal/webstart/joal-demos.jar">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" VALUE="demos.applets.GearsJOALApplet">
+   <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="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
+   <param name="jnlpExtension2"
+          value="http://download.java.net/media/joal/webstart/joal.jnlp">
 </applet>
 
+
 </P>
 
 </body>
diff --git a/www/applettest-joal.html b/www/applettest-joal.html
index 0c770de..6a3d517 100644
--- a/www/applettest-joal.html
+++ b/www/applettest-joal.html
@@ -30,9 +30,9 @@ 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/builds/archive/jsr-231-webstart-current/jogl.jar,
-               http://download.java.net/media/gluegen/webstart/gluegen-rt.jar,
-               http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl-demos.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,
                http://download.java.net/media/joal/webstart/joal.jar,
                http://download.java.net/media/joal/webstart/joal-demos.jar">
    <param name="codebase_lookup" value="false">
@@ -42,11 +42,12 @@ rendering and OpenAL audio:
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp">
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
    <param name="jnlpExtension2"
           value="http://download.java.net/media/joal/webstart/joal.jnlp">
 </applet>
 
+
 </P>
 <P>
 
@@ -57,9 +58,9 @@ 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/builds/archive/jsr-231-webstart-current/jogl.jar,
-               http://download.java.net/media/gluegen/webstart/gluegen-rt.jar,
-               http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl-demos.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,
                http://download.java.net/media/joal/webstart/joal.jar,
                http://download.java.net/media/joal/webstart/joal-demos.jar"&gt;
    &lt;param name="codebase_lookup" value="false"&gt;
@@ -69,7 +70,7 @@ The applet above is instantiated with the following code:
    &lt;param name="progressbar" value="true"&gt;
    &lt;param name="jnlpNumExtensions" value="2"&gt;
    &lt;param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp"&gt;
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"&gt;
    &lt;param name="jnlpExtension2"
           value="http://download.java.net/media/joal/webstart/joal.jnlp"&gt;
 &lt;/applet&gt;
diff --git a/www/applettest-next.html b/www/applettest-next.html
index 72fd7ef..227dd13 100644
--- a/www/applettest-next.html
+++ b/www/applettest-next.html
@@ -8,18 +8,23 @@
 <P>
 
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
-     width=600
-     height=400
-     archive="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/applet-launcher.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/gluegen-rt.jar,http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl-demos.jar">
-  <param name="subapplet.classname" value="demos.applets.GearsApplet">
-  <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="jnlpExtension1"
-         value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/jogl.jnlp">
+      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/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">
+   <param name="codebase_lookup" value="false">
+   <param name="subapplet.classname" value="demos.applets.GearsApplet">
+   <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="jnlpExtension1"
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart-next/jogl-core.jnlp">
 </applet>
 
+
 </P>
 
 </body>
diff --git a/www/applettest.html b/www/applettest.html
index 5b80c8f..d44a908 100644
--- a/www/applettest.html
+++ b/www/applettest.html
@@ -24,9 +24,9 @@ as an applet:
       width=600
       height=400
       archive="http://download.java.net/media/applet-launcher/applet-launcher.jar,
-               http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jar,
-               http://download.java.net/media/gluegen/webstart/gluegen-rt.jar,
-               http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl-demos.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">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="demos.applets.GearsApplet">
    <param name="subapplet.displayname" value="JOGL Gears Applet">
@@ -34,7 +34,7 @@ as an applet:
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp">
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp">
 </applet>
 
 </P>
@@ -47,9 +47,9 @@ 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/builds/archive/jsr-231-webstart-current/jogl.jar,
-               http://download.java.net/media/gluegen/webstart/gluegen-rt.jar,
-               http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl-demos.jar"&gt;
+               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;
    &lt;param name="codebase_lookup" value="false"&gt;
    &lt;param name="subapplet.classname" value="demos.applets.GearsApplet"&gt;
    &lt;param name="subapplet.displayname" value="JOGL Gears Applet"&gt;
@@ -57,7 +57,7 @@ The applet above is instantiated with the following code:
    &lt;param name="progressbar" value="true"&gt;
    &lt;param name="jnlpNumExtensions" value="1"&gt;
    &lt;param name="jnlpExtension1"
-          value="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp"&gt;
+          value="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"&gt;
 &lt;/applet&gt;
 </pre>
 
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>
diff --git a/www/test.html b/www/test.html
index 380360a..64f321b 100644
--- a/www/test.html
+++ b/www/test.html
@@ -1,23 +1,23 @@
 <H2> Test page for JOGL demos </H2>
 
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/Gears.jnlp">Gears</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/HWShadowmapsSimple.jnlp">Hardware Shadow Maps</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/HDR.jnlp">HDR</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/InfiniteShadowVolumes.jnlp">Infinite Shadow Volumes</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/JRefractNoOGL.jnlp">JRefract</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/JRefract.jnlp">JRefract with Java2D/JOGL Bridge (Java SE 6 only)</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/ParticleEngine.jnlp">Particle Engine</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/TestTextRenderer.jnlp">Text Renderer Test</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/FlyingText.jnlp">Flying Text</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/TextFlow.jnlp">Text Flow</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/TextCube.jnlp">Text Cube</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/VertexProgWarp.jnlp">Vertex Prog Warp</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/VertexProgRefract.jnlp">Vertex Prog Refract</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/ProceduralTexturePhysics.jnlp">Water</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/XTrans.jnlp">XTrans (Java SE 6 only)</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/VertexBufferObject.jnlp">Vertex Buffer Object</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/VertexArrayRange.jnlp">Vertex Array Range</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/WorldWindBasicDemo.jnlp">NASA World Wind Java (version hosted by NASA)</a><br>
-<a href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-next/worldwind.jnlp">NASA World Wind Java (older version copied from NASA)</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/Gears.jnlp">Gears</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/HWShadowmapsSimple.jnlp">Hardware Shadow Maps</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/HDR.jnlp">HDR</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/InfiniteShadowVolumes.jnlp">Infinite Shadow Volumes</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/JRefractNoOGL.jnlp">JRefract</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/JRefract.jnlp">JRefract with Java2D/JOGL Bridge (Java SE 6 only)</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/ParticleEngine.jnlp">Particle Engine</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/TestTextRenderer.jnlp">Text Renderer Test</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/FlyingText.jnlp">Flying Text</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/TextFlow.jnlp">Text Flow</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/TextCube.jnlp">Text Cube</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/VertexProgWarp.jnlp">Vertex Prog Warp</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/VertexProgRefract.jnlp">Vertex Prog Refract</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/ProceduralTexturePhysics.jnlp">Water</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/XTrans.jnlp">XTrans (Java SE 6 only)</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/VertexBufferObject.jnlp">Vertex Buffer Object</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/VertexArrayRange.jnlp">Vertex Array Range</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/WorldWindBasicDemo.jnlp">NASA World Wind Java (version hosted by NASA)</a><br>
+<a href="http://download.java.net/media/jogl/jsr-231-2.x-demos-webstart-next/worldwind.jnlp">NASA World Wind Java (older version copied from NASA)</a><br>
 <a href="applettest-next.html">Applet test</a><br>
 <a href="applettest-joal-next.html">JOGL/JOAL Applet test</a><br>
author	Sven Gothel <[email protected]>	2009-07-03 01:51:22 +0000
committer	Sven Gothel <[email protected]>	2009-07-03 01:51:22 +0000
commit	820cc25c18c4aeb70b28eeacdecf82d98a24c08c (patch)
tree	faae753462776b67d492a9a7b41b35b0ffc07f1d
parent	087f77772f1228e7fcf4b77eb7d7d97eb90785ba (diff)