Merge branch 'master' of github.com:sgothel/jogl

Conflicts:
	doc/HowToBuild.html

17 files changed, 101 insertions, 40 deletions

diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html
index cac35d346..018214a6d 100644
--- a/doc/HowToBuild.html
+++ b/doc/HowToBuild.html
@@ -59,16 +59,26 @@
                         <li> <b><a href="http://ant.apache.org/">Ant</a></b> 1.8.0 or later</li>
                         <li> <b><a href="http://www.kernel.org/pub/software/scm/git/docs/">Git</a></b> 1.6.0 or later<br/>
                             <ul>
-                                <li> <a href="http://www.kernel.org/pub/software/scm/git/">Source Code for GNU/Linux, MacOSX, ..</a></li>
+                                <li> Use your Unix distribution's version, if available, or</li>
+                                <li> <a href="http://www.kernel.org/pub/software/scm/git/">Source Code for GNU/Linux, MacOSX, ..</a>, or</li>
                                 <li> <a href="http://code.google.com/p/msysgit/">Git on Windows</a>,
                                     <a href="http://code.google.com/p/msysgit/downloads/list">download</a> version
                                     <a href="http://code.google.com/p/msysgit/downloads/detail?name=Git-1.7.0.2-preview20100309.exe&can=2&q=">1.7.0</a> or later.</li>
-                            </ul></li>
+                                <li> <a href="http://code.google.com/p/git-osx-installer/">git-osx-installer</a> </li>
+                            </ul>
+                        </li>
+                        <li> Optional <b>NVidia Cg 2.2</b> <br/>
+                            <ul>
+                                <li> <a href="http://developer.nvidia.com/object/cg_download.html">Cg 2.2 Toolkit Download Page</a></li>
+                            </ul>
+                        </li>
+
                         <li> <b>GNU Linux</b> x86, 32- and 64-bit<br/>
                             You may have to install a few developer packages ...
                             <ul>
                                 <li> <b>[K]Ubuntu</b> 10.04 or later
                                     <ul>
+                                        <li>git</li>
                                         <li>gcc</li>
                                         <li>libgl1-mesa-dev</li>
                                         <li>libglu1-mesa-dev</li>
@@ -84,8 +94,9 @@
                                 </li>
                             </ul>
                         </li>
-                        <li> <b>OpenSuSE</b> 10.2 or later 
+                        <li> <b>OpenSuSE</b> 10.2 or later
                             <ul>
+                                <li>git</li>
                                 <li>gcc</li>
                                 <li>x11-devel</li>
                                 <li>mesa-devel</li>
@@ -93,6 +104,7 @@
                         </li>
                         <li> <b>CentOS / Red Hat Enterprise Linux</b> 5.4 or later<br/>
                             <ul>
+                                <li>git</li>
                                 <li>gcc</li>
                                 <li>mesa-libGL-devel</li>
                                 <li>libICE-devel</li>
@@ -113,21 +125,31 @@
                         </li>
                         <li> <b>MacOSX</b> Intel
                             <ul>
+                                <li> git, see above </li>
                                 <li> <a href="http://www.apple.com/macosx/">Mac OS X</a> 10.3 (note: will not work with earlier releases) </li>
                                 <li> <a href="http://developer.apple.com/technologies/xcode.html">Xcode</a> for gcc, etc (included in OSX)</li>
                             </ul>
                         </li>
                         <li> <b>Windows</b>/x86 (32-bit)
                             <ul>
-                                <li> Windows XP or later </li>
+                                <li>Windows XP or later </li>
+                                <li>git, see above</li>
                                 <li> <a href="http://www.mingw.org/">MinGW</a><br/>
-                                    Read <a href="http://www.mingw.org/wiki/Getting_Started">MinGW Getting Started</a> and
+                                    Read <a href="http://www.mingw.org/wiki/Getting_Started">MinGW Getting Started</a>.<br/>
+                                    We used the download script <code>mingwdl.sh</code> shown at
                                     <a href="http://www.mingw.org/wiki/HOWTO_Install_the_MinGW_GCC_Compiler_Suite">HOWTO Install the MinGW GCC Compiler Suite</a>.<br/></li>
-                                <li> Not supported: Microsoft Visual C++ 6.0 or later</li>
+                                <li> Not supported: Microsoft Visual C++ 6.0 or later, but may work. Last successful try in 2008.</li>
                             </ul>
                         </li>
