summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2014-01-22 10:24:38 +0100
committerSven Gothel <sgothel@jausoft.com>2014-01-22 10:24:38 +0100
commit971190d8718bb1e2b7eafdd49cfa2523dd8a8152 (patch)
tree9b97c08633b323d23eea6ea6d9b185f13ec3341a
parent1eb0c1c14240f1e8c1dfbf8493c589f8dba4c4b6 (diff)
Adapt to Oracle's removal of the Java Applet Sandbox, i.e. >= 7u51 ; Remove reference to JNLPAppletLauncher - use NApplet fallback
Sadly, due to Oracle's Java Applet Plugin update 7u51, unsigned applets are no more allowed and hence the Applet sandbox is being taken away.
-rw-r--r--jnlp-files/CustomText.jnlp3
-rw-r--r--jnlp-files/FlyingText.jnlp3
-rwxr-xr-xjnlp-files/Gears.jnlp3
-rwxr-xr-xjnlp-files/GearsDebug.jnlp3
-rwxr-xr-xjnlp-files/HDR.jnlp3
-rwxr-xr-xjnlp-files/HDRDebug.jnlp3
-rw-r--r--jnlp-files/HWShadowmapsSimple.jnlp3
-rw-r--r--jnlp-files/InfiniteShadowVolumes.jnlp3
-rw-r--r--jnlp-files/JRefract.jnlp3
-rw-r--r--jnlp-files/JRefractNoOGL.jnlp3
-rw-r--r--jnlp-files/ParticleEngine.jnlp3
-rw-r--r--jnlp-files/ProceduralTexturePhysics.jnlp3
-rw-r--r--jnlp-files/TestTextRenderer.jnlp3
-rw-r--r--jnlp-files/TextCube.jnlp3
-rw-r--r--jnlp-files/TextCubeDebug.jnlp3
-rw-r--r--jnlp-files/TextFlow.jnlp3
-rw-r--r--jnlp-files/VertexArrayRange.jnlp3
-rw-r--r--jnlp-files/VertexBufferObject.jnlp3
-rw-r--r--jnlp-files/VertexProgRefract.jnlp3
-rw-r--r--jnlp-files/VertexProgWarp.jnlp3
-rw-r--r--jnlp-files/WorldWindBasicDemo.jnlp6
-rw-r--r--jnlp-files/XTrans.jnlp3
-rw-r--r--jnlp-files/applet-gears-debug.html28
-rw-r--r--jnlp-files/applet-gears-debug.jnlp3
-rw-r--r--jnlp-files/applet-gears-launcheronly.html128
-rw-r--r--jnlp-files/applet-gears-napplet.html51
-rw-r--r--jnlp-files/applet-gears.html112
-rw-r--r--jnlp-files/applet-gears.jnlp4
-rw-r--r--jnlp-files/applet-gearsjoal-launcheronly.html142
-rw-r--r--jnlp-files/applet-gearsjoal-napplet.html19
-rw-r--r--jnlp-files/applet-gearsjoal.html108
-rw-r--r--jnlp-files/applet-gearsjoal.jnlp3
-rw-r--r--jnlp-files/test.html25
-rw-r--r--jnlp-files/version.jnlp3
-rw-r--r--jnlp-files/worldwind.jnlp6
-rw-r--r--make/build.xml24
-rwxr-xr-xmake/scripts/make.jogl.all.x86_64.sh3
-rw-r--r--manifest.mf5
-rw-r--r--www/index.html11
39 files changed, 234 insertions, 510 deletions
diff --git a/jnlp-files/CustomText.jnlp b/jnlp-files/CustomText.jnlp
index 1a10367..9232ab5 100644
--- a/jnlp-files/CustomText.jnlp
+++ b/jnlp-files/CustomText.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/FlyingText.jnlp b/jnlp-files/FlyingText.jnlp
index bdbdf54..9c3b303 100644
--- a/jnlp-files/FlyingText.jnlp
+++ b/jnlp-files/FlyingText.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/Gears.jnlp b/jnlp-files/Gears.jnlp
index 3b0da3a..b677d2e 100755
--- a/jnlp-files/Gears.jnlp
+++ b/jnlp-files/Gears.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/GearsDebug.jnlp b/jnlp-files/GearsDebug.jnlp
index 1495ab4..3be3340 100755
--- a/jnlp-files/GearsDebug.jnlp
+++ b/jnlp-files/GearsDebug.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/HDR.jnlp b/jnlp-files/HDR.jnlp
index 8685065..c3ab8af 100755
--- a/jnlp-files/HDR.jnlp
+++ b/jnlp-files/HDR.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/HDRDebug.jnlp b/jnlp-files/HDRDebug.jnlp
index d49f92c..4f494f1 100755
--- a/jnlp-files/HDRDebug.jnlp
+++ b/jnlp-files/HDRDebug.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/HWShadowmapsSimple.jnlp b/jnlp-files/HWShadowmapsSimple.jnlp
index 51af1b8..6b9aa40 100644
--- a/jnlp-files/HWShadowmapsSimple.jnlp
+++ b/jnlp-files/HWShadowmapsSimple.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/InfiniteShadowVolumes.jnlp b/jnlp-files/InfiniteShadowVolumes.jnlp
index ff1d3a2..fdbd021 100644
--- a/jnlp-files/InfiniteShadowVolumes.jnlp
+++ b/jnlp-files/InfiniteShadowVolumes.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/JRefract.jnlp b/jnlp-files/JRefract.jnlp
index 8f63eee..a286273 100644
--- a/jnlp-files/JRefract.jnlp
+++ b/jnlp-files/JRefract.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/JRefractNoOGL.jnlp b/jnlp-files/JRefractNoOGL.jnlp
index dbc8905..a259182 100644
--- a/jnlp-files/JRefractNoOGL.jnlp
+++ b/jnlp-files/JRefractNoOGL.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/ParticleEngine.jnlp b/jnlp-files/ParticleEngine.jnlp
index e6ae8ce..3c15973 100644
--- a/jnlp-files/ParticleEngine.jnlp
+++ b/jnlp-files/ParticleEngine.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/ProceduralTexturePhysics.jnlp b/jnlp-files/ProceduralTexturePhysics.jnlp
index c5c8bd0..124edac 100644
--- a/jnlp-files/ProceduralTexturePhysics.jnlp
+++ b/jnlp-files/ProceduralTexturePhysics.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/TestTextRenderer.jnlp b/jnlp-files/TestTextRenderer.jnlp
index d08622d..0493e19 100644
--- a/jnlp-files/TestTextRenderer.jnlp
+++ b/jnlp-files/TestTextRenderer.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/TextCube.jnlp b/jnlp-files/TextCube.jnlp
index ef55d33..31edc8c 100644
--- a/jnlp-files/TextCube.jnlp
+++ b/jnlp-files/TextCube.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/TextCubeDebug.jnlp b/jnlp-files/TextCubeDebug.jnlp
index e54aeb1..0688557 100644
--- a/jnlp-files/TextCubeDebug.jnlp
+++ b/jnlp-files/TextCubeDebug.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/TextFlow.jnlp b/jnlp-files/TextFlow.jnlp
index 63bcc86..1427505 100644
--- a/jnlp-files/TextFlow.jnlp
+++ b/jnlp-files/TextFlow.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/VertexArrayRange.jnlp b/jnlp-files/VertexArrayRange.jnlp
index aa90f65..72f669d 100644
--- a/jnlp-files/VertexArrayRange.jnlp
+++ b/jnlp-files/VertexArrayRange.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/VertexBufferObject.jnlp b/jnlp-files/VertexBufferObject.jnlp
index febb732..f7c7526 100644
--- a/jnlp-files/VertexBufferObject.jnlp
+++ b/jnlp-files/VertexBufferObject.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/VertexProgRefract.jnlp b/jnlp-files/VertexProgRefract.jnlp
index 887d00c..124ef47 100644
--- a/jnlp-files/VertexProgRefract.jnlp
+++ b/jnlp-files/VertexProgRefract.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/VertexProgWarp.jnlp b/jnlp-files/VertexProgWarp.jnlp
index 7374ae4..8c9a71c 100644
--- a/jnlp-files/VertexProgWarp.jnlp
+++ b/jnlp-files/VertexProgWarp.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/WorldWindBasicDemo.jnlp b/jnlp-files/WorldWindBasicDemo.jnlp
index 14fea2d..810779b 100644
--- a/jnlp-files/WorldWindBasicDemo.jnlp
+++ b/jnlp-files/WorldWindBasicDemo.jnlp
@@ -11,9 +11,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
- <security>
- <all-permissions/>
- </security>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+"
diff --git a/jnlp-files/XTrans.jnlp b/jnlp-files/XTrans.jnlp
index 5d4e4da..0cad96e 100644
--- a/jnlp-files/XTrans.jnlp
+++ b/jnlp-files/XTrans.jnlp
@@ -10,6 +10,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/applet-gears-debug.html b/jnlp-files/applet-gears-debug.html
index f1b3790..4b5ec5f 100644
--- a/jnlp-files/applet-gears-debug.html
+++ b/jnlp-files/applet-gears-debug.html
@@ -5,42 +5,24 @@
</head>
<body>
-JOGL JNLP Applet Test w/ JNLPAppletLauncher fallback and debug
+JOGL JNLP Applet Test w/ NApplet fallback and debug
<P>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="600" height="400">
- <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher">
- <param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ <param name="code" value="demos.applets.GearsApplet">
+ <param name="archive" value="../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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="1">
- <param name="jnlpExtension1" value="../jogl-all-awt.jnlp">
- <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
<param name="jnlp_href" value="applet-gears-debug.jnlp">
<comment>
- <embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
+ <embed code="demos.applets.GearsApplet"
width="600" height="400"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ archive="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsApplet"
- subapplet.displayname" value="JOGL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="1"
- jnlpExtension1="../jogl-all-awt.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"
jnlp_href="applet-gears-debug.jnlp">
<noembed>Sorry, no Java support detected.</noembed>
</embed>
diff --git a/jnlp-files/applet-gears-debug.jnlp b/jnlp-files/applet-gears-debug.jnlp
index f188997..a87db59 100644
--- a/jnlp-files/applet-gears-debug.jnlp
+++ b/jnlp-files/applet-gears-debug.jnlp
@@ -9,6 +9,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/applet-gears-launcheronly.html b/jnlp-files/applet-gears-launcheronly.html
deleted file mode 100644
index 04a1ce3..0000000
--- a/jnlp-files/applet-gears-launcheronly.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL Applet Test</title>
-</head>
-<body>
-
-<P>
-
-The new <a
-href="http://jogamp.org/applet-launcher/www/">JNLPAppletLauncher</a>
-enables the creation and deployment of applets using 3D graphics via
-OpenGL without requiring the applet to be signed or performing any
-manual installation of software on users' computers. It has been
-tested and should work on any OS/CPU combination supported by JOGL
-with a Java Runtime Environment version 1.4.2 or later installed into
-the web browser. Here is an example of the standard Gears demo running
-as an applet:
-
-</P>
-<P>
-
-<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="600" height="400">
- <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher">
- <param name="archive" value="../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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="1">
- <param name="jnlpExtension1"
- value="../jogl-all-awt.jnlp">
- <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
- <comment>
- <embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width="600" height="400"
- type="application/x-java-applet;version=1.6"
- pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsApplet"
- subapplet.displayname" value="JOGL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="1"
- jnlpExtension1="../jogl-all-awt.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true">
- <noembed>Sorry, no Java support detected.</noembed>
- </embed>
- </comment>
-</object>
-
-
-</P>
-<P>
-
-The applet above is instantiated with the following code:
-
-<pre>
-&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="600" height="400"&gt;
- &lt;param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"&gt;
- &lt;param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- 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;
- &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="../jogl-all-awt.jnlp"&gt;
- &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
- &lt;comment&gt;
- &lt;embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width="600" height="400"
- type="application/x-java-applet;version=1.6"
- pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsApplet"
- subapplet.displayname" value="JOGL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="1"
- jnlpExtension1="../jogl-all-awt.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"&gt;
- &lt;noembed&gt;Sorry, no Java support detected.&lt;/noembed&gt;
- &lt;/embed&gt;
- &lt;/comment&gt;
-&lt;/object&gt;
-</pre>
-
-</P>
-<P>
-
-Note that the jogl-demos.jar, which contains the GearsApplet class,
-<B>does not need to be signed</B>! 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
-JOGL 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-gears-napplet.html b/jnlp-files/applet-gears-napplet.html
index 4d7f033..cb984bf 100644
--- a/jnlp-files/applet-gears-napplet.html
+++ b/jnlp-files/applet-gears-napplet.html
@@ -5,8 +5,10 @@
</head>
<body>
-JOGL NApplet Gears
-<P>
+<p>
+The Applet is launched as an <a href="http://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplet</a>.
+</p>
+<p>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="600" height="400">
@@ -27,17 +29,46 @@ JOGL NApplet Gears
</comment>
</object>
-</P>
+</p>
+
+<p>
-<P>
+The applet above is instantiated with the following code:
-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 jogl, joal and gluegen JAR files, which contain 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.
+<pre>
+&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
+ width="600" height="400"&gt;
+ &lt;param name="code" value="demos.applets.GearsApplet"&gt;
+ &lt;param name="archive" value="../jar/gluegen-rt.jar,
+ ../jar/jogl-all.jar,
+ jar/jogl-demos.jar"&gt;
+ &lt;comment&gt;
+ &lt;embed code="demos.applets.GearsApplet"
+ width="600" height="400"
+ type="application/x-java-applet;version=1.6"
+ pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
+ archive="../jar/gluegen-rt.jar,
+ ../jar/jogl-all.jar,
+ jar/jogl-demos.jar"&gt;
+ &lt;noembed&gt;Sorry, no Java support detected.&lt;/noembed&gt;
+ &lt;/embed&gt;
+ &lt;/comment&gt;
+&lt;/object&gt;
+</pre>
+</p>
+<p>
+<del>
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! JogAmp Community signs
+jogl.jar and gluegen-rt.jar, which contain the
+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.
+</del><br/>
+Sadly, due to Oracle's Java Applet Plugin update 7u51,
+unsigned applets are no more allowed and hence the
+Applet sandbox is being taken away.
</P>
</body>
diff --git a/jnlp-files/applet-gears.html b/jnlp-files/applet-gears.html
index df5f207..94f563f 100644
--- a/jnlp-files/applet-gears.html
+++ b/jnlp-files/applet-gears.html
@@ -5,55 +5,37 @@
</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://jogamp.org/applet-launcher/www/">JNLPAppletLauncher</a>.
-</P>
+<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://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplets</a>.
+</p>
-<P>
+<p>
Note that it is important for the startup time to have the same JVM arguments in the applet tags,
as well as within the JNLP applet description, here see property <em>sun.java2d.noddraw</em>. <br>
Only if JVM arguments of the JNLP applet description are satisfied by the applet tag's JVM,<br>
the plugin will not need to start a new JVM. OF course, the applet tag's JVM spec may exceed the
JNLP applet's one.
-</P>
+</p>
-<P>
+<p>
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="600" height="400">
- <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher">
- <param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ <param name="code" value="demos.applets.GearsApplet">
+ <param name="archive" value="../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">
- <param name="noddraw.check" value="true">
- <param name="progressbar" value="true">
- <param name="jnlpNumExtensions" value="1">
- <param name="jnlpExtension1" value="../jogl-all-awt.jnlp">
- <param name="java_arguments" value="-Dsun.java2d.noddraw=true">
<param name="jnlp_href" value="applet-gears.jnlp">
<comment>
- <embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
+ <embed code="demos.applets.GearsApplet"
width="600" height="400"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ archive="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsApplet"
- subapplet.displayname" value="JOGL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="1"
- jnlpExtension1="../jogl-all-awt.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"
jnlp_href="applet-gears.jnlp">
<noembed>Sorry, no Java support detected.</noembed>
</embed>
@@ -61,50 +43,34 @@ JNLP applet's one.
</object>
-</P>
-<P>
+</p>
+<p>
The applet above is instantiated with the following code:
<pre>
+
&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="600" height="400"&gt;
- &lt;param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"&gt;
- &lt;param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ &lt;param name="code" value="demos.applets.GearsApplet"&gt;
+ &lt;param name="archive" value="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
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;
- &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="../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;comment&gt;
- &lt;embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
+ &lt;embed code="demos.applets.GearsApplet"
width="600" height="400"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ archive="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsApplet"
- subapplet.displayname" value="JOGL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="1"
- jnlpExtension1="../jogl-all-awt.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"
jnlp_href="applet-gears.jnlp"&gt;
&lt;noembed&gt;Sorry, no Java support detected.&lt;/noembed&gt;
&lt;/embed&gt;
&lt;/comment&gt;
&lt;/object&gt;
+
</pre>
Where the referenced JNLP file <em>applet-gears.jnlp</em> looks as follow:
@@ -116,17 +82,22 @@ Where the referenced JNLP file <em>applet-gears.jnlp</em> looks as follow:
&lt;title&gt;JOGL JNLP Applet Gears Demo&lt;/title&gt;
&lt;vendor&gt;JogAmp Community&lt;/vendor&gt;
&lt;homepage href="http://jogamp.org/jogl-demos/"/&gt;
- &lt;description&gt;Gears Demo&lt;/description&gt;
+ &lt;description&gt;Gears Demo &lt;/description&gt;
&lt;description kind="short"&gt;Brian Paul's Gears demo ported to Java and JOGL.&lt;/description&gt;
&lt;offline-allowed/&gt;
&lt;/information&gt;
+ &lt;update check="background" policy="always"/&gt;
+ &lt;security&gt;
+ &lt;all-permissions/&gt;
+ &lt;/security&gt;
+
&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/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;jar href="jar/jogl-demos.jar" main="true"/&gt;
+ &lt;jar href="jar/jogl-demos-util.jar"/&gt;
+ &lt;extension name="jogl-all-awt" href="../jogl-all-awt.jnlp" /&gt;
&lt;/resources&gt;
&lt;applet-desc
@@ -138,25 +109,20 @@ Where the referenced JNLP file <em>applet-gears.jnlp</em> looks as follow:
&lt;/jnlp&gt;
</pre>
-</P>
-<P>
-
+</p>
+<p>
+<del>
Note that the jogl-demos.jar, which contains the GearsApplet class,
<B>does not need to be signed</B>! 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
+jogl-all.jar and gluegen-rt.jar, which contain the
+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://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>
+</del><br/>
+Sadly, due to Oracle's Java Applet Plugin update 7u51,
+unsigned applets are no more allowed and hence the
+Applet sandbox is being taken away.
+</p>
</body>
</html>
diff --git a/jnlp-files/applet-gears.jnlp b/jnlp-files/applet-gears.jnlp
index bb8246d..47dbcab 100644
--- a/jnlp-files/applet-gears.jnlp
+++ b/jnlp-files/applet-gears.jnlp
@@ -9,6 +9,10 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
+
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/applet-gearsjoal-launcheronly.html b/jnlp-files/applet-gearsjoal-launcheronly.html
deleted file mode 100644
index e225aed..0000000
--- a/jnlp-files/applet-gearsjoal-launcheronly.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>JOGL / JOAL Applet Test</title>
-</head>
-<body>
-
-<P>
-
-The new <a
-href="http://jogamp.org/applet-launcher/www/">JNLPAppletLauncher</a>
-supports deployment of high-end applets using arbitrary extensions
-such as JOGL for 3D graphics and JOAL for spatialized audio. The
-user's applet does not have to be signed, and no manual installation
-of software on the user's machine is necessary. Combined JOGL and JOAL
-applets are supported by the JNLPAppletLauncher on all OS and CPU
-combinations where these libraries are supported: currently
-Windows/x86, Linux/x86, and Mac OS X, both PowerPC and Intel.
-
-</P>
-<P>
-
-Here is a simple example of an applet which combines both OpenGL
-rendering and OpenAL audio:
-
-</P>
-<P>
-
-<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="600" height="400">
- <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher">
- <param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- jar/jogl-demos.jar,
- jar/jogl-demos-data.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">
- <comment>
- <embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width="600" height="400"
- type="application/x-java-applet;version=1.6"
- pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- jar/jogl-demos.jar,
- jar/jogl-demos-data.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsJOALApplet"
- subapplet.displayname" value="JOGL / JOAL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="2"
- jnlpExtension1="../jogl-all-awt.jnlp"
- jnlpExtension2="../joal.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true">
- <noembed>Sorry, no Java support detected.</noembed>
- </embed>
- </comment>
-</object>
-
-</P>
-<P>
-
-The applet above is instantiated with the following code:
-
-<pre>
-&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="600" height="400"&gt;
- &lt;param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"&gt;
- &lt;param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- 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="../jogl-all-awt.jnlp"&gt;
- &lt;param name="jnlpExtension2" value="../joal.jnlp"&gt;
- &lt;param name="java_arguments" value="-Dsun.java2d.noddraw=true"&gt;
- &lt;comment&gt;
- &lt;embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width="600" height="400"
- type="application/x-java-applet;version=1.6"
- pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsJOALApplet"
- subapplet.displayname" value="JOGL / JOAL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="2"
- jnlpExtension1="../jogl-all-awt.jnlp"
- jnlpExtension2="../joal.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"&gt;
- &lt;noembed&gt;Sorry, no Java support detected.&lt;/noembed&gt;
- &lt;/embed&gt;
- &lt;/comment&gt;
-&lt;/object&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-napplet.html b/jnlp-files/applet-gearsjoal-napplet.html
index cba455d..a6599d4 100644
--- a/jnlp-files/applet-gearsjoal-napplet.html
+++ b/jnlp-files/applet-gearsjoal-napplet.html
@@ -33,14 +33,17 @@ JOGL NApplet GearsJOAL
</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 jogl, joal and gluegen JAR files, which contain 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.
-
+<del>
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! JogAmp Community signs
+jogl-all.jar and gluegen-rt.jar, which contain the
+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.
+</del><br/>
+Sadly, due to Oracle's Java Applet Plugin update 7u51,
+unsigned applets are no more allowed and hence the
+Applet sandbox is being taken away.
</P>
</body>
diff --git a/jnlp-files/applet-gearsjoal.html b/jnlp-files/applet-gearsjoal.html
index ff0db7b..24068ab 100644
--- a/jnlp-files/applet-gearsjoal.html
+++ b/jnlp-files/applet-gearsjoal.html
@@ -10,43 +10,23 @@ JOGL JNLP Applet GearsJOAL
<object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
width="600" height="400">
- <param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher">
- <param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ <param name="code" value="demos.applets.GearsJOALApplet">
+ <param name="archive" value="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
../jar/joal.jar,
jar/jogl-demos.jar,
jar/jogl-demos-data.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">
<comment>
- <embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
+ <embed code="demos.applets.GearsJOALApplet"
width="600" height="400"
type="application/x-java-applet;version=1.6"
pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
+ archive="../jar/gluegen-rt.jar,
../jar/jogl-all.jar,
../jar/joal.jar,
jar/jogl-demos.jar,
jar/jogl-demos-data.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsJOALApplet"
- subapplet.displayname" value="JOGL / JOAL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="2"
- jnlpExtension1="../jogl-all-awt.jnlp"
- jnlpExtension2="../joal.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"
jnlp_href="applet-gearsjoal.jnlp">
<noembed>Sorry, no Java support detected.</noembed>
</embed>
@@ -55,75 +35,17 @@ JOGL JNLP Applet GearsJOAL
</P>
<P>
-
-The applet above is instantiated with the following code:
-
-<pre>
-&lt;object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"
- width="600" height="400"&gt;
- &lt;param name="code" value="org.jdesktop.applet.util.JNLPAppletLauncher"&gt;
- &lt;param name="archive" value="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- 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="../jogl-all-awt.jnlp"&gt;
- &lt;param name="jnlpExtension2" value="../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;comment&gt;
- &lt;embed code="org.jdesktop.applet.util.JNLPAppletLauncher"
- width="600" height="400"
- type="application/x-java-applet;version=1.6"
- pluginspage="http://java.sun.com/javase/downloads/ea.jsp"
- archive="../jar/applet-launcher.jar,
- ../jar/gluegen-rt.jar,
- ../jar/jogl-all.jar,
- ../jar/joal.jar,
- jar/jogl-demos.jar"
- codebase_lookup="false"
- subapplet.classname="demos.applets.GearsJOALApplet"
- subapplet.displayname" value="JOGL / JOAL Gears Applet"
- noddraw.check" value="true"
- progressbar="true"
- jnlpNumExtensions="2"
- jnlpExtension1="../jogl-all-awt.jnlp"
- jnlpExtension2="../joal.jnlp"
- java_arguments="-Dsun.java2d.noddraw=true"
- jnlp_href="applet-gearsjoal.jnlp"&gt;
- &lt;noembed&gt;Sorry, no Java support detected.&lt;/noembed&gt;
- &lt;/embed&gt;
- &lt;/comment&gt;
-&lt;/object&gt;
-</pre>
-
+<del>
+Note that the jogl-demos.jar, which contains the GearsApplet class,
+<B>does not need to be signed</B>! JogAmp Community signs
+jogl-all.jar and gluegen-rt.jar, which contain the
+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.
+</del><br/>
+Sadly, due to Oracle's Java Applet Plugin update 7u51,
+unsigned applets are no more allowed and hence the
+Applet sandbox is being taken away.
</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 c097256..e08f3c7 100644
--- a/jnlp-files/applet-gearsjoal.jnlp
+++ b/jnlp-files/applet-gearsjoal.jnlp
@@ -9,6 +9,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/test.html b/jnlp-files/test.html
index a988624..a29ea2b 100644
--- a/jnlp-files/test.html
+++ b/jnlp-files/test.html
@@ -10,15 +10,14 @@
<H3> Version </H3>
<ul>
<li><a href="../jogl-applet-version-napplet.html">NApplet</a></li>
- <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-applet-version.html">Applet (JNLP/NApplet)</a></li>
<li><a href="../jogl-application-version.jnlp">Application</a></li>
</ul>
-<H3> AWT JNLP Applet test with Applet Launcher fallback </H3>
+<H3> AWT JNLP Applet test with NApplet 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>
+ <li><a href="applet-gears.html">JNLP Applet w/ NApplet fallback</a></li>
+ <li><a href="applet-gears-jnlp.html">JNLP Applet Only test</a></li>
</ul>
<!--
@@ -27,25 +26,25 @@
</ul>
-->
-<H3> JOGL NApplet's using native <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a> via <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a></H3>
+<H3> JOGL's <a href="http://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplet</a></H3>
<ul>
<li><a href="applet-gears-napplet.html">Gears</a></li>
<li><a href="applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
</ul>
-<H3> AWT JNLP Applet's using native NEWT (JOGL NEWT Applet Runner)</H3>
+<H3> JOGL's <a href="http://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplet</a>
+ using native <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a> <a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a></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-angelesgl2es1.html">AWT Applet JOGL/NEWT GL2ES1 Angeles</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-cube.html">AWT Applet JOGL/NEWT GL2ES1 Cube</a></li>
+ <li><a href="jogl-newt-applet-runner-gears.html">NApplet JOGL/NEWT GL2 Gears</a></li>
+ <li><a href="jogl-newt-applet-runner-angelesgl2es1.html">NApplet JOGL/NEWT GL2ES1 Angeles</a></li>
+ <li><a href="jogl-newt-applet-runner-fbcubes.html">NApplet JOGL/NEWT GL2ES1 FBO Cubes</a></li>
+ <li><a href="jogl-newt-applet-runner-cube.html">NApplet JOGL/NEWT GL2ES1 Cube</a></li>
</ul>
<H3> JOGL / JOAL test .. </H3>
<ul>
<li><a href="applet-gearsjoal-napplet.html">NApplet</a></li>
- <li><a href="applet-gearsjoal.html">JNLP Applet w/ Launcher Fallback</a></li>
- <li><a href="applet-gearsjoal-launcheronly.html">Applet Launcher Only</a></li>
+ <li><a href="applet-gearsjoal.html">JNLP Applet w/ NApplet Fallback</a></li>
</ul>
<H3> JNLP Launcher .. </H3>
diff --git a/jnlp-files/version.jnlp b/jnlp-files/version.jnlp
index 9687cc6..52806ee 100644
--- a/jnlp-files/version.jnlp
+++ b/jnlp-files/version.jnlp
@@ -9,6 +9,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.4+"/>
diff --git a/jnlp-files/worldwind.jnlp b/jnlp-files/worldwind.jnlp
index b3edd9f..452e1e2 100644
--- a/jnlp-files/worldwind.jnlp
+++ b/jnlp-files/worldwind.jnlp
@@ -11,9 +11,9 @@
<offline-allowed/>
</information>
<update check="background" policy="always"/>
- <security>
- <all-permissions/>
- </security>
+ <security>
+ <all-permissions/>
+ </security>
<resources>
<j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+" initial-heap-size="512m"
diff --git a/make/build.xml b/make/build.xml
index f1c2039..68bfd87 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -115,6 +115,18 @@
<property name="jogl.redbook.excludes" value="redbook/**" />
+ <copy file="${project.root}/manifest.mf"
+ tofile="${build}/manifest.mf"
+ overwrite="true">
+ <filterset>
+ <filter token="VERSION" value="${jogamp.version}"/>
+ <filter token="BUILD_VERSION" value="${jogl-demos.version}"/>
+ <filter token="SCM_BRANCH" value="${jogl-demos.build.branch}"/>
+ <filter token="SCM_COMMIT" value="${jogl-demos.build.commit}"/>
+ <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+ <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+ </filterset>
+ </copy>
</target>
<target name="nurbs" if="jogl.nurbs">
@@ -180,7 +192,7 @@
</javac>
<antcall target="redbook-javac" inheritrefs="true" />
<antcall target="nurbs" inheritrefs="true" />
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos.jar}">
<fileset dir="${classes}">
<exclude name="gleem/**" />
<exclude name="demos/util/**" />
@@ -206,13 +218,13 @@
<include name="demos/particles/engine/images/*.jpg" />
</fileset>
</jar>
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-util.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-util.jar}">
<fileset dir="${classes}">
<include name="gleem/**" />
<include name="demos/util/**" />
</fileset>
</jar>
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-data.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-data.jar}">
<fileset dir="${src}">
<include name="demos/data/**" />
<exclude name="demos/data/models/dragon.obj" />
@@ -223,7 +235,7 @@
</fileset>
</jar>
<!-- due to size or usability .. create self packaged jars (code + data) -->
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-dualDepthPeeling.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-dualDepthPeeling.jar}">
<fileset dir="${classes}">
<include name="demos/dualDepthPeeling/**" />
</fileset>
@@ -237,7 +249,7 @@
<include name="demos/data/**" />
</fileset>
</jar>
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-tennis.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-tennis.jar}">
<fileset dir="${classes}">
<include name="demos/tennis/**" />
</fileset>
@@ -273,7 +285,7 @@
<src path="${src}" />
<classpath refid="jogl-demos.classpath" />
</javac>
- <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos.jar}">
+ <jar manifest="${build}/manifest.mf" destfile="${jogl-demos.jar}">
<fileset dir="${classes}">
<include name="**" />
</fileset>
diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh
index 0f7b959..b25ffb5 100755
--- a/make/scripts/make.jogl.all.x86_64.sh
+++ b/make/scripts/make.jogl.all.x86_64.sh
@@ -12,6 +12,9 @@ fi
# -Djogl.cg=1 \
# -Djogl.redbook=true \
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
# BUILD_ARCHIVE=true \
ant \
-Dtarget.sourcelevel=1.6 \
diff --git a/manifest.mf b/manifest.mf
index e9615a1..e177565 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -1,7 +1,12 @@
Manifest-Version: 1.0
Application-Name: Java Bindings for OpenGL Test
Implementation-Title: Java Bindings for OpenGL Tests
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
Implementation-Vendor: JogAmp Community
Implementation-URL: http://jogamp.org/
Implementation-Vendor-Id: com.jogamp
Permissions: all-permissions
+@JAR_CODEBASE_TAG@
diff --git a/www/index.html b/www/index.html
index 3cc491e..f3b180d 100644
--- a/www/index.html
+++ b/www/index.html
@@ -37,10 +37,6 @@
<ul>
<li><a href="../../wiki/index.php/Jogl_Tutorial">JOGL Tutorial</a></li>
<li><a href="../doc/readme.html">Demo Documentation</a></li>
- <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">JOGL NApplet Test</a></li>
- <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">JOGL JNLP Applet Test</a></li>
- <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">JOGL / JOAL NApplet Test</a></li>
- <li><a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">JOGL / JOAL JNLP Applet</a></li>
<li><a href="http://ak.kiet.le.googlepages.com/theredbookinjava.html">OpenGL Red Book examples using JOGL</a></li>
<li><a href="http://pepijn.fab4.be/software/nehe-java-ports/">NeHe examples ported to JOGL</a></li>
<!--
@@ -99,8 +95,8 @@
<ul>
<li><a href="../../deployment/jogamp-current/jogl-test-applets.html">JOGL Applet Tests</a>
(<a href="../../deployment/jogamp-next/jogl-test-applets.html"><i>next version</i></a>)</li>
- <li>NApplet w/ AWT: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
- <li>NApplet w/ <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a>
+ <li><a href="http://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplet</a> w/ AWT: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-napplet.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-napplet.html">Gears w/ JOAL</a></li>
+ <li><a href="http://jogamp.org/jogl/doc/deployment/JOGL-DEPLOYMENT.html#NApplets">NApplet</a> w/ <a href="../../jogl/doc/NEWT-Overview.html">NEWT's</a>
<a href="../../deployment/jogamp-next/javadoc/jogl/javadoc/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.html">Applet Runner</a>:
<ul>
<li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-gears.html">Gears</a></li>
@@ -108,8 +104,7 @@
<li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-fbcubes.html">FBO Cubes</a></li>
<li><a href="../../deployment/jogamp-current/jogl-demos/jogl-newt-applet-runner-cube.html">Cube</a></li>
</ul></li>
- <li>JNLP Applet with Applet-Launcher fallback: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">Gears w/ JOAL</a></li>
- <!--li>Applet-Launcher Only: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears-launcheronly.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">Gears w/ JOAL</a></li-->
+ <li>JNLP Applet: <a href="../../deployment/jogamp-current/jogl-demos/applet-gears.html">Gears</a>, <a href="../../deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">Gears w/ JOAL</a></li>
<li><a href="../../deployment/jogamp-current/jogl-demos/test.html">Plain test page</a>
(<a href="../../deployment/jogamp-next/jogl-demos/test.html"><i>next version</i></a>)</li>
</ul>