New FHS: jars in jar/, using jogamp-current and jogamp-next

11 files changed, 93 insertions, 110 deletions

diff --git a/www/applet-gears-next.jnlp b/www/applet-gears-next.jnlp
index 2b1f753..5e2a59c 100644
--- a/www/applet-gears-next.jnlp
+++ b/www/applet-gears-next.jnlp
@@ -12,9 +12,9 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <property name="sun.java2d.noddraw" value="true"/>
-      <jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar" main="true"/>
-      <jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos-util.jar"/>
-      <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart-next/jogl-all-awt.jnlp" />
+      <jar href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-demos.jar" main="true"/>
+      <jar href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-demos-util.jar"/>
+      <extension name="jogl-all-awt" href="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp" />
     </resources>
 
   <applet-desc 
diff --git a/www/applet-gears.jnlp b/www/applet-gears.jnlp
index dd36bc0..dae3e58 100644
--- a/www/applet-gears.jnlp
+++ b/www/applet-gears.jnlp
@@ -12,9 +12,9 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <property name="sun.java2d.noddraw" value="true"/>
-      <jar href="http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar" main="true"/>
-      <jar href="http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos-util.jar"/>
-      <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart/jogl-all-awt.jnlp" />
+      <jar href="http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-demos.jar" main="true"/>
+      <jar href="http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-demos-util.jar"/>
+      <extension name="jogl-all-awt" href="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp" />
     </resources>
 
   <applet-desc 
diff --git a/www/applet-redsquare-newtawt-next.html b/www/applet-redsquare-newtawt-next.html
index fd92358..cf8a344 100644
--- a/www/applet-redsquare-newtawt-next.html
+++ b/www/applet-redsquare-newtawt-next.html
@@ -10,12 +10,10 @@
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart-next/newt.all.jar,
-               http://jogamp.org/deployment/webstart-next/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart-next/jogl.all.jar,
-               http://jogamp.org/deployment/webstart-next/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar">
+      archive="http://jogamp.org/deployment/jogamp-next/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-demos.jar">
    <param name="codebase_lookup" value="false">
    <param name="subapplet.classname" value="demos.applets.RedSquareNEWTAWTApplet">
    <param name="subapplet.displayname" value="JOGL RedSquare NEWT-AWT Applet">
@@ -23,7 +21,7 @@
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="jnlp_href" value="applet-redsquare-newtawt-next.jnlp">
 </applet>
diff --git a/www/applet-redsquare-newtawt-next.jnlp b/www/applet-redsquare-newtawt-next.jnlp
index 686a4bd..6a2bd18 100644
--- a/www/applet-redsquare-newtawt-next.jnlp
+++ b/www/applet-redsquare-newtawt-next.jnlp
@@ -12,9 +12,9 @@
     <resources>
       <j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
       <property name="sun.java2d.noddraw" value="true"/>
-      <jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar" main="true"/>
-      <jar href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos-util.jar"/>
-      <extension name="newt-all-awt" href="http://jogamp.org/deployment/webstart-next/newt-all-awt.jnlp" />
+      <jar href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-demos.jar" main="true"/>
+      <jar href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-demos-util.jar"/>
+      <extension name="newt-all-awt" href="http://jogamp.org/deployment/jogamp-next/newt-all-awt.jnlp" />
     </resources>
 
   <applet-desc 
diff --git a/www/applettest-jnlp-next.html b/www/applettest-jnlp-next.html
index a9a3a2e..ba458e7 100644
--- a/www/applettest-jnlp-next.html
+++ b/www/applettest-jnlp-next.html
@@ -10,12 +10,10 @@
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart-next/newt.all.jar,
-               http://jogamp.org/deployment/webstart-next/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart-next/jogl.all.jar,
-               http://jogamp.org/deployment/webstart-next/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar">
+      archive="http://jogamp.org/deployment/jogamp-next/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/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">
@@ -23,7 +21,7 @@
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="jnlp_href" value="applet-gears-next.jnlp">
 </applet>
diff --git a/www/applettest-jnlp.html b/www/applettest-jnlp.html
index 2fc7013..4b0c760 100644
--- a/www/applettest-jnlp.html
+++ b/www/applettest-jnlp.html
@@ -24,12 +24,10 @@ JNLP applet's one.
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/newt.all.jar,
-               http://jogamp.org/deployment/webstart/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar">
+      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/jogl-demos/jar/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">
@@ -37,7 +35,7 @@ JNLP applet's one.
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">
    <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
    <param name="jnlp_href" value="applet-gears.jnlp">
 </applet>
@@ -51,11 +49,10 @@ The applet above is instantiated with the following code:
 &lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar"&gt;
+      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/jogl-demos/jar/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;
@@ -63,7 +60,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://jogamp.org/deployment/webstart/jogl-core.jnlp"&gt;
+          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="jnlp_href" value="applet-gears.jnlp"&gt;
 &lt;/applet&gt;
@@ -86,9 +83,9 @@ Where the referenced JNLP file <em>applet-gears.jnlp</em> looks as follow:
     &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://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar" main="true"/&gt;
-      &lt;jar href="http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos-util.jar"/&gt;
-      &lt;extension name="newt-all-awt" href="http://jogamp.org/deployment/webstart/newt-all-awt.jnlp" /&gt;
+      &lt;jar href="http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-demos.jar" main="true"/&gt;
+      &lt;jar href="http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-demos-util.jar"/&gt;
+      &lt;extension name="newt-all-awt" href="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp" /&gt;
     &lt;/resources&gt;
 
   &lt;applet-desc 
diff --git a/www/applettest-joal-next.html b/www/applettest-joal-next.html
index 48b46f8..0071b7e 100644
--- a/www/applettest-joal-next.html
+++ b/www/applettest-joal-next.html
@@ -10,13 +10,11 @@
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart-next/newt.all.jar,
-               http://jogamp.org/deployment/webstart-next/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart-next/jogl.all.jar,
-               http://jogamp.org/deployment/webstart-next/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar,
-               http://jogamp.org/deployment/webstart-next/joal.jar,
+      archive="http://jogamp.org/deployment/jogamp-next/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/joal.jar,
+               http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/jogl-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">
@@ -24,9 +22,9 @@
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
    <param name="jnlpExtension2"
-          value="http://jogamp.org/deployment/webstart-next/joal.jnlp">
+          value="http://jogamp.org/deployment/jogamp-next/joal.jnlp">
 </applet>
 
 
diff --git a/www/applettest-joal.html b/www/applettest-joal.html
index 0d97d22..303ef44 100644
--- a/www/applettest-joal.html
+++ b/www/applettest-joal.html
@@ -29,13 +29,11 @@ rendering and OpenAL audio:
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/newt.all.jar,
-               http://jogamp.org/deployment/webstart/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar,
-               http://jogamp.org/deployment/webstart/joal.jar,
+      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/joal.jar,
+               http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-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">
@@ -43,9 +41,9 @@ rendering and OpenAL audio:
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="2">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">
    <param name="jnlpExtension2"
-          value="http://jogamp.org/deployment/webstart/joal.jnlp">
+          value="http://jogamp.org/deployment/jogamp-current/joal.jnlp">
 </applet>
 
 
@@ -58,12 +56,11 @@ The applet above is instantiated with the following code:
 &lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar,
-               http://jogamp.org/deployment/webstart/joal.jar,
-               http://jogamp.org/deployment/webstart/joal-demos/joal-demos.jar"&gt;
+      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/joal.jar,
+               http://jogamp.org/deployment/jogamp-current/jogl-demos/jar/jogl-demos.jar"&gt;
    &lt;param name="codebase_lookup" value="false"&gt;
    &lt;param name="subapplet.classname" VALUE="demos.applets.GearsJOALApplet"&gt;
    &lt;param name="subapplet.displayname" VALUE="JOGL / JOAL Gears Applet"&gt;
@@ -71,9 +68,9 @@ 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://jogamp.org/deployment/webstart/jogl-core.jnlp"&gt;
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
    &lt;param name="jnlpExtension2"
-          value="http://jogamp.org/deployment/webstart/joal.jnlp"&gt;
+          value="http://jogamp.org/deployment/jogamp-current/joal.jnlp"&gt;
 &lt;/applet&gt;
 </pre>
 
diff --git a/www/applettest-next.html b/www/applettest-next.html
index 1571fd1..ffd3e64 100644
--- a/www/applettest-next.html
+++ b/www/applettest-next.html
@@ -10,12 +10,10 @@
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart-next/newt.all.jar,
-               http://jogamp.org/deployment/webstart-next/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart-next/jogl.all.jar,
-               http://jogamp.org/deployment/webstart-next/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-demos.jar">
+      archive="http://jogamp.org/deployment/jogamp-next/jar/applet-launcher.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/gluegen-rt.jar,
+               http://jogamp.org/deployment/jogamp-next/jar/jogl.all.jar,
+               http://jogamp.org/deployment/jogamp-next/jogl-demos/jar/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">
@@ -23,7 +21,7 @@
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
 </applet>
 
 
diff --git a/www/applettest.html b/www/applettest.html
index 724f42f..41bee53 100644
--- a/www/applettest.html
+++ b/www/applettest.html
@@ -23,12 +23,10 @@ as an applet:
 <applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/newt.all.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar">
+      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/jogl-demos/jar/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">
@@ -36,7 +34,7 @@ as an applet:
    <param name="progressbar" value="true">
    <param name="jnlpNumExtensions" value="1">
    <param name="jnlpExtension1"
-          value="http://jogamp.org/deployment/webstart/jogl-core.jnlp">
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">
 </applet>
 
 </P>
@@ -48,11 +46,10 @@ The applet above is instantiated with the following code:
 &lt;applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
       width=600
       height=400
