From 5960d7e22807902d9712869f9c5bce0ff95eb4a1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 13 Sep 2011 23:44:05 +0200 Subject: New FHS: jars in jar/, using jogamp-current and jogamp-next --- www/applet-gears-next.jnlp | 6 ++-- www/applet-gears.jnlp | 6 ++-- www/applet-redsquare-newtawt-next.html | 12 ++++---- www/applet-redsquare-newtawt-next.jnlp | 6 ++-- www/applettest-jnlp-next.html | 12 ++++---- www/applettest-jnlp.html | 29 +++++++++----------- www/applettest-joal-next.html | 16 +++++------ www/applettest-joal.html | 31 ++++++++++----------- www/applettest-next.html | 12 ++++---- www/applettest.html | 23 +++++++--------- www/test.html | 50 +++++++++++++++++----------------- 11 files changed, 93 insertions(+), 110 deletions(-) (limited to 'www') 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 @@ - - - + + + - - - + + + + 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"> @@ -23,7 +21,7 @@ + value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp"> 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 @@ - - - + + + + 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"> @@ -23,7 +21,7 @@ + value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp"> 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. + 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"> @@ -37,7 +35,7 @@ JNLP applet's one. + value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"> @@ -51,11 +49,10 @@ The applet above is instantiated with the following code: <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"> + 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"> @@ -63,7 +60,7 @@ The applet above is instantiated with the following code: <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> @@ -86,9 +83,9 @@ Where the referenced JNLP file applet-gears.jnlp looks as follow: <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="newt-all-awt" href="http://jogamp.org/deployment/webstart/newt-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="newt-all-awt" href="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp" /> </resources> <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 @@ @@ -24,9 +22,9 @@ + value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp"> + value="http://jogamp.org/deployment/jogamp-next/joal.jnlp"> 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: @@ -43,9 +41,9 @@ rendering and OpenAL audio: + value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp"> + value="http://jogamp.org/deployment/jogamp-current/joal.jnlp"> @@ -58,12 +56,11 @@ The applet above is instantiated with the following code: <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"> + 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"> @@ -71,9 +68,9 @@ The applet above is instantiated with the following code: <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> 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 @@ + 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"> @@ -23,7 +21,7 @@ + value="http://jogamp.org/deployment/jogamp-next/jogl-all-awt.jnlp"> 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: + 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"> @@ -36,7 +34,7 @@ as an applet: + value="http://jogamp.org/deployment/jogamp-current/jogl-all-awt.jnlp">

@@ -48,11 +46,10 @@ The applet above is instantiated with the following code: <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"> + 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"> @@ -60,7 +57,7 @@ The applet above is instantiated with the following code: <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> 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 @@

Version

-Applet
-Application
+Applet
+Application

AWT JNLP Applet test with Applet Launcher fallback

JNLP Applet test
Applet Launcher test

AWT JNLP Applet's using NEWT/AWT

-AWT Applet JOGL/NEWT GL2 Gears
-AWT Applet JOGL/NEWT GL2ES1 Cube
-AWT Applet JOGL/NEWT GL2ES1 FBO Cubes
-AWT Applet JOGL/NEWT GL2ES1 Angeles
+AWT Applet JOGL/NEWT GL2 Gears
+AWT Applet JOGL/NEWT GL2ES1 Cube
+AWT Applet JOGL/NEWT GL2ES1 FBO Cubes
+AWT Applet JOGL/NEWT GL2ES1 Angeles

JNLP Applet2's using native NEWT

Coming up ..

JNLP Launcher ..

-Gears
-Hardware Shadow Maps
-HDR
-Infinite Shadow Volumes
-JRefract
-JRefract with Java2D/JOGL Bridge (Java SE 6 only)
-Particle Engine
-Text Renderer Test
-Flying Text
-Text Flow
-Text Cube
-Vertex Prog Warp
-Vertex Prog Refract
-Water
-XTrans (Java SE 6 only)
-Vertex Buffer Object
-Vertex Array Range
-NASA World Wind Java (version hosted by NASA)
-NASA World Wind Java (older version copied from NASA)
+Gears
+Hardware Shadow Maps
+HDR
+Infinite Shadow Volumes
+JRefract
+JRefract with Java2D/JOGL Bridge (Java SE 6 only)
+Particle Engine
+Text Renderer Test
+Flying Text
+Text Flow
+Text Cube
+Vertex Prog Warp
+Vertex Prog Refract
+Water
+XTrans (Java SE 6 only)
+Vertex Buffer Object
+Vertex Array Range
+NASA World Wind Java (version hosted by NASA)
+NASA World Wind Java (older version copied from NASA)

JOAL test (broken)..

JOGL/JOAL Applet test
-- cgit v1.2.3