-                        <li> <b>Windows</b>/x86 (64-bit)<br/>
-                            Currently broken ..
+                        <li> <b>Windows</b>/x86_64 (64-bit)<br/>
+                            <ul>
+                                <li>Windows XP or later </li>
+                                <li>git, see above</li>
+                                <li> <a href="http://mingw-w64.sourceforge.net/">MinGW64</a><br/>
+                                    We used the build <code>mingw-w64-bin_x86_64-mingw_20100515_sezero.zip</code> available at
+                                    <a href="http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/sezero_20100515/">MingW64 Personal Builds - sezero</a>.<br/></li>
+                                <li> Not supported: Microsoft Visual C++, never tried.</li>
+                            </ul>
                         </li>
                     </ul>
 
@@ -201,7 +223,7 @@
                     productions; the C grammar warnings have been documented by the
                     author of the grammar as having been investigated completely and
                     harmless, and the warnings about our modifications are also
-                    harmless. 
+                    harmless.
 
                     <h2> Common build problems </h2>
 
diff --git a/jnlp-files/jogl-all-awt.jnlp b/jnlp-files/jogl-all-awt.jnlp
index 718d09da7..df0c56076 100644
--- a/jnlp-files/jogl-all-awt.jnlp
+++ b/jnlp-files/jogl-all-awt.jnlp
@@ -3,8 +3,8 @@
       href="jogl-all-awt.jnlp">
   <information>
     <title>Java(tm) Binding to the OpenGL(r) API (ALL.AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.AWT</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.AWT</description>
     <offline-allowed/>
diff --git a/jnlp-files/jogl-all-noawt.jnlp b/jnlp-files/jogl-all-noawt.jnlp
index 3e4536dc5..14fb181a7 100644
--- a/jnlp-files/jogl-all-noawt.jnlp
+++ b/jnlp-files/jogl-all-noawt.jnlp
@@ -3,8 +3,8 @@
       href="jogl-all-noawt.jnlp">
   <information>
     <title>Java(tm) Binding to the OpenGL(r) API (ALL.NO_AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - ALL.NO_AWT</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - ALL.NO_AWT</description>
     <offline-allowed/>
diff --git a/jnlp-files/jogl-awt.jnlp b/jnlp-files/jogl-awt.jnlp
index 3e823ce50..684c2d5da 100644
--- a/jnlp-files/jogl-awt.jnlp
+++ b/jnlp-files/jogl-awt.jnlp
@@ -3,8 +3,8 @@
       href="jogl-awt.jnlp">
   <information>
     <title>Java(tm) Binding to the OpenGL(r) API (AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - AWT</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - AWT.</description>
     <offline-allowed/>
diff --git a/jnlp-files/jogl-core.jnlp b/jnlp-files/jogl-core.jnlp
index 05ea506e4..dca293720 100644
--- a/jnlp-files/jogl-core.jnlp
+++ b/jnlp-files/jogl-core.jnlp
@@ -3,8 +3,8 @@
       href="jogl-core.jnlp">
   <information>
     <title>Java(tm) Binding to the OpenGL(r) API (CORE)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - CORE</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - CORE.</description>
     <offline-allowed/>
diff --git a/jnlp-files/jogl-gl2es12.jnlp b/jnlp-files/jogl-gl2es12.jnlp
index 4a2c8502d..92fa621cf 100644
--- a/jnlp-files/jogl-gl2es12.jnlp
+++ b/jnlp-files/jogl-gl2es12.jnlp
@@ -3,8 +3,8 @@
       href="jogl-gl2es12.jnlp">
   <information>
     <title>Java(tm) Binding to the OpenGL(r) API (GL2ES12)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>Java Binding to the OpenGL API - JSR-231 2.0.0 - GL2ES12</description>
     <description kind="short">Java programming language binding for the OpenGL 3D graphics API - GL2ES12.</description>
     <offline-allowed/>
diff --git a/jnlp-files/nativewindow-all-awt.jnlp b/jnlp-files/nativewindow-all-awt.jnlp
index 34edf4a1f..5273c2c88 100644
--- a/jnlp-files/nativewindow-all-awt.jnlp
+++ b/jnlp-files/nativewindow-all-awt.jnlp
@@ -3,7 +3,7 @@
       href="nativewindow-all-awt.jnlp">
   <information>
     <title>Java(tm) NativeWindow Interface API (ALL.AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
+    <vendor>JogAmp Community</vendor>
     <homepage href="http://nativewindow.dev.java.net/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - ALL.AWT</description>
diff --git a/jnlp-files/nativewindow-awt.jnlp b/jnlp-files/nativewindow-awt.jnlp
index 1cc1a62be..b7a5c0f88 100644
--- a/jnlp-files/nativewindow-awt.jnlp
+++ b/jnlp-files/nativewindow-awt.jnlp
@@ -3,7 +3,7 @@
       href="nativewindow-awt.jnlp">
   <information>
     <title>Java(tm) NativeWindow Interface API (AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
+    <vendor>JogAmp Community</vendor>
     <homepage href="http://nativewindow.dev.java.net/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - AWT</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - AWT</description>
diff --git a/jnlp-files/nativewindow.jnlp b/jnlp-files/nativewindow.jnlp
index b8ed6f36f..67cb61279 100644
--- a/jnlp-files/nativewindow.jnlp
+++ b/jnlp-files/nativewindow.jnlp
@@ -3,7 +3,7 @@
       href="nativewindow.jnlp">
   <information>
     <title>Java(tm) NativeWindow Interface API (CORE)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
+    <vendor>JogAmp Community</vendor>
     <homepage href="http://nativewindow.dev.java.net/"/>
     <description>Java API for a binding to a native windowing system - 2.0 - CORE</description>
     <description kind="short">Java API for a binding to a native windowing system - 2.0 - CORE</description>
diff --git a/jnlp-files/newt-all-awt.jnlp b/jnlp-files/newt-all-awt.jnlp
index 24183b9e2..f063ae1b9 100644
--- a/jnlp-files/newt-all-awt.jnlp
+++ b/jnlp-files/newt-all-awt.jnlp
@@ -3,8 +3,8 @@
       href="newt-all-awt.jnlp">
   <information>
     <title>NEWT - New Windowing Toolkit (ALL.AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
     <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.AWT</description>
     <offline-allowed/>
diff --git a/jnlp-files/newt-all-noawt.jnlp b/jnlp-files/newt-all-noawt.jnlp
index 36f437296..63ff48e3b 100644
--- a/jnlp-files/newt-all-noawt.jnlp
+++ b/jnlp-files/newt-all-noawt.jnlp
@@ -3,8 +3,8 @@
       href="newt-all-noawt.jnlp">
   <information>
     <title>NEWT - New Windowing Toolkit (ALL.NO_AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description>
     <description kind="short">NEWT - A NativeWindow Interface implementation - ALL.NO_AWT</description>
     <offline-allowed/>
diff --git a/jnlp-files/newt-awt.jnlp b/jnlp-files/newt-awt.jnlp
index f4cd0799e..02f25786a 100644
--- a/jnlp-files/newt-awt.jnlp
+++ b/jnlp-files/newt-awt.jnlp
@@ -3,8 +3,8 @@
       href="newt-awt.jnlp">
   <information>
     <title>NEWT - New Windowing Toolkit (AWT)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>NEWT - A NativeWindow Interface implementation - AWT</description>
     <description kind="short">NEWT - A NativeWindow Interface implementation - AWT</description>
     <offline-allowed/>
diff --git a/jnlp-files/newt-jogl.jnlp b/jnlp-files/newt-jogl.jnlp
index bd8d8a675..ee95a1faa 100644
--- a/jnlp-files/newt-jogl.jnlp
+++ b/jnlp-files/newt-jogl.jnlp
@@ -3,8 +3,8 @@
       href="newt-jogl.jnlp">
   <information>
     <title>NEWT - New Windowing Toolkit (JOGL)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>NEWT - A NativeWindow Interface implementation - JOGL</description>
     <description kind="short">NEWT - A NativeWindow Interface implementation - JOGL</description>
     <offline-allowed/>
diff --git a/jnlp-files/newt.jnlp b/jnlp-files/newt.jnlp
index 71eb9952d..ce4ed6f28 100644
--- a/jnlp-files/newt.jnlp
+++ b/jnlp-files/newt.jnlp
@@ -3,8 +3,8 @@
       href="newt.jnlp">
   <information>
     <title>NEWT - New Windowing Toolkit (CORE)</title>
-    <vendor>Sun Microsystems, Inc.</vendor>
-    <homepage href="http://jogl.dev.java.net/"/>
+    <vendor>JogAmp Community</vendor>
+    <homepage href="http://jogamp.org/"/>
     <description>NEWT - A NativeWindow Interface implementation - CORE</description>
     <description kind="short">NEWT - A NativeWindow Interface implementation - CORE</description>
     <offline-allowed/>
diff --git a/make/build-junit.xml b/make/build-junit.xml
index eae2ea4c7..749e73dbd 100644
--- a/make/build-junit.xml
+++ b/make/build-junit.xml
@@ -24,7 +24,7 @@
         <property name="java.dir.test"        value="com/jogamp/test"/>
         <property name="java.part.test"       value="${java.dir.test}/**"/>
 
-        <property name="batchtest.timeout"    value="30000"/>
+        <property name="batchtest.timeout"    value="60000"/>
 
     </target>
     
diff --git a/make/build.xml b/make/build.xml
index a79d2d5fc..51dac3fa7 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -10,7 +10,7 @@
         <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
 
         <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
-        <property name="javadoc.nw.spec" value="${project.root}/javadoc_nativewindow_spec" />
+        <property name="javadoc.nw.spec" value="${build}/javadoc_nativewindow_spec" />
         <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${nativewindow_base_version} Specification" />
         <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" />
 
@@ -249,6 +249,9 @@
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
             <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" />
         </javadoc>
+        <zip destfile="${build}/javadoc_nativewindow_spec.zip"
+             basedir="${build}"
+             includes="javadoc_nativewindow_spec/**" />
     </target>
                                                                                                                                    
     <target name="javadoc.spec" description="Build Specifications JOGL and Nativewindow" depends="init,javadoc.jogl.spec" />
diff --git a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
index 4a1e65a8d..bae727019 100755
--- a/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
+++ b/src/junit/com/jogamp/test/junit/jogl/offscreen/TestOffscreen01NEWT.java
@@ -92,7 +92,13 @@ public class TestOffscreen01NEWT {
         window.setSize(width, height);
         GLWindow glWindow = GLWindow.create(window);
         Assert.assertNotNull(glWindow);
-        glWindow.setVisible(true);
+        try {
+            glWindow.setVisible(true);
+        } catch (Throwable t) {
+             // stop test and ignore if pixmap cannot be used
+            t.printStackTrace();
+            Assume.assumeNoException(t);
+        }
         GLEventListener demo = new RedSquare();
         WindowUtilNEWT.setDemoFields(demo, window, glWindow, false);
         glWindow.addGLEventListener(demo);
@@ -191,7 +197,13 @@ public class TestOffscreen01NEWT {
             windows[i].setSize(width, height);
             glWindows[i] = GLWindow.create(windows[i]);
             Assert.assertNotNull(glWindows[i]);
-            glWindows[i].setVisible(true);
+            try {
+                glWindows[i].setVisible(true);
+            } catch (Throwable t) {
+                 // stop test and ignore if pixmap cannot be used
+                t.printStackTrace();
+                Assume.assumeNoException(t);
+            }
             demos[i] = new RedSquare();
             WindowUtilNEWT.setDemoFields(demos[i], windows[i], glWindows[i], false);
             glWindows[i].addGLEventListener(demos[i]);
@@ -250,7 +262,13 @@ public class TestOffscreen01NEWT {
             windows[i].setSize(width, height);
             glWindows[i] = GLWindow.create(windows[i]);
             Assert.assertNotNull(glWindows[i]);
-            glWindows[i].setVisible(true);
+            try {
+                glWindows[i].setVisible(true);
+            } catch (Throwable t) {
+                 // stop test and ignore if pixmap cannot be used
+                t.printStackTrace();
+                Assume.assumeNoException(t);
+            }
             demos[i] = new RedSquare();
             WindowUtilNEWT.setDemoFields(demos[i], windows[i], glWindows[i], false);
             glWindows[i].addGLEventListener(demos[i]);
@@ -303,7 +321,13 @@ public class TestOffscreen01NEWT {
         window.setSize(width, height);
         GLWindow glWindow = GLWindow.create(window);
         Assert.assertNotNull(glWindow);
-        glWindow.setVisible(true);
+        try {
+            glWindow.setVisible(true);
+        } catch (Throwable t) {
+             // stop test and ignore if pixmap cannot be used
+            t.printStackTrace();
+            Assume.assumeNoException(t);
+        }
 
         GLWindow windowOnScreen = null;
         WindowListener wl=null;
@@ -357,7 +381,13 @@ public class TestOffscreen01NEWT {
         window.setSize(width, height);
         GLWindow glWindow = GLWindow.create(window);
         Assert.assertNotNull(glWindow);
-        glWindow.setVisible(true);
+        try {
+            glWindow.setVisible(true);
+        } catch (Throwable t) {
+             // stop test and ignore if pixmap cannot be used
+            t.printStackTrace();
+            Assume.assumeNoException(t);
+        }
         GLEventListener demo = new RedSquare();
         WindowUtilNEWT.setDemoFields(demo, window, glWindow, false);
         glWindow.addGLEventListener(demo);
@@ -406,7 +436,13 @@ public class TestOffscreen01NEWT {
         window.setSize(width, height);
         GLWindow glWindow = GLWindow.create(window);
         Assert.assertNotNull(glWindow);
-        glWindow.setVisible(true);
+        try {
+            glWindow.setVisible(true);
+        } catch (Throwable t) {
+             // stop test and ignore if pixmap cannot be used
+            t.printStackTrace();
+            Assume.assumeNoException(t);
+        }
 
         GLWindow windowOnScreen = null;
         WindowListener wl=null;