From c1e032e22be5702fc6c34bf02317f62fb0649247 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 5 May 2010 17:25:41 +0200 Subject: Fix URLs --- java-dbg-newt.sh | 5 +-- www/applet-gears-next.jnlp | 10 +++--- www/applet-gears.jnlp | 10 +++--- www/applet-redsquare-newtawt-next.html | 12 +++---- www/applet-redsquare-newtawt-next.jnlp | 10 +++--- www/applettest-jnlp-next.html | 12 +++---- www/applettest-jnlp.html | 36 +++++++++---------- www/applettest-joal-next.html | 12 +++---- www/applettest-joal.html | 22 ++++++------ www/applettest-next.html | 12 +++---- www/applettest.html | 26 +++++++------- www/index.html | 66 ++++++++++++++-------------------- www/test.html | 46 ++++++++++++------------ 13 files changed, 133 insertions(+), 146 deletions(-) diff --git a/java-dbg-newt.sh b/java-dbg-newt.sh index 4d208bc..75e1506 100755 --- a/java-dbg-newt.sh +++ b/java-dbg-newt.sh @@ -14,9 +14,10 @@ fi if [ $CPOK -eq 0 ] ; then echo No JOGL in CLASSPATH else - # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + # D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true" + D_ARGS="-Dgluegen.debug.ProcAddressHelper=true -Dgluegen.debug.NativeLibrary=true -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" # D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all -Djogl.debug.GLSLState" - D_ARGS="-Dnativewindow.debug=all -Dnewt.debug=all" + # D_ARGS="-Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug.X11Util=true -Djogl.debug.GLDrawableFactory=true" #D_ARGS="-Dnativewindow.debug.X11Util=true" if [ $MOSX -eq 1 ] ; then diff --git a/www/applet-gears-next.jnlp b/www/applet-gears-next.jnlp index c017c4c..3fdd630 100644 --- a/www/applet-gears-next.jnlp +++ b/www/applet-gears-next.jnlp @@ -2,8 +2,8 @@ JOGL JNLP Applet Gears Demo - NEXT - Sun Microsystems, Inc. - + JogAmp Community + Gears Demo - NEXT Brian Paul's Gears demo ported to Java and JOGL. @@ -12,9 +12,9 @@ - - - + + + JOGL JNLP Applet Gears Demo - Sun Microsystems, Inc. - + JogAmp Community + Gears Demo Brian Paul's Gears demo ported to Java and JOGL. @@ -12,9 +12,9 @@ - - - + + + + archive="http://jogamp.org/deployment/util/applet-launcher.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.jar"> @@ -22,7 +22,7 @@ + value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp"> diff --git a/www/applet-redsquare-newtawt-next.jnlp b/www/applet-redsquare-newtawt-next.jnlp index 7339ab3..dc04d0a 100644 --- a/www/applet-redsquare-newtawt-next.jnlp +++ b/www/applet-redsquare-newtawt-next.jnlp @@ -2,8 +2,8 @@ JOGL JNLP Applet RedSquare NEWT-AWT Demo - NEXT - Sun Microsystems, Inc. - + JogAmp Community + RedSquare NEWT-AWT Demo - NEXT RedSquare NEWT-AWT Demo - NEXT @@ -12,9 +12,9 @@ - - - + + + + archive="http://jogamp.org/deployment/util/applet-launcher.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.jar"> @@ -22,7 +22,7 @@ + value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp"> diff --git a/www/applettest-jnlp.html b/www/applettest-jnlp.html index 43610e9..a505f23 100644 --- a/www/applettest-jnlp.html +++ b/www/applettest-jnlp.html @@ -24,11 +24,11 @@ JNLP applet's one. + 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.jar"> @@ -36,7 +36,7 @@ JNLP applet's one. + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp"> @@ -50,11 +50,11 @@ The applet above is instantiated with the following code: <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/nativewindow.all.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"> + 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.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> <param name="subapplet.displayname" value="JOGL Gears Applet"> @@ -62,7 +62,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://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"> + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp"> <param name="java_arguments" value="-Dsun.java2d.noddraw=true"> <param name="jnlp_href" value="applet-gears.jnlp"> </applet> @@ -75,8 +75,8 @@ Where the referenced JNLP file applet-gears.jnlp looks as follow: <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/"/> + <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/> @@ -85,9 +85,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://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-all-awt" href="http://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-all-awt.jnlp" /> + <jar href="http://jogamp.org/deployment/webstart/jogl-demos.jar" main="true"/> + <jar href="http://jogamp.org/deployment/webstart/jogl-demos-util.jar"/> + <extension name="jogl-all-awt" href="http://jogamp.org/deployment/webstart/jogl-all-awt.jnlp" /> </resources> <applet-desc @@ -103,7 +103,7 @@ Where the referenced JNLP file applet-gears.jnlp looks as follow:

