Merge pull request #1 from xranby/www

Fist round of joal-demos www cleanup

11 files changed, 132 insertions, 2 deletions

diff --git a/jnlp-files/joal-lesson1.jnlp b/jnlp-files/joal-lesson1.jnlp
new file mode 100644
index 0000000..d07e0d3
--- /dev/null
+++ b/jnlp-files/joal-lesson1.jnlp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogamp.org/deployment/jogamp-current/joal-demos/"
+      href="jnlp-files/joal-lesson1.jnlp">
+  <information>
+    <title>JOAL DevMaster Lesson 1</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://joal.jogamp.org/"/>
+    <description>JOAL DevMaster Lesson 1</description>
+    <description kind="short">OpenAL DevMaster Lesson 1 ported to Java and JOAL.</description>
+    <offline-allowed/>
+  </information>
+    <resources>
+      <j2se version="1.6+"/>
+      <jar href="jar/joal-demos.jar" />
+      <extension name="joal" href="https://jogamp.org/deployment/jogamp-current/joal.jnlp" />
+    </resources>
+  <application-desc main-class="demos.devmaster.lesson1.SingleStaticSource">
+    <argument>-gui</argument>
+  </application-desc>
+</jnlp>
diff --git a/jnlp-files/joal-lesson2.jnlp b/jnlp-files/joal-lesson2.jnlp
new file mode 100644
index 0000000..dda13ce
--- /dev/null
+++ b/jnlp-files/joal-lesson2.jnlp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogamp.org/deployment/jogamp-current/joal-demos/"
+      href="jnlp-files/joal-lesson2.jnlp">
+  <information>
+    <title>JOAL DevMaster Lesson 2</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://joal.jogamp.org/"/>
+    <description>JOAL DevMaster Lesson 2</description>
+    <description kind="short">OpenAL DevMaster Lesson 2 ported to Java and JOAL.</description>
+    <offline-allowed/>
+  </information>
+    <resources>
+      <j2se version="1.6+"/>
+      <jar href="jar/joal-demos.jar" />
+      <extension name="joal" href="https://jogamp.org/deployment/jogamp-current/joal.jnlp" />
+    </resources>
+  <application-desc main-class="demos.devmaster.lesson2.LoopingAndFadeaway">
+    <argument>-gui</argument>
+  </application-desc>
+</jnlp>
diff --git a/jnlp-files/joal-lesson3.jnlp b/jnlp-files/joal-lesson3.jnlp
new file mode 100644
index 0000000..e2fca94
--- /dev/null
+++ b/jnlp-files/joal-lesson3.jnlp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogamp.org/deployment/jogamp-current/joal-demos/"
+      href="jnlp-files/joal-lesson3.jnlp">
+  <information>
+    <title>JOAL DevMaster Lesson 3</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://joal.jogamp.org/"/>
+    <description>JOAL DevMaster Lesson 3</description>
+    <description kind="short">OpenAL DevMaster Lesson 3 ported to Java and JOAL.</description>
+    <offline-allowed/>
+  </information>
+    <resources>
+      <j2se version="1.6+"/>
+      <jar href="jar/joal-demos.jar" />
+      <extension name="joal" href="https://jogamp.org/deployment/jogamp-current/joal.jnlp" />
+    </resources>
+  <application-desc main-class="demos.devmaster.lesson3.MultipleSources">
+    <argument>-gui</argument>
+  </application-desc>
+</jnlp>
diff --git a/jnlp-files/joal-lesson5.jnlp b/jnlp-files/joal-lesson5.jnlp
new file mode 100644
index 0000000..d680ee4
--- /dev/null
+++ b/jnlp-files/joal-lesson5.jnlp
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogamp.org/deployment/jogamp-current/joal-demos/"
+      href="jnlp-files/joal-lesson5.jnlp">
+  <information>
+    <title>JOAL DevMaster Lesson 5</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://joal.jogamp.org/"/>
+    <description>JOAL DevMaster Lesson 5</description>
+    <description kind="short">OpenAL DevMaster Lesson 5 ported to Java and JOAL.</description>
+    <offline-allowed/>
+  </information>
+    <resources>
+      <j2se version="1.6+"/>
+      <jar href="jar/joal-demos.jar" />
+      <extension name="joal" href="https://jogamp.org/deployment/jogamp-current/joal.jnlp" />
+    </resources>
+  <application-desc main-class="demos.devmaster.lesson5.SourcesSharingBuffers">
+    <argument>-gui</argument>
+  </application-desc>
+</jnlp>
diff --git a/jnlp-files/joal-lesson8.jnlp b/jnlp-files/joal-lesson8.jnlp
new file mode 100644
index 0000000..4f99aa8
--- /dev/null
+++ b/jnlp-files/joal-lesson8.jnlp
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp codebase="https://jogamp.org/deployment/jogamp-current/joal-demos/"
+      href="jnlp-files/joal-lesson8.jnlp">
+  <information>
+    <title>JOAL DevMaster Lesson 8</title>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://joal.jogamp.org/"/>
+    <description>JOAL DevMaster Lesson 8</description>
+    <description kind="short">OpenAL DevMaster Lesson 8 ported to Java and JOAL.</description>
+    <offline-allowed/>
+  </information>
+    <resources>
+      <j2se version="1.6+"/>
+      <jar href="jar/joal-demos.jar" main="true" />
+      <jar href="jar/j-ogg-oggd.jar" />
+      <jar href="jar/j-ogg-vorbisd.jar" />
+      <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" />
+    </resources>
+  <application-desc main-class="demos.devmaster.lesson8.OggStreamer">
+    <argument>-gui</argument>
+  </application-desc>
+</jnlp>
diff --git a/www/devmaster/OpenAL_Tutorials_Bundle.zip b/www/devmaster/OpenAL_Tutorials_Bundle.zip
deleted file mode 100644
index d10d991..0000000
--- a/www/devmaster/OpenAL_Tutorials_Bundle.zip
+++ /dev/null
diff --git a/www/devmaster/lesson1.zip b/www/devmaster/lesson1.zip
deleted file mode 100644
index 0df8250..0000000
--- a/www/devmaster/lesson1.zip
+++ /dev/null
diff --git a/www/devmaster/lesson2.zip b/www/devmaster/lesson2.zip
deleted file mode 100644
index debf1db..0000000
--- a/www/devmaster/lesson2.zip
+++ /dev/null
diff --git a/www/devmaster/lesson3.zip b/www/devmaster/lesson3.zip
deleted file mode 100644
index cdc4685..0000000
--- a/www/devmaster/lesson3.zip
+++ /dev/null
diff --git a/www/devmaster/lesson5.zip b/www/devmaster/lesson5.zip
deleted file mode 100644
index 41851ff..0000000
--- a/www/devmaster/lesson5.zip
+++ /dev/null
diff --git a/www/index.html b/www/index.html
index a2aa7ef..f0ae970 100644
--- a/www/index.html
+++ b/www/index.html
@@ -19,7 +19,7 @@
                     <li><a href="../../jogl/www">JOGL</a></li>
                     <!--<li><a href="../../jogl-demos/www">Demos</a></li>
                     <li><a href="../../wiki/index.php/Jogl_FAQ">Wiki</a></li>-->
-                    <li><a href="http://download.java.net/media/joal/builds/nightly/javadoc_public/">JavaDoc</a></li>
+                    <li><a href="http://jogamp.org/deployment/jogamp-next/javadoc/joal/javadoc/">JavaDoc</a></li>
                 </ul>
             </div>
             <div id="main" class="fill">
@@ -45,6 +45,34 @@
                                                             demonstrations illustred the features and usage of the Java
                                                             bindings for OpenAL API and the Sound3D Toolkit.
                                                         </p>
+                                                        <H3> JOAL from command-line </H3>
+                                                        <pre>
+wget https://jogamp.org/deployment/jogamp-current/archive/jogamp-all-platforms.7z
+7z x jogamp-all-platforms.7z
+cd jogamp-all-platforms
+
+# joal-test 
+java -cp jar/joal-test.jar:jar/joal.jar:jar/gluegen-rt.jar com.jogamp.openal.Sound3DTest
+java -cp jar/joal-test.jar:jar/joal.jar:jar/gluegen-rt.jar com.jogamp.openal.test.manual.OpenALTest
+
+# joal-demos www.devmaster.net Tutorial lession 1,2,3 &amp; 5
+wget https://jogamp.org/deployment/jogamp-current/joal-demos/jar/joal-demos.jar
+java -cp joal-demos.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson1.SingleStaticSource
+java -cp joal-demos.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson2.LoopingAndFadeaway
+java -cp joal-demos.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson3.MultipleSources
+java -cp joal-demos.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson5.SourcesSharingBuffers
+
+# joal-demos www.devmaster.net Tutorial lession 8 
+wget https://jogamp.org/deployment/jogamp-current/joal-demos/jar/j-ogg-oggd.jar
+wget https://jogamp.org/deployment/jogamp-current/joal-demos/jar/j-ogg-vorbisd.jar
+java -cp joal-demos.jar:j-ogg-oggd.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson8.OggDecoder
+java -cp joal-demos.jar:j-ogg-oggd.jar:jar/joal.jar:jar/gluegen-rt.jar demos.devmaster.lesson8.OggStreamer
+                                                        </pre>
+                                                        <H3> JOAL/JOGL test applets </H3>
+                                                        <ul>
+                                                            <li><a href="https://jogamp.org/deployment/jogamp-current/jogl-demos/applet-gearsjoal.html">JOGL/JOAL Applet test</a></li>
+                                                            <li><a href="https://jogamp.org/deployment/jogamp-current/jogl-demos/applet-gearsjoal-launcheronly.html">JOGL/JOAL Applet test (Launcher Only)</a></li>
+                                                        </ul>
                                                     </div>
                                                 </td>
                                             </tr>
@@ -77,7 +105,7 @@
                                                         <li><a href="devmaster/lesson6.html">lesson 6:</a>Advanced Loading and Error Handles.</li>
                                                         <li><a href="devmaster/lesson7.html">lesson 7:</a>The Doppler Effect</li>
                                                         <li><a href="devmaster/lesson8.html">lesson 8:</a> Ogg/Vorbis Streaming</li>
-                                                        <li><a href="devmaster/OpenAL_Tutorials_Bundle.zip">source for lessons 1,2,3 &amp; 5</a></li>
+                                                        <li><a href="https://github.com/JogAmp/joal-demos/tree/master/src/java/demos/devmaster">source for lessons 1,2,3,5 &amp; 8</a></li>
                                                     </ul>
                                                 </td>
                                             </tr>