-      archive="http://jogamp.org/deployment/util/applet-launcher.jar,
-               http://jogamp.org/deployment/webstart/nativewindow.all.jar,
-               http://jogamp.org/deployment/webstart/jogl.all.jar,
-               http://jogamp.org/deployment/webstart/gluegen-rt.jar,
-               http://jogamp.org/deployment/webstart/jogl-demos/jogl-demos.jar"&gt;
+      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/jogl-demos/jar/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;
@@ -60,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://jogamp.org/deployment/webstart/jogl-core.jnlp"&gt;
+          value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
 &lt;/applet&gt;
 </pre>
 
diff --git a/www/test.html b/www/test.html
index d0fd9a0..10fe4e3 100644
--- a/www/test.html
+++ b/www/test.html
@@ -2,42 +2,42 @@
 <p>
 
 <H3> Version </H3>
-<a href="../../deployment/webstart/applet-version-jnlp.html">Applet</a><br>
-<a href="../../deployment/webstart/application-version.jnlp">Application</a><br>
+<a href="../../deployment/jogamp-next/applet-version-jnlp.html">Applet</a><br>
+<a href="../../deployment/jogamp-next/application-version.jnlp">Application</a><br>
 
 <H3> AWT JNLP Applet test with Applet Launcher fallback </H3>
 <a href="applettest-jnlp-next.html">JNLP Applet test</a><br>
 <a href="applettest-next.html">Applet Launcher test</a><br>
 <p>
 <H3> AWT JNLP Applet's using NEWT/AWT </H3>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-newt-applet-runner-gears.html">AWT Applet JOGL/NEWT GL2 Gears</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-newt-applet-runner-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-newt-applet-runner-fbcubes.html">AWT Applet JOGL/NEWT GL2ES1 FBO Cubes</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">AWT Applet JOGL/NEWT GL2ES1 Angeles</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jogl-newt-applet-runner-gears.html">AWT Applet JOGL/NEWT GL2 Gears</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jogl-newt-applet-runner-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jogl-newt-applet-runner-fbcubes.html">AWT Applet JOGL/NEWT GL2ES1 FBO Cubes</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/jogl-newt-applet-runner-angelesgl2es1.html">AWT Applet JOGL/NEWT GL2ES1 Angeles</a><br>
 <p>
 <H3> JNLP Applet2's using native NEWT </H3>
 Coming up ..
 <p>
 <H3> JNLP Launcher .. </H3>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/Gears.jnlp">Gears</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/HWShadowmapsSimple.jnlp">Hardware Shadow Maps</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/HDR.jnlp">HDR</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/InfiniteShadowVolumes.jnlp">Infinite Shadow Volumes</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/JRefractNoOGL.jnlp">JRefract</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/JRefract.jnlp">JRefract with Java2D/JOGL Bridge (Java SE 6 only)</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/ParticleEngine.jnlp">Particle Engine</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/TestTextRenderer.jnlp">Text Renderer Test</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/FlyingText.jnlp">Flying Text</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/TextFlow.jnlp">Text Flow</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/TextCube.jnlp">Text Cube</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/VertexProgWarp.jnlp">Vertex Prog Warp</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/VertexProgRefract.jnlp">Vertex Prog Refract</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/ProceduralTexturePhysics.jnlp">Water</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/XTrans.jnlp">XTrans (Java SE 6 only)</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/VertexBufferObject.jnlp">Vertex Buffer Object</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/VertexArrayRange.jnlp">Vertex Array Range</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/WorldWindBasicDemo.jnlp">NASA World Wind Java (version hosted by NASA)</a><br>
-<a href="http://jogamp.org/deployment/webstart-next/jogl-demos/worldwind.jnlp">NASA World Wind Java (older version copied from NASA)</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/Gears.jnlp">Gears</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/HWShadowmapsSimple.jnlp">Hardware Shadow Maps</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/HDR.jnlp">HDR</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/InfiniteShadowVolumes.jnlp">Infinite Shadow Volumes</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/JRefractNoOGL.jnlp">JRefract</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/JRefract.jnlp">JRefract with Java2D/JOGL Bridge (Java SE 6 only)</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/ParticleEngine.jnlp">Particle Engine</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/TestTextRenderer.jnlp">Text Renderer Test</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/FlyingText.jnlp">Flying Text</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/TextFlow.jnlp">Text Flow</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/TextCube.jnlp">Text Cube</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/VertexProgWarp.jnlp">Vertex Prog Warp</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/VertexProgRefract.jnlp">Vertex Prog Refract</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/ProceduralTexturePhysics.jnlp">Water</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/XTrans.jnlp">XTrans (Java SE 6 only)</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/VertexBufferObject.jnlp">Vertex Buffer Object</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/VertexArrayRange.jnlp">Vertex Array Range</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/WorldWindBasicDemo.jnlp">NASA World Wind Java (version hosted by NASA)</a><br>
+<a href="http://jogamp.org/deployment/jogamp-next/jogl-demos/worldwind.jnlp">NASA World Wind Java (older version copied from NASA)</a><br>
 <p>
 <H3> JOAL test (broken).. </H3>
 <a href="applettest-joal-next.html">JOGL/JOAL Applet test</a><br>