Note that the jogl-demos.jar, which contains the GearsApplet class, -does not need to be signed! Sun Microsystems, Inc. signs +does not need to be signed! JogAmp Community 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 diff --git a/www/applettest-joal-next.html b/www/applettest-joal-next.html index f848e69..27386ec 100644 --- a/www/applettest-joal-next.html +++ b/www/applettest-joal-next.html @@ -10,11 +10,11 @@ @@ -24,7 +24,7 @@ + value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp"> diff --git a/www/applettest-joal.html b/www/applettest-joal.html index f3a6e2d..2108b84 100644 --- a/www/applettest-joal.html +++ b/www/applettest-joal.html @@ -29,11 +29,11 @@ rendering and OpenAL audio: @@ -43,7 +43,7 @@ rendering and OpenAL audio: + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp"> @@ -58,10 +58,10 @@ The applet above is instantiated with the following code: <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, + 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.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"> @@ -71,7 +71,7 @@ The applet above is instantiated with the following code: <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/jogl-core.jnlp"> + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp"> <param name="jnlpExtension2" value="http://download.java.net/media/joal/webstart/joal.jnlp"> </applet> diff --git a/www/applettest-next.html b/www/applettest-next.html index ceea7e1..9911385 100644 --- a/www/applettest-next.html +++ b/www/applettest-next.html @@ -10,11 +10,11 @@ + archive="http://jogamp.org/deployment/util/applet-launcher.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.jar"> @@ -22,7 +22,7 @@ + value="http://jogamp.org/deployment/webstart-next/jogl-core.jnlp"> diff --git a/www/applettest.html b/www/applettest.html index 3f3a010..a49a709 100644 --- a/www/applettest.html +++ b/www/applettest.html @@ -23,11 +23,11 @@ as an applet: + archive="http://jogamp.org/deployment/util/applet-launcher.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.jar"> @@ -35,7 +35,7 @@ as an applet: + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp">

@@ -47,11 +47,11 @@ The applet above is instantiated with the following code: <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/nativewindow.all.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"> + 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.jar"> <param name="codebase_lookup" value="false"> <param name="subapplet.classname" value="demos.applets.GearsApplet"> <param name="subapplet.displayname" value="JOGL Gears Applet"> @@ -59,7 +59,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://download.java.net/media/jogl/jsr-231-2.x-webstart/jogl-core.jnlp"> + value="http://jogamp.org/deployment/webstart/jogl-core.jnlp"> </applet> @@ -67,7 +67,7 @@ The applet above is instantiated with the following code:

Note that the jogl-demos.jar, which contains the GearsApplet class, -does not need to be signed! Sun Microsystems, Inc. signs +does not need to be signed! JogAmp Community 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 diff --git a/www/index.html b/www/index.html index 7ba7369..d333f8d 100644 --- a/www/index.html +++ b/www/index.html @@ -10,23 +10,9 @@ - -

@@ -90,7 +76,7 @@ see the following test pages for more information:

The source code for these demonstrations is available - via GIT.
+ via GIT.

@@ -137,8 +123,8 @@ see the following test pages for more information: