summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2011-09-15 07:50:41 +0200
committerSven Gothel <sgothel@jausoft.com>2011-09-15 07:50:41 +0200
commit926bf101da90eb450d1700d2ddc1242c9e18a2cb (patch)
tree25bb837ccb26017e4694540b20633a1f05b37c4f
parent71f8b57305caad1cce7a6c9e42b282c8d863bdb7 (diff)
cleanup www and jnlp-files folder, dropping all jnlp/html code to jnlp-files
-rw-r--r--jnlp-files/applet-gears-jnlp.html19
-rw-r--r--jnlp-files/applet-gears-launcheronly.html (renamed from www/applettest.html)12
-rw-r--r--jnlp-files/applet-gears.html (renamed from www/applettest-jnlp.html)10
-rw-r--r--jnlp-files/applet-gears.jnlp4
-rw-r--r--jnlp-files/applet-gearsjoal-jnlp.html19
-rw-r--r--jnlp-files/applet-gearsjoal-laucheronly.html (renamed from www/applettest-joal.html)20
-rw-r--r--jnlp-files/applet-gearsjoal.html84
-rw-r--r--jnlp-files/applet-gearsjoal.jnlp6
-rw-r--r--jnlp-files/applet-redsquare-newtawt.html (renamed from www/applet-redsquare-newtawt-next.html)14
-rw-r--r--jnlp-files/applet-redsquare-newtawt.jnlp26
-rw-r--r--jnlp-files/jogl-newt-applet-runner-gears.html2
-rw-r--r--jnlp-files/jogl-newt-applet-runner.jnlp12
-rw-r--r--jnlp-files/test.html78
-rw-r--r--www/applet-gears-next.jnlp26
-rw-r--r--www/applet-gears.jnlp26
-rw-r--r--www/applet-redsquare-newtawt-next.jnlp26
-rw-r--r--www/applettest-jnlp-next.html33
-rw-r--r--www/applettest-joal-next.html34
-rw-r--r--www/applettest-next.html31
-rw-r--r--www/test.html43
20 files changed, 230 insertions, 295 deletions
diff --git a/jnlp-files/applet-gears-jnlp.html b/jnlp-files/applet-gears-jnlp.html
deleted file mode 100644
index 64a16d9..0000000
--- a/jnlp-files/applet-gears-jnlp.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL JNLP Applet Gears</title>
-</head>
-<body>
-
-<P>
-
-<applet width=600 height=400>
- <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
- <param name="jnlp_href" value="applet-gears.jnlp">
-</applet>
-
-</P>
-<P>
-
-</body>
-</html>
diff --git a/www/applettest.html b/jnlp-files/applet-gears-launcheronly.html
index 41bee53..5146e43 100644
--- a/www/applettest.html
+++ b/jnlp-files/applet-gears-launcheronly.html
@@ -23,10 +23,10 @@ as an applet:
<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
width=600
height=400
- 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">
+ archive="../jar/applet-launcher.jar,
+ ../jar/gluegen-rt.jar,
+ ../jar/jogl.all.jar,
+ 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">
@@ -34,7 +34,8 @@ as an applet:
<param name="progressbar" value="true">
<param name="jnlpNumExtensions" value="1">
<param name="jnlpExtension1"
- value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">
+ value="../jogl-all-awt.jnlp">
+ <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
</applet>
</P>
@@ -58,6 +59,7 @@ The applet above is instantiated with the following code:
&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;/applet&gt;
</pre>
diff --git a/www/applettest-jnlp.html b/jnlp-files/applet-gears.html
index 4b0c760..eb27188 100644
--- a/www/applettest-jnlp.html
+++ b/jnlp-files/applet-gears.html
@@ -24,10 +24,10 @@ JNLP applet's one.
<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
width=600
height=400
- 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">
+ archive="../jar/applet-launcher.jar,
+ ../jar/gluegen-rt.jar,
+ ../jar/jogl.all.jar,
+ 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">
@@ -35,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/jogamp-current/jogl-all-awt.jnlp">
+ value="../jogl-all-awt.jnlp">
<param name="java_arguments" value="-Dsun.java2d.noddraw=true">
<param name="jnlp_href" value="applet-gears.jnlp">
</applet>
diff --git a/jnlp-files/applet-gears.jnlp b/jnlp-files/applet-gears.jnlp
index 122a9db..bb8246d 100644
--- a/jnlp-files/applet-gears.jnlp
+++ b/jnlp-files/applet-gears.jnlp
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="DEMO_CODEBASE_TAG" href="applet-gears.jnlp">
+<jnlp href="applet-gears.jnlp">
<information>
<title>JOGL JNLP Applet Gears Demo</title>
<vendor>JogAmp Community</vendor>
@@ -15,7 +15,7 @@
<property name="sun.java2d.noddraw" value="true"/>
<jar href="jar/jogl-demos.jar" main="true"/>
<jar href="jar/jogl-demos-util.jar"/>
- <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
+ <extension name="jogl-all-awt" href="../jogl-all-awt.jnlp" />
</resources>
<applet-desc
diff --git a/jnlp-files/applet-gearsjoal-jnlp.html b/jnlp-files/applet-gearsjoal-jnlp.html
deleted file mode 100644
index 01e8117..0000000
--- a/jnlp-files/applet-gearsjoal-jnlp.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL JNLP Applet GearsJOAL</title>
-</head>
-<body>
-
-<P>
-
-<applet width=600 height=400>
- <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
- <param name="jnlp_href" value="applet-gearsjoal.jnlp">
-</applet>
-
-</P>
-<P>
-
-</body>
-</html>
diff --git a/www/applettest-joal.html b/jnlp-files/applet-gearsjoal-laucheronly.html
index 303ef44..b6af723 100644
--- a/www/applettest-joal.html
+++ b/jnlp-files/applet-gearsjoal-laucheronly.html
@@ -29,11 +29,11 @@ rendering and OpenAL audio:
<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
width=600
height=400
- 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">
+ archive="../jar/applet-launcher.jar,
+ ../jar/gluegen-rt.jar,
+ ../jar/jogl.all.jar,
+ ../jar/joal.jar,
+ 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">
@@ -41,9 +41,10 @@ rendering and OpenAL audio:
<param name="progressbar" value="true">
<param name="jnlpNumExtensions" value="2">
<param name="jnlpExtension1"
- value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">
+ value="../jogl-all-awt.jnlp">
<param name="jnlpExtension2"
- value="http://jogamp.org/deployment/jogamp-current/joal.jnlp">
+ value="../joal.jnlp">
+ <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
</applet>
@@ -71,6 +72,7 @@ The applet above is instantiated with the following code:
value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
&lt;param name="jnlpExtension2"
value="http://jogamp.org/deployment/jogamp-current/joal.jnlp"&gt;
+ &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
&lt;/applet&gt;
</pre>
@@ -78,8 +80,8 @@ The applet above is instantiated with the following code:
<P>
Note that the jogl-demos.jar and joal-demos.jar files, which contain
-the applet's classes, <B>do not need to be signed</B>! Sun
-Microsystems, Inc. signs applet-launcher.jar, jogl.jar, joal.jar and
+the applet's classes, <B>do not need to be signed</B>! JogAmp Community
+signs applet-launcher.jar, jogl.jar, joal.jar and
gluegen-rt.jar, which contain the JNLPAppletLauncher, JOGL, JOAL and
supporting classes; this is the only Java code which needs to be
signed in order to deploy applets using JOGL and JOAL and is the only
diff --git a/jnlp-files/applet-gearsjoal.html b/jnlp-files/applet-gearsjoal.html
new file mode 100644
index 0000000..551d7a0
--- /dev/null
+++ b/jnlp-files/applet-gearsjoal.html
@@ -0,0 +1,84 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>JOGL JNLP Applet GearsJOAL</title>
+</head>
+<body>
+
+<P>
+
+<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
+ width=600
+ height=400
+ archive="../jar/applet-launcher.jar,
+ ../jar/gluegen-rt.jar,
+ ../jar/jogl.all.jar,
+ ../jar/joal.jar,
+ 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">
+ <param name="noddraw.check" value="true">
+ <param name="progressbar" value="true">
+ <param name="jnlpNumExtensions" value="2">
+ <param name="jnlpExtension1"
+ value="../jogl-all-awt.jnlp">
+ <param name="jnlpExtension2"
+ value="../joal.jnlp">
+ <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
+ <param name="jnlp_href" value="applet-gearsjoal.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://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;
+ &lt;param name="noddraw.check" value="true"&gt;
+ &lt;param name="progressbar" value="true"&gt;
+ &lt;param name="jnlpNumExtensions" value="2"&gt;
+ &lt;param name="jnlpExtension1"
+ value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"&gt;
+ &lt;param name="jnlpExtension2"
+ value="http://jogamp.org/deployment/jogamp-current/joal.jnlp"&gt;
+ &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
+ &lt;param name="jnlp_href" value="applet-gearsjoal.jnlp"&gt;
+&lt;/applet&gt;
+</pre>
+
+</P>
+<P>
+
+Note that the jogl-demos.jar and joal-demos.jar files, which contain
+the applet's classes, <B>do not need to be signed</B>! JogAmp Community
+signs applet-launcher.jar, jogl.jar, joal.jar and
+gluegen-rt.jar, which contain the JNLPAppletLauncher, JOGL, JOAL and
+supporting classes; this is the only Java code which needs to be
+signed in order to deploy applets using JOGL and JOAL 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/applet-gearsjoal.jnlp b/jnlp-files/applet-gearsjoal.jnlp
index 40f3d2c..c097256 100644
--- a/jnlp-files/applet-gearsjoal.jnlp
+++ b/jnlp-files/applet-gearsjoal.jnlp
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="DEMO_CODEBASE_TAG" href="applet-gearsjoal.jnlp">
+<jnlp href="applet-gearsjoal.jnlp">
<information>
<title>JOGL JNLP Applet GearsJOAL Demo</title>
<vendor>JogAmp Community</vendor>
@@ -16,8 +16,8 @@
<jar href="jar/jogl-demos.jar" main="true"/>
<jar href="jar/jogl-demos-data.jar"/>
<jar href="jar/jogl-demos-util.jar"/>
- <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
- <extension name="joal" href="JOAL_CODEBASE_TAG/joal.jnlp" />
+ <extension name="jogl-all-awt" href="../jogl-all-awt.jnlp" />
+ <extension name="joal" href="../joal.jnlp" />
</resources>
<applet-desc
diff --git a/www/applet-redsquare-newtawt-next.html b/jnlp-files/applet-redsquare-newtawt.html
index cf8a344..bf7832f 100644
--- a/www/applet-redsquare-newtawt-next.html
+++ b/jnlp-files/applet-redsquare-newtawt.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<title>JOGL JNLP Applet Test NEXT</title>
+<title>JOGL JNLP Applet Test</title>
</head>
<body>
@@ -10,10 +10,10 @@
<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
width=600
height=400
- 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">
+ archive="../jar/applet-launcher.jar,
+ ../jar/gluegen-rt.jar,
+ ../jar/jogl.all.jar,
+ 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">
@@ -21,9 +21,9 @@
<param name="progressbar" value="true">
<param name="jnlpNumExtensions" value="1">
<param name="jnlpExtension1"
- value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
+ value="../jogl-all-awt.jnlp">
<param name="java_arguments" value="-Dsun.java2d.noddraw=true">
- <param name="jnlp_href" value="applet-redsquare-newtawt-next.jnlp">
+ <param name="jnlp_href" value="applet-redsquare-newtawt.jnlp">
</applet>
</P>
diff --git a/jnlp-files/applet-redsquare-newtawt.jnlp b/jnlp-files/applet-redsquare-newtawt.jnlp
new file mode 100644
index 0000000..f184960
--- /dev/null
+++ b/jnlp-files/applet-redsquare-newtawt.jnlp
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp href="applet-redsquare-newtawt.jnlp">
+ <information>
+ <title>JOGL JNLP Applet RedSquare NEWT-AWT Demo</title>
+ <vendor>JogAmp Community</vendor>
+ <homepage href="http://jogamp.org/jogl-demos/"/>
+ <description>RedSquare NEWT-AWT Demo</description>
+ <description kind="short">RedSquare NEWT-AWT Demo</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="../jar/jogl-demos.jar" main="true"/>
+ <jar href="../jar/jogl-demos-util.jar"/>
+ <extension name="jogl-all-awt" href="../jogl-all-awt.jnlp" />
+ </resources>
+
+ <applet-desc
+ name="RedSquare-NEWT-AWT-Applet"
+ main-class="demos.applets.RedSquareNEWTAWTApplet"
+ width="640"
+ height="480">
+ </applet-desc>
+</jnlp>
diff --git a/jnlp-files/jogl-newt-applet-runner-gears.html b/jnlp-files/jogl-newt-applet-runner-gears.html
index 6da92ea..f991817 100644
--- a/jnlp-files/jogl-newt-applet-runner-gears.html
+++ b/jnlp-files/jogl-newt-applet-runner-gears.html
@@ -3,7 +3,7 @@
<head>
<title>JOGL NEWT JNLP Applet Runner - Gears</title>
</head>
-<body>
+<body BGCOLOR="#333333">
<P>
diff --git a/jnlp-files/jogl-newt-applet-runner.jnlp b/jnlp-files/jogl-newt-applet-runner.jnlp
index c3c70da..523ed59 100644
--- a/jnlp-files/jogl-newt-applet-runner.jnlp
+++ b/jnlp-files/jogl-newt-applet-runner.jnlp
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
-<jnlp codebase="DEMO_CODEBASE_TAG" href="jogl-newt-applet-runner.jnlp">
+<jnlp href="jogl-newt-applet-runner.jnlp">
<information>
<title>JOGL NEWT JNLP Applet Runner</title>
<vendor>JogAmp Community</vendor>
<homepage href="http://jogamp.org/jogl-demos/"/>
<description>JOGL NEWT JNLP Applet Runner</description>
- <offline-allowed/>
+ <!-- offline-allowed/-->
</information>
- <update check="background" policy="always"/>
+ <!-- update check="background" policy="always"/-->
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
<property name="sun.java2d.noddraw" value="true"/>
- <jar href="jar/jogl-demos.jar" main="true"/>
- <jar href="jar/jogl-demos-util.jar"/>
- <extension name="jogl-all-awt" href="JOGL_CODEBASE_TAG/jogl-all-awt.jnlp" />
+ <jar href="../jar/jogl-demos.jar" main="true"/>
+ <jar href="../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/jnlp-files/test.html b/jnlp-files/test.html
new file mode 100644
index 0000000..4ebef51
--- /dev/null
+++ b/jnlp-files/test.html
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>JOGL Demos Test Page</title>
+</head>
+<body BGCOLOR="#ffffff">
+
+<H2> Test page for JOGL demos </H2>
+
+<p>
+<H3> Version </H3>
+<ul>
+ <li><a href="../jogl-applet-version.html">Applet (JNLP/Launcher)</a></li>
+ <li><a href="../jogl-applet-version-lancheronly.html">Applet (Launcher Only)</a></li>
+ <li><a href="../jogl-application-version.jnlp">Application</a></li>
+</ul>
+</p>
+
+<p>
+<H3> AWT JNLP Applet test with Applet Launcher fallback </H3>
+<ul>
+ <li><a href="applet-gears.html">JNLP Applet test</a></li>
+ <li><a href="applet-gears-launcheronly.html">Applet Launcher test</a></li>
+</ul>
+</p>
+
+<p>
+<H3> AWT JNLP Applet's using native NEWT</H3>
+<ul>
+ <li><a href="applet-redsquare-newtawt.html">AWT Applet JOGL/NEWT RedSquare</a></li>
+</ul>
+</p>
+
+<p>
+<H3> AWT JNLP Applet's using native NEWT (JOGL NEWT Applet Runner)</H3>
+<ul>
+ <li><a href="jogl-newt-applet-runner-gears.html">AWT Applet JOGL/NEWT GL2 Gears</a></li>
+ <li><a href="jogl-newt-applet-runner-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a></li>
+ <li><a href="jogl-newt-applet-runner-fbcubes.html">AWT Applet JOGL/NEWT GL2ES1 FBO Cubes</a></li>
+ <li><a href="jogl-newt-applet-runner-angelesgl2es1.html">AWT Applet JOGL/NEWT GL2ES1 Angeles</a></li>
+</ul>
+</p>
+
+<p>
+<H3> JOAL test .. </H3>
+<ul>
+ <li><a href="applet-gearsjoal.html">JOGL/JOAL Applet test</a></li>
+ <li><a href="applet-gearsjoal-launcheronly.html">JOGL/JOAL Applet test (Launcher Only)</a></li>
+</ul>
+</p>
+
+<p>
+<H3> JNLP Launcher .. </H3>
+<ul>
+ <li><a href="Gears.jnlp">Gears</a></li>
+ <li><a href="HWShadowmapsSimple.jnlp">Hardware Shadow Maps</a></li>
+ <li><a href="HDR.jnlp">HDR</a></li>
+ <li><a href="InfiniteShadowVolumes.jnlp">Infinite Shadow Volumes</a></li>
+ <li><a href="JRefractNoOGL.jnlp">JRefract</a></li>
+ <li><a href="JRefract.jnlp">JRefract with Java2D/JOGL Bridge (Java SE 6 only)</a></li>
+ <li><a href="ParticleEngine.jnlp">Particle Engine</a></li>
+ <li><a href="TestTextRenderer.jnlp">Text Renderer Test</a></li>
+ <li><a href="FlyingText.jnlp">Flying Text</a></li>
+ <li><a href="TextFlow.jnlp">Text Flow</a></li>
+ <li><a href="TextCube.jnlp">Text Cube</a></li>
+ <li><a href="VertexProgWarp.jnlp">Vertex Prog Warp</a></li>
+ <li><a href="VertexProgRefract.jnlp">Vertex Prog Refract</a></li>
+ <li><a href="ProceduralTexturePhysics.jnlp">Water</a></li>
+ <li><a href="XTrans.jnlp">XTrans (Java SE 6 only)</a></li>
+ <li><a href="VertexBufferObject.jnlp">Vertex Buffer Object</a></li>
+ <li><a href="VertexArrayRange.jnlp">Vertex Array Range</a></li>
+ <li><a href="WorldWindBasicDemo.jnlp">NASA World Wind Java (version hosted by NASA)</a></li>
+ <li><a href="worldwind.jnlp">NASA World Wind Java (older version copied from NASA)</a></li>
+</ul>
+</p>
+
+</body>
+</html>
diff --git a/www/applet-gears-next.jnlp b/www/applet-gears-next.jnlp
deleted file mode 100644
index 5e2a59c..0000000
--- a/www/applet-gears-next.jnlp
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp href="applet-gears-next.jnlp">
- <information>
- <title>JOGL JNLP Applet Gears Demo - NEXT</title>
- <vendor>JogAmp Community</vendor>
- <homepage href="http://jogamp.org/jogl-demos/"/>
- <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://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
- 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
deleted file mode 100644
index dae3e58..0000000
--- a/www/applet-gears.jnlp
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp href="applet-gears.jnlp">
- <information>
- <title>JOGL JNLP Applet Gears Demo</title>
- <vendor>JogAmp Community</vendor>
- <homepage href="http://jogamp.org/jogl-demos/"/>
- <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://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
- name="Gears-Applet"
- main-class="demos.applets.GearsApplet"
- width="640"
- height="480">
- </applet-desc>
-</jnlp>
diff --git a/www/applet-redsquare-newtawt-next.jnlp b/www/applet-redsquare-newtawt-next.jnlp
deleted file mode 100644
index 6a2bd18..0000000
--- a/www/applet-redsquare-newtawt-next.jnlp
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp href="applet-redsquare-newtawt-next.jnlp">
- <information>
- <title>JOGL JNLP Applet RedSquare NEWT-AWT Demo - NEXT</title>
- <vendor>JogAmp Community</vendor>
- <homepage href="http://jogamp.org/jogl-demos/"/>
- <description>RedSquare NEWT-AWT Demo - NEXT</description>
- <description kind="short">RedSquare NEWT-AWT Demo - NEXT</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://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
- name="RedSquare-NEWT-AWT-Applet"
- main-class="demos.applets.RedSquareNEWTAWTApplet"
- width="640"
- height="480">
- </applet-desc>
-</jnlp>
diff --git a/www/applettest-jnlp-next.html b/www/applettest-jnlp-next.html
deleted file mode 100644
index ba458e7..0000000
--- a/www/applettest-jnlp-next.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!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://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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="1">
- <param name="jnlpExtension1"
- 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>
-
-</P>
-<P>
-
-</body>
-</html>
diff --git a/www/applettest-joal-next.html b/www/applettest-joal-next.html
deleted file mode 100644
index 0071b7e..0000000
--- a/www/applettest-joal-next.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL / JOAL Applet Test - Next JOGL Version</title>
-</head>
-<body>
-
-<P>
-
-<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width=600
- height=400
- 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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="2">
- <param name="jnlpExtension1"
- value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
- <param name="jnlpExtension2"
- value="http://jogamp.org/deployment/jogamp-next/joal.jnlp">
-</applet>
-
-
-</P>
-
-</body>
-</html>
diff --git a/www/applettest-next.html b/www/applettest-next.html
deleted file mode 100644
index ffd3e64..0000000
--- a/www/applettest-next.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL Applet Test - Next JOGL Version</title>
-</head>
-<body>
-
-<P>
-
-<applet code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width=600
- height=400
- 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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="1">
- <param name="jnlpExtension1"
- value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp">
-</applet>
-
-
-</P>
-
-</body>
-</html>
diff --git a/www/test.html b/www/test.html
deleted file mode 100644
index 10fe4e3..0000000
--- a/www/test.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<H2> Test page for JOGL demos </H2>
-<p>
-
-<H3> Version </H3>
-<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/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/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>