modifications due to refactorings: com.sun.opengl -> com.jogamp.opengl.

145 files changed, 379 insertions, 270 deletions

diff --git a/src/demos/applets/GearsApplet.java b/src/demos/applets/GearsApplet.java
index d1470c9..fc3d0ec 100755
--- a/src/demos/applets/GearsApplet.java
+++ b/src/demos/applets/GearsApplet.java
@@ -4,8 +4,8 @@ import java.applet.*;
 import java.awt.*;
 import demos.gears.Gears;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 /** Shows how to deploy an applet using JOGL. This demo must be
     referenced from a web page via an <applet> tag. */
diff --git a/src/demos/applets/GearsJOALApplet.java b/src/demos/applets/GearsJOALApplet.java
index 1c71e72..9cc8693 100755
--- a/src/demos/applets/GearsJOALApplet.java
+++ b/src/demos/applets/GearsJOALApplet.java
@@ -5,8 +5,8 @@ import java.applet.Applet;
 import java.awt.EventQueue;
 import java.awt.GridLayout;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.JPanel;
 import net.java.games.joal.util.ALut;
 import demos.devmaster.lesson1.SingleStaticSource;
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index 428e0b2..628699d 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -7,7 +7,7 @@ import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.GLWindow;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 /** Shows how to deploy an applet using JOGL. This demo must be
     referenced from a web page via an <applet> tag. */
diff --git a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
index 3a0504f..3579f27 100644
--- a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
+++ b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
@@ -33,7 +33,7 @@
 
 package demos.cg.runtime_ogl;
 
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.*;
diff --git a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
index 98075d9..f33168f 100644
--- a/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
+++ b/src/demos/cg/runtime_ogl_vertex_fragment/runtime_ogl_vertex_fragment.java
@@ -33,12 +33,12 @@
 
 package demos.cg.runtime_ogl_vertex_fragment;
 
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/demos/context/DualContext.java b/src/demos/context/DualContext.java
index c7d734c..d77c49a 100755
--- a/src/demos/context/DualContext.java
+++ b/src/demos/context/DualContext.java
@@ -39,7 +39,7 @@
 
 package demos.context;
 
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.gl2.GLUT;
 import java.awt.BorderLayout;
 import java.awt.Canvas;
 import java.awt.Graphics;
diff --git a/src/demos/cubefbo/CubeObject.java b/src/demos/cubefbo/CubeObject.java
index e12bdc2..bf3f8bc 100755
--- a/src/demos/cubefbo/CubeObject.java
+++ b/src/demos/cubefbo/CubeObject.java
@@ -38,7 +38,7 @@ import java.nio.ShortBuffer;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 class CubeObject {
     public CubeObject (boolean useTexCoords) {
diff --git a/src/demos/cubefbo/FBCubes.java b/src/demos/cubefbo/FBCubes.java
index c27877d..39494a0 100755
--- a/src/demos/cubefbo/FBCubes.java
+++ b/src/demos/cubefbo/FBCubes.java
@@ -43,7 +43,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.FBObject;
+import com.jogamp.opengl.util.FBObject;
 
 
 
diff --git a/src/demos/cubefbo/Main.java b/src/demos/cubefbo/Main.java
index e6d0cc9..2d8a36b 100755
--- a/src/demos/cubefbo/Main.java
+++ b/src/demos/cubefbo/Main.java
@@ -38,8 +38,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 
 public class Main {
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 5f573f8..afbae11 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -6,8 +6,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es1/angeles/AngelesES1.java b/src/demos/es1/angeles/AngelesES1.java
index bfb4a78..edba727 100755
--- a/src/demos/es1/angeles/AngelesES1.java
+++ b/src/demos/es1/angeles/AngelesES1.java
@@ -26,7 +26,7 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 import java.nio.*;
 
 public class AngelesES1 implements GLEventListener {
diff --git a/src/demos/es1/angeles/AngelesGL.java b/src/demos/es1/angeles/AngelesGL.java
index 12206de..afcc356 100755
--- a/src/demos/es1/angeles/AngelesGL.java
+++ b/src/demos/es1/angeles/AngelesGL.java
@@ -26,8 +26,8 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 public class AngelesGL implements GLEventListener {
diff --git a/src/demos/es1/angeles/AngelesGLil.java b/src/demos/es1/angeles/AngelesGLil.java
index aaae01e..bbfb86a 100755
--- a/src/demos/es1/angeles/AngelesGLil.java
+++ b/src/demos/es1/angeles/AngelesGLil.java
@@ -26,8 +26,8 @@ package demos.es1.angeles;
 
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 public class AngelesGLil implements GLEventListener {
diff --git a/src/demos/es1/cube/Cube.java b/src/demos/es1/cube/Cube.java
index d46f41b..9197b85 100644
--- a/src/demos/es1/cube/Cube.java
+++ b/src/demos/es1/cube/Cube.java
@@ -36,8 +36,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es1/cube/CubeImmModeSink.java b/src/demos/es1/cube/CubeImmModeSink.java
index cf22e90..8b6092c 100644
--- a/src/demos/es1/cube/CubeImmModeSink.java
+++ b/src/demos/es1/cube/CubeImmModeSink.java
@@ -34,8 +34,8 @@ package demos.es1.cube;
 import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 import java.nio.*;
 
 import com.sun.javafx.newt.*;
diff --git a/src/demos/es1/cubefbo/FBCubes.java b/src/demos/es1/cubefbo/FBCubes.java
index ecef02d..b6a1b0d 100755
--- a/src/demos/es1/cubefbo/FBCubes.java
+++ b/src/demos/es1/cubefbo/FBCubes.java
@@ -36,8 +36,8 @@ package demos.es1.cubefbo;
 import demos.es1.cube.Cube;
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.FBObject;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.FBObject;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 public class FBCubes implements GLEventListener {
     private static final int FBO_SIZE = 256;
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 65f70c2..958f118 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -5,8 +5,8 @@ import java.util.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/openmax/Cube.java b/src/demos/es2/openmax/Cube.java
index 46d25c1..620ce88 100644
--- a/src/demos/es2/openmax/Cube.java
+++ b/src/demos/es2/openmax/Cube.java
@@ -36,8 +36,8 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/openmax/MovieCube.java b/src/demos/es2/openmax/MovieCube.java
index 40ba583..197b2c9 100755
--- a/src/demos/es2/openmax/MovieCube.java
+++ b/src/demos/es2/openmax/MovieCube.java
@@ -36,7 +36,7 @@ package demos.es2.openmax;
 // import demos.es1.cube.Cube;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import com.sun.openmax.*;
 
@@ -181,7 +181,7 @@ public class MovieCube implements MouseListener, GLEventListener, OMXEventListen
     public void display(GLAutoDrawable drawable) {
         GL2ES1 gl = drawable.getGL().getGL2ES1();
 
-        com.sun.opengl.util.texture.Texture tex = null;
+        com.jogamp.opengl.util.texture.Texture tex = null;
         if(null!=movie) {
             tex=movie.getNextTextureID();
             if(null!=tex) {
diff --git a/src/demos/es2/openmax/MovieSimple.java b/src/demos/es2/openmax/MovieSimple.java
index 9088977..3bd4156 100755
--- a/src/demos/es2/openmax/MovieSimple.java
+++ b/src/demos/es2/openmax/MovieSimple.java
@@ -36,8 +36,8 @@ package demos.es2.openmax;
 
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.glsl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.openmax.*;
 
@@ -321,7 +321,7 @@ public class MovieSimple implements MouseListener, GLEventListener, OMXEventList
         }
 
 
-        com.sun.opengl.util.texture.Texture tex = null;
+        com.jogamp.opengl.util.texture.Texture tex = null;
         if(null!=movie) {
             tex=movie.getNextTextureID();
             if(null!=tex) {
diff --git a/src/demos/es2/perftst/PerfModule.java b/src/demos/es2/perftst/PerfModule.java
index 1a6cda1..69b9f1a 100644
--- a/src/demos/es2/perftst/PerfModule.java
+++ b/src/demos/es2/perftst/PerfModule.java
@@ -3,8 +3,8 @@ package demos.es2.perftst;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 public abstract class PerfModule {
 
diff --git a/src/demos/es2/perftst/PerfTextLoad.java b/src/demos/es2/perftst/PerfTextLoad.java
index b22266a..d58354b 100755
--- a/src/demos/es2/perftst/PerfTextLoad.java
+++ b/src/demos/es2/perftst/PerfTextLoad.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import java.io.*;
 import java.net.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.texture.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/PerfUniLoad.java b/src/demos/es2/perftst/PerfUniLoad.java
index a87d386..a38baa3 100755
--- a/src/demos/es2/perftst/PerfUniLoad.java
+++ b/src/demos/es2/perftst/PerfUniLoad.java
@@ -2,7 +2,7 @@ package demos.es2.perftst;
 
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/PerfVBOLoad.java b/src/demos/es2/perftst/PerfVBOLoad.java
index 376ab0a..ee9b251 100755
--- a/src/demos/es2/perftst/PerfVBOLoad.java
+++ b/src/demos/es2/perftst/PerfVBOLoad.java
@@ -2,7 +2,7 @@ package demos.es2.perftst;
 
 import java.nio.*;
 import javax.media.opengl.*;
-import com.sun.opengl.util.*;
+import com.jogamp.opengl.util.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/es2/perftst/Perftst.java b/src/demos/es2/perftst/Perftst.java
index 06520df..4d1f7e0 100755
--- a/src/demos/es2/perftst/Perftst.java
+++ b/src/demos/es2/perftst/Perftst.java
@@ -4,8 +4,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.nativewindow.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.*;
 
 import com.sun.javafx.newt.*;
 import com.sun.javafx.newt.opengl.*;
diff --git a/src/demos/fullscreen/GearsFullscreen.java b/src/demos/fullscreen/GearsFullscreen.java
index 2bbf158..0dac67f 100755
--- a/src/demos/fullscreen/GearsFullscreen.java
+++ b/src/demos/fullscreen/GearsFullscreen.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 import demos.gears.Gears;
 import demos.util.*;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /**
  * GearsFullscreen.java <BR>
diff --git a/src/demos/fullscreen/GearsFullscreen2.java b/src/demos/fullscreen/GearsFullscreen2.java
index 8b050df..38911a4 100755
--- a/src/demos/fullscreen/GearsFullscreen2.java
+++ b/src/demos/fullscreen/GearsFullscreen2.java
@@ -11,7 +11,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.ToolTipManager;
diff --git a/src/demos/fullscreen/JGearsFullscreen.java b/src/demos/fullscreen/JGearsFullscreen.java
index 92e0769..f540a12 100755
--- a/src/demos/fullscreen/JGearsFullscreen.java
+++ b/src/demos/fullscreen/JGearsFullscreen.java
@@ -11,7 +11,7 @@ import java.awt.GraphicsEnvironment;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
diff --git a/src/demos/gamma/TestGamma.java b/src/demos/gamma/TestGamma.java
index 6cc1801..4dff454 100755
--- a/src/demos/gamma/TestGamma.java
+++ b/src/demos/gamma/TestGamma.java
@@ -45,8 +45,8 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.Gamma;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.Gamma;
 
 
 
diff --git a/src/demos/gears/Gears.java b/src/demos/gears/Gears.java
index 2107014..227ce87 100644
--- a/src/demos/gears/Gears.java
+++ b/src/demos/gears/Gears.java
@@ -15,7 +15,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /**
  * Gears.java <BR>
diff --git a/src/demos/hdr/CgPipeline.java b/src/demos/hdr/CgPipeline.java
index 56906f1..f46c693 100755
--- a/src/demos/hdr/CgPipeline.java
+++ b/src/demos/hdr/CgPipeline.java
@@ -4,7 +4,7 @@ import java.io.*;
 import java.util.*;
 
 import javax.media.opengl.*;
-import com.sun.opengl.cg.*;
+import com.jogamp.opengl.cg.*;
 import demos.util.*;
 
 public class CgPipeline implements Pipeline {
diff --git a/src/demos/hdr/HDR.java b/src/demos/hdr/HDR.java
index bd3f7d6..aca38e9 100755
--- a/src/demos/hdr/HDR.java
+++ b/src/demos/hdr/HDR.java
@@ -1,7 +1,7 @@
 package demos.hdr;
 
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.gl2.GLUT;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.DurationTimer;
diff --git a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
index 3190778..6760161 100644
--- a/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
+++ b/src/demos/hwShadowmapsSimple/HWShadowmapsSimple.java
@@ -33,9 +33,9 @@
 
 package demos.hwShadowmapsSimple;
 
-import com.sun.opengl.util.gl2.GLUT;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureIO;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import gleem.BSphere;
diff --git a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
index c0feeb1..e445b39 100644
--- a/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
+++ b/src/demos/infiniteShadowVolumes/InfiniteShadowVolumes.java
@@ -33,7 +33,7 @@
 
 package demos.infiniteShadowVolumes;
 
-import com.sun.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.gl2.GLUT;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.MD2;
diff --git a/src/demos/j2d/CustomText.java b/src/demos/j2d/CustomText.java
index c3194be..b5a4f57 100755
--- a/src/demos/j2d/CustomText.java
+++ b/src/demos/j2d/CustomText.java
@@ -39,11 +39,11 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -75,7 +75,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/j2d/FlyingText.java b/src/demos/j2d/FlyingText.java
index d8d156c..9648d4f 100755
--- a/src/demos/j2d/FlyingText.java
+++ b/src/demos/j2d/FlyingText.java
@@ -39,11 +39,11 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -71,7 +71,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/j2d/TestOverlay.java b/src/demos/j2d/TestOverlay.java
index f2c248d..13cb39e 100755
--- a/src/demos/j2d/TestOverlay.java
+++ b/src/demos/j2d/TestOverlay.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.Overlay;
+import com.jogamp.opengl.util.awt.Overlay;
 import demos.gears.Gears;
 import demos.util.*;
 import gleem.linalg.*;
@@ -59,7 +59,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 /** A simple test of the Overlay utility class. Draws gears underneath
     with moving Java 2D-rendered text on top. */
diff --git a/src/demos/j2d/TestTextRenderer.java b/src/demos/j2d/TestTextRenderer.java
index 2d88a2d..5d93558 100755
--- a/src/demos/j2d/TestTextRenderer.java
+++ b/src/demos/j2d/TestTextRenderer.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.gears.Gears;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -55,7 +55,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TestTextureRenderer.java b/src/demos/j2d/TestTextureRenderer.java
index f85cce4..60bb3a4 100755
--- a/src/demos/j2d/TestTextureRenderer.java
+++ b/src/demos/j2d/TestTextureRenderer.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextureRenderer;
+import com.jogamp.opengl.util.awt.TextureRenderer;
 import demos.gears.Gears;
 import demos.util.SystemTime;
 import demos.util.Time;
@@ -62,7 +62,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextCube.java b/src/demos/j2d/TextCube.java
index 0c97650..63ad427 100755
--- a/src/demos/j2d/TextCube.java
+++ b/src/demos/j2d/TextCube.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.common.Demo;
 import demos.util.FPSCounter;
 import demos.util.SystemTime;
@@ -59,7 +59,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 
diff --git a/src/demos/j2d/TextFlow.java b/src/demos/j2d/TextFlow.java
index f3f4524..972618a 100755
--- a/src/demos/j2d/TextFlow.java
+++ b/src/demos/j2d/TextFlow.java
@@ -39,7 +39,7 @@
 
 package demos.j2d;
 
-import com.sun.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.awt.TextRenderer;
 import demos.common.Demo;
 import demos.util.SystemTime;
 import demos.util.Time;
@@ -63,7 +63,7 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 
 
 /** Illustrates both the TextRenderer's capability for handling
diff --git a/src/demos/jgears/JGears.java b/src/demos/jgears/JGears.java
index e885bd5..7e7d2e2 100644
--- a/src/demos/jgears/JGears.java
+++ b/src/demos/jgears/JGears.java
@@ -21,7 +21,7 @@ import javax.imageio.ImageIO;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
diff --git a/src/demos/jrefract/JRefract.java b/src/demos/jrefract/JRefract.java
index 32f8860..cdef67d 100755
--- a/src/demos/jrefract/JRefract.java
+++ b/src/demos/jrefract/JRefract.java
@@ -58,8 +58,8 @@ import java.awt.event.WindowEvent;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLJPanel;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.JCheckBox;
 import javax.swing.JDesktopPane;
 import javax.swing.JFrame;
diff --git a/src/demos/misc/GLCapsTableDemo.java b/src/demos/misc/GLCapsTableDemo.java
index bc77c0b..d4c652a 100755
--- a/src/demos/misc/GLCapsTableDemo.java
+++ b/src/demos/misc/GLCapsTableDemo.java
@@ -18,7 +18,7 @@ import javax.media.opengl.DefaultGLCapabilitiesChooser;
 import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLCapabilitiesChooser;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.FPSAnimator;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JFrame;
diff --git a/src/demos/misc/Picking.java b/src/demos/misc/Picking.java
index fde486c..27a0fe2 100755
--- a/src/demos/misc/Picking.java
+++ b/src/demos/misc/Picking.java
@@ -17,8 +17,8 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.*;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class Picking
 {
diff --git a/src/demos/misc/TiledRendering.java b/src/demos/misc/TiledRendering.java
index a5034fa..44035fd 100755
--- a/src/demos/misc/TiledRendering.java
+++ b/src/demos/misc/TiledRendering.java
@@ -1,9 +1,9 @@
 package demos.misc;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.TGAWriter;
-import com.sun.opengl.util.awt.ImageUtil;
-import com.sun.opengl.util.gl2.TileRenderer;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.TGAWriter;
+import com.jogamp.opengl.util.awt.ImageUtil;
+import com.jogamp.opengl.util.gl2.TileRenderer;
 import demos.gears.Gears;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
diff --git a/src/demos/nurbs/curveapp/GLListener.java b/src/demos/nurbs/curveapp/GLListener.java
index 3a1f47a..473b4ed 100755
--- a/src/demos/nurbs/curveapp/GLListener.java
+++ b/src/demos/nurbs/curveapp/GLListener.java
@@ -5,7 +5,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.glu.*;
 
-import com.sun.opengl.util.GLUT;
+import com.jogamp.opengl.util.GLUT;
 
 /**
  * Listener raacting to OpenGL canvas events
diff --git a/src/demos/nurbs/icons/IconFactory.java b/src/demos/nurbs/icons/IconFactory.java
index 81c906a..d6edcab 100755
--- a/src/demos/nurbs/icons/IconFactory.java
+++ b/src/demos/nurbs/icons/IconFactory.java
@@ -1,6 +1,6 @@
 package demos.nurbs.icons;
 
-import com.sun.opengl.impl.io.StreamUtil;
+import com.jogamp.opengl.impl.io.StreamUtil;
 import java.io.*;
 import javax.swing.ImageIcon;
 
diff --git a/src/demos/nurbs/surfaceapp/GLListener.java b/src/demos/nurbs/surfaceapp/GLListener.java
index ced405d..54e7c9d 100755
--- a/src/demos/nurbs/surfaceapp/GLListener.java
+++ b/src/demos/nurbs/surfaceapp/GLListener.java
@@ -5,7 +5,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.glu.*;
 
-import com.sun.opengl.util.glut.gl2.GLUTgl2;
+import com.jogamp.opengl.util.glut.gl2.GLUTgl2;
 import javax.media.opengl.GL2ES1;
 import javax.media.opengl.GL2;
 
diff --git a/src/demos/particles/engine/Engine.java b/src/demos/particles/engine/Engine.java
index 2b60175..d769457 100755
--- a/src/demos/particles/engine/Engine.java
+++ b/src/demos/particles/engine/Engine.java
@@ -37,7 +37,7 @@
 package demos.particles.engine;
 
 import javax.media.opengl.*;
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
 import java.net.*;
 import java.util.*;
 import java.io.*;
diff --git a/src/demos/particles/engine/GLComponent.java b/src/demos/particles/engine/GLComponent.java
index 43c3501..7194861 100755
--- a/src/demos/particles/engine/GLComponent.java
+++ b/src/demos/particles/engine/GLComponent.java
@@ -40,7 +40,7 @@ import javax.media.opengl.*;
 import javax.media.opengl.glu.*;
 import javax.media.opengl.awt.*;
 
-import com.sun.opengl.util.FPSAnimator;
+import com.jogamp.opengl.util.FPSAnimator;
 
 public class GLComponent extends GLCanvas implements GLEventListener {
     
diff --git a/src/demos/particles/engine/Particle.java b/src/demos/particles/engine/Particle.java
index ad4955e..d9858dd 100755
--- a/src/demos/particles/engine/Particle.java
+++ b/src/demos/particles/engine/Particle.java
@@ -36,7 +36,7 @@
 
 package demos.particles.engine;
 
-import com.sun.opengl.util.texture.*;
+import com.jogamp.opengl.util.texture.*;
 
 import javax.media.opengl.*;
 
diff --git a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
index a813906..d0e73ae 100644
--- a/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
+++ b/src/demos/proceduralTexturePhysics/ProceduralTexturePhysics.java
@@ -57,7 +57,7 @@ import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLException;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JOptionPane;
 
 /**
diff --git a/src/demos/proceduralTexturePhysics/Water.java b/src/demos/proceduralTexturePhysics/Water.java
index 3a5d1a8..fdf4224 100644
--- a/src/demos/proceduralTexturePhysics/Water.java
+++ b/src/demos/proceduralTexturePhysics/Water.java
@@ -33,10 +33,10 @@
 
 package demos.proceduralTexturePhysics;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import demos.util.Cubemap;
 import gleem.linalg.Mat4f;
 import gleem.linalg.Rotf;
@@ -56,7 +56,7 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLException;
 import javax.media.opengl.GLPbuffer;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 
diff --git a/src/demos/readbuffer/ReadBuffer2File.java b/src/demos/readbuffer/ReadBuffer2File.java
index ef908c4..9e0edf9 100755
--- a/src/demos/readbuffer/ReadBuffer2File.java
+++ b/src/demos/readbuffer/ReadBuffer2File.java
@@ -36,8 +36,8 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/src/demos/readbuffer/ReadBuffer2Screen.java b/src/demos/readbuffer/ReadBuffer2Screen.java
index 4d10fcc..39a4a27 100755
--- a/src/demos/readbuffer/ReadBuffer2Screen.java
+++ b/src/demos/readbuffer/ReadBuffer2Screen.java
@@ -37,16 +37,16 @@ import java.nio.*;
 import javax.media.opengl.*;
 import javax.media.opengl.fixedfunc.*;
 
-import com.sun.opengl.util.*;
-import com.sun.opengl.util.glsl.fixedfunc.*;
+import com.jogamp.opengl.util.*;
+import com.jogamp.opengl.util.glsl.fixedfunc.*;
 
 import javax.media.opengl.fixedfunc.GLPointerFunc;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.GLArrayDataClient;
-import com.sun.opengl.util.GLArrayDataServer;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.GLArrayDataClient;
+import com.jogamp.opengl.util.GLArrayDataServer;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBuffer2Screen extends ReadBufferBase {
     PMVMatrix pmvMatrix;
diff --git a/src/demos/readbuffer/ReadBufferBase.java b/src/demos/readbuffer/ReadBufferBase.java
index 04c1cdc..53f2ba9 100755
--- a/src/demos/readbuffer/ReadBufferBase.java
+++ b/src/demos/readbuffer/ReadBufferBase.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 public class ReadBufferBase implements GLEventListener {
diff --git a/src/demos/readbuffer/ReadBufferUtil.java b/src/demos/readbuffer/ReadBufferUtil.java
index bef8473..5cba034 100755
--- a/src/demos/readbuffer/ReadBufferUtil.java
+++ b/src/demos/readbuffer/ReadBufferUtil.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.BufferUtil;
 
 public class ReadBufferUtil {
     protected int readPixelSizeLast = 0;
diff --git a/src/demos/readbuffer/Surface2File.java b/src/demos/readbuffer/Surface2File.java
index f03918c..ec41039 100755
--- a/src/demos/readbuffer/Surface2File.java
+++ b/src/demos/readbuffer/Surface2File.java
@@ -36,9 +36,9 @@ package demos.readbuffer;
 import java.nio.*;
 import javax.media.opengl.*;
 
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.BufferUtil;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/demos/testContextDestruction/TestContextDestruction.java b/src/demos/testContextDestruction/TestContextDestruction.java
index a012639..f1e8649 100755
--- a/src/demos/testContextDestruction/TestContextDestruction.java
+++ b/src/demos/testContextDestruction/TestContextDestruction.java
@@ -57,7 +57,7 @@ import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
 import javax.media.opengl.GLEventListener;
 import javax.media.opengl.awt.GLCanvas;
-import com.sun.opengl.util.Animator;
+import com.jogamp.opengl.util.Animator;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 
diff --git a/src/demos/texture/TestSubImage.java b/src/demos/texture/TestSubImage.java
index bf1e936..498428c 100755
--- a/src/demos/texture/TestSubImage.java
+++ b/src/demos/texture/TestSubImage.java
@@ -39,11 +39,11 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
-import com.sun.opengl.util.texture.awt.AWTTextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.awt.AWTTextureIO;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.GradientPaint;
diff --git a/src/demos/texture/TestTexture.java b/src/demos/texture/TestTexture.java
index 3ece9ef..6d39bbc 100755
--- a/src/demos/texture/TestTexture.java
+++ b/src/demos/texture/TestTexture.java
@@ -39,9 +39,9 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureCoords;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureCoords;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
diff --git a/src/demos/texture/TextureConvert.java b/src/demos/texture/TextureConvert.java
index df15fc2..03c7357 100755
--- a/src/demos/texture/TextureConvert.java
+++ b/src/demos/texture/TextureConvert.java
@@ -39,10 +39,10 @@
 
 package demos.texture;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.File;
 import java.io.IOException;
 import javax.media.opengl.GL;
diff --git a/src/demos/util/Cubemap.java b/src/demos/util/Cubemap.java
index 6c1a332..9f31b9a 100755
--- a/src/demos/util/Cubemap.java
+++ b/src/demos/util/Cubemap.java
@@ -39,10 +39,10 @@
 
 package demos.util;
 
-import com.sun.opengl.util.FileUtil;
-import com.sun.opengl.util.texture.Texture;
-import com.sun.opengl.util.texture.TextureData;
-import com.sun.opengl.util.texture.TextureIO;
+import com.jogamp.opengl.util.FileUtil;
+import com.jogamp.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.texture.TextureData;
+import com.jogamp.opengl.util.texture.TextureIO;
 import java.io.IOException;
 import javax.media.opengl.GL;
 import javax.media.opengl.GLException;
diff --git a/src/demos/util/DxTex.java b/src/demos/util/DxTex.java
index fbe1963..04cf4e9 100644
--- a/src/demos/util/DxTex.java
+++ b/src/demos/util/DxTex.java
@@ -47,7 +47,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.filechooser.*;
 
-import com.sun.opengl.util.texture.spi.*;
+import com.jogamp.opengl.util.texture.spi.*;
 
 /** Simplified clone of DxTex tool from the DirectX SDK, written in
     Java using the DDSImage; tests fetching of texture data */
diff --git a/src/demos/util/FPSCounter.java b/src/demos/util/FPSCounter.java
index 79ea38b..a625b3b 100755
--- a/src/demos/util/FPSCounter.java
+++ b/src/demos/util/FPSCounter.java
@@ -39,8 +39,8 @@
 
 package demos.util;
 
-import com.sun.opengl.util.awt.TextRenderer;
-import com.sun.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.awt.TextRenderer;
+import com.jogamp.opengl.util.texture.Texture;
 import java.awt.Font;
 import java.awt.geom.Rectangle2D;
 import java.text.DecimalFormat;
diff --git a/src/demos/util/ObjReader.java b/src/demos/util/ObjReader.java
index 75a2d08..b78baf0 100644
--- a/src/demos/util/ObjReader.java
+++ b/src/demos/util/ObjReader.java
@@ -52,7 +52,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.BufferUtil;
 
 
 
diff --git a/src/demos/vertexBufferObject/VertexBufferObject.java b/src/demos/vertexBufferObject/VertexBufferObject.java
index 0bc8b10..9c8bb26 100644
--- a/src/demos/vertexBufferObject/VertexBufferObject.java
+++ b/src/demos/vertexBufferObject/VertexBufferObject.java
@@ -56,8 +56,8 @@ import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/vertexProgRefract/VertexProgRefract.java b/src/demos/vertexProgRefract/VertexProgRefract.java
index fa71f0c..54c0d5e 100644
--- a/src/demos/vertexProgRefract/VertexProgRefract.java
+++ b/src/demos/vertexProgRefract/VertexProgRefract.java
@@ -33,8 +33,8 @@
 
 package demos.vertexProgRefract;
 
-import com.sun.opengl.util.gl2.GLUT;
-import com.sun.opengl.util.texture.Texture;
+import com.jogamp.opengl.util.gl2.GLUT;
+import com.jogamp.opengl.util.texture.Texture;
 import demos.common.Demo;
 import demos.common.DemoListener;
 import demos.util.Bunny;
@@ -57,8 +57,8 @@ import java.io.IOException;
 import javax.media.opengl.*;
 import javax.media.opengl.awt.*;
 import javax.media.opengl.glu.GLU;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/vertexProgWarp/VertexProgWarp.java b/src/demos/vertexProgWarp/VertexProgWarp.java
index 8ab7166..6f917ed 100644
--- a/src/demos/vertexProgWarp/VertexProgWarp.java
+++ b/src/demos/vertexProgWarp/VertexProgWarp.java
@@ -59,8 +59,8 @@ import javax.media.opengl.awt.AWTGLAutoDrawable;
 import javax.media.opengl.awt.GLCanvas;
 import javax.media.opengl.glu.GLU;
 import javax.media.opengl.glu.GLUquadric;
-import com.sun.opengl.util.Animator;
-import com.sun.opengl.util.BufferUtil;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.BufferUtil;
 import javax.swing.JOptionPane;
 
 
diff --git a/src/demos/xtrans/OffscreenComponentWrapper.java b/src/demos/xtrans/OffscreenComponentWrapper.java
index 47b7995..806b417 100755
--- a/src/demos/xtrans/OffscreenComponentWrapper.java
+++ b/src/demos/xtrans/OffscreenComponentWrapper.java
@@ -46,9 +46,9 @@ import java.awt.Rectangle;
 import javax.swing.JComponent;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 // FIXME: debugging only
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 
 /** Provides an interposition point where we can install a new
  * Graphics object in the rendering pipeline. Because lightweight
diff --git a/src/demos/xtrans/OffscreenDesktopManager.java b/src/demos/xtrans/OffscreenDesktopManager.java
index 72349df..f12136c 100755
--- a/src/demos/xtrans/OffscreenDesktopManager.java
+++ b/src/demos/xtrans/OffscreenDesktopManager.java
@@ -61,9 +61,9 @@ import javax.swing.JLayeredPane;
 import javax.swing.JPanel;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 // FIXME: debugging only
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 
 // FIXME: we need a way to lock a portion of the off-screen back
 // buffer to be persistent for a while during component removals. It
diff --git a/src/demos/xtrans/OffscreenDesktopPane.java b/src/demos/xtrans/OffscreenDesktopPane.java
index 7bd1f6c..f72e5dc 100755
--- a/src/demos/xtrans/OffscreenDesktopPane.java
+++ b/src/demos/xtrans/OffscreenDesktopPane.java
@@ -45,7 +45,7 @@ import java.util.*;
 import javax.swing.*;
 
 // Internal JOGL API references
-import com.sun.opengl.impl.Debug;
+import com.jogamp.opengl.impl.Debug;
 
 /** A subclass of JDesktopPane which performs all of the rendering of
  * its child components into an off-screen buffer. Provides access to
diff --git a/src/demos/xtrans/XTDesktopManager.java b/src/demos/xtrans/XTDesktopManager.java
index 0081b5c..92b73a2 100755
--- a/src/demos/xtrans/XTDesktopManager.java
+++ b/src/demos/xtrans/XTDesktopManager.java
@@ -39,7 +39,7 @@
 
 package demos.xtrans;
 
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
diff --git a/src/demos/xtrans/XTDesktopPane.java b/src/demos/xtrans/XTDesktopPane.java
index ba9dc61..c6166aa 100755
--- a/src/demos/xtrans/XTDesktopPane.java
+++ b/src/demos/xtrans/XTDesktopPane.java
@@ -39,7 +39,7 @@
 
 package demos.xtrans;
 
-import com.sun.opengl.impl.awt.Java2D;
+import com.jogamp.opengl.impl.awt.Java2D;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Point;
diff --git a/src/redbook/nbproject/build-impl.xml b/src/redbook/nbproject/build-impl.xml
index 1f8d07b..71d5842 100644
--- a/src/redbook/nbproject/build-impl.xml
+++ b/src/redbook/nbproject/build-impl.xml
@@ -43,23 +43,27 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>
         <property file="nbproject/private/private.properties"/>
     </target>
-    <target depends="-pre-init,-init-private" name="-init-libraries">
-        <property location="./lib/nblibraries.properties" name="libraries.1.path"/>
-        <dirname file="${libraries.1.path}" property="libraries.1.dir.nativedirsep"/>
-        <pathconvert dirsep="/" property="libraries.1.dir">
-            <path path="${libraries.1.dir.nativedirsep}"/>
+    <target name="-pre-init-libraries">
+        <property location="./lib/nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
         </pathconvert>
-        <basename file="${libraries.1.path}" property="libraries.1.basename" suffix=".properties"/>
-        <touch file="${libraries.1.dir}/${libraries.1.basename}-private.properties"/>
-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.1.dir}/${libraries.1.basename}-private.properties">
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
             <filterchain>
-                <replacestring from="$${base}" to="${libraries.1.dir}"/>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
                 <escapeunicode/>
             </filterchain>
         </loadproperties>
-        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.1.path}">
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
             <filterchain>
-                <replacestring from="$${base}" to="${libraries.1.dir}"/>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
                 <escapeunicode/>
             </filterchain>
         </loadproperties>
@@ -77,21 +81,52 @@ is divided into following sections:
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
+        <condition property="main.class.available">
             <and>
-                <isset property="manifest.available"/>
                 <isset property="main.class"/>
                 <not>
                     <equals arg1="${main.class}" arg2="" trim="true"/>
                 </not>
             </and>
         </condition>
+        <condition property="manifest.available+main.class">
+            <and>
+                <isset property="manifest.available"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <condition property="do.mkdist">
+            <and>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+            </and>
+        </condition>
         <condition property="manifest.available+main.class+mkdist.available">
             <and>
                 <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
+                <isset property="do.mkdist"/>
+            </and>
+        </condition>
+        <condition property="manifest.available+mkdist.available">
+            <and>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
             </and>
         </condition>
+        <condition property="manifest.available-mkdist.available">
+            <or>
+                <istrue value="${manifest.available}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
+        <condition property="manifest.available+main.class-mkdist.available">
+            <or>
+                <istrue value="${manifest.available+main.class}"/>
+                <isset property="do.mkdist"/>
+            </or>
+        </condition>
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>
@@ -126,6 +161,7 @@ is divided into following sections:
         <property name="javadoc.preview" value="true"/>
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
+        <property name="runtime.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
                 <isset property="javadoc.encoding"/>
@@ -141,12 +177,11 @@ is divided into following sections:
         <condition property="do.depend.true">
             <istrue value="${do.depend}"/>
         </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
+        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+            <length length="0" string="${endorsed.classpath}" when="greater"/>
         </condition>
+        <property name="javac.fork" value="false"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -187,7 +222,7 @@ is divided into following sections:
             <sequential>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
                     <src>
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">
                             <include name="*"/>
@@ -196,7 +231,8 @@ is divided into following sections:
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
+                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
             </sequential>
@@ -235,7 +271,7 @@ is divided into following sections:
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="**" name="testincludes"/>
             <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
@@ -250,6 +286,7 @@ is divided into following sections:
                     </syspropertyset>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${run.jvmargs}"/>
                 </junit>
             </sequential>
@@ -306,10 +343,11 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
-                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -330,8 +368,9 @@ is divided into following sections:
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg value="-Dfile.encoding=${source.encoding}"/>
-                    <redirector errorencoding="${source.encoding}" inputencoding="${source.encoding}" outputencoding="${source.encoding}"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -358,7 +397,22 @@ is divided into following sections:
                 COMPILATION SECTION
                 ===================
             -->
-    <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target name="-deps-jar-init" unless="built-jar.properties">
+        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+        <delete file="${built-jar.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
+        <echo level="warn" message="Cycle detected: RedBook Samples was already built"/>
+    </target>
+    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-jar.properties}" verbose="false"/>
+        <property file="${built-jar.properties}" prefix="already.built.jar."/>
+        <antcall target="-warn-already-built-jar"/>
+        <propertyfile file="${built-jar.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
         <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
@@ -419,10 +473,10 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
         <j2seproject1:jar/>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
         <j2seproject1:jar manifest="${manifest.file}"/>
     </target>
     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
@@ -465,7 +519,28 @@ is divided into following sections:
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo>java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="libs.CopyLibs.classpath" name="-do-jar-with-libraries-without-manifest" unless="manifest.available+main.class">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <pathconvert property="run.classpath.without.build.classes.dir">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to=""/>
+        </pathconvert>
+        <pathconvert pathsep=" " property="jar.classpath">
+            <path path="${run.classpath.without.build.classes.dir}"/>
+            <chainedmapper>
+                <flattenmapper/>
+                <globmapper from="*" to="lib/*"/>
+            </chainedmapper>
+        </pathconvert>
+        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
+        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+            <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
+        </copylibs>
+    </target>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <pathconvert property="run.classpath.without.build.classes.dir">
             <path path="${run.classpath}"/>
@@ -481,13 +556,16 @@ is divided into following sections:
         <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
         <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
             <fileset dir="${build.classes.dir}"/>
+            <manifest>
+                <attribute name="Class-Path" value="${jar.classpath}"/>
+            </manifest>
         </copylibs>
     </target>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-manifest,-post-jar,jnlp" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar,jnlp" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -503,11 +581,11 @@ is divided into following sections:
     <target name="-do-not-recompile">
         <property name="javac.includes.binary" value=""/>
     </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
+    <target depends="init,compile-single" name="run-single">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <j2seproject1:java classname="${run.class}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single" name="run-test-with-main">
+    <target depends="init,compile-test-single" name="run-test-with-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
     </target>
@@ -538,12 +616,12 @@ is divided into following sections:
         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
         <j2seproject3:debug classname="${debug.class}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
     <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
         <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
     <target depends="init" name="-pre-debug-fix">
         <fail unless="fix.includes">Must set fix.includes</fail>
         <property name="javac.includes" value="${fix.includes}.java"/>
@@ -645,7 +723,7 @@ is divided into following sections:
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <!--
                 =======================
                 JUNIT DEBUGGING SECTION
@@ -672,7 +750,7 @@ is divided into following sections:
     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
         <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
@@ -709,14 +787,45 @@ is divided into following sections:
                 CLEANUP SECTION
                 ===============
             -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target name="-deps-clean-init" unless="built-clean.properties">
+        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+        <delete file="${built-clean.properties}" quiet="true"/>
+    </target>
+    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
+        <echo level="warn" message="Cycle detected: RedBook Samples was already built"/>
+    </target>
+    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+        <mkdir dir="${build.dir}"/>
+        <touch file="${built-clean.properties}" verbose="false"/>
+        <property file="${built-clean.properties}" prefix="already.built.clean."/>
+        <antcall target="-warn-already-built-clean"/>
+        <propertyfile file="${built-clean.properties}">
+            <entry key="${basedir}" value=""/>
+        </propertyfile>
+    </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
+        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
     </target>
     <target name="-post-clean">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target name="-check-call-dep">
+        <property file="${call.built.properties}" prefix="already.built."/>
+        <condition property="should.call.dep">
+            <not>
+                <isset property="already.built.${call.subproject}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+            <propertyset>
+                <propertyref prefix="transfer."/>
+                <mapper from="transfer.*" to="*" type="glob"/>
+            </propertyset>
+        </ant>
+    </target>
 </project>
diff --git a/src/redbook/nbproject/genfiles.properties b/src/redbook/nbproject/genfiles.properties
index e3256a4..7e724ad 100644
--- a/src/redbook/nbproject/genfiles.properties
+++ b/src/redbook/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f7c0fcba
-nbproject/build-impl.xml.script.CRC32=138943b7
-nbproject/[email protected]
+nbproject/build-impl.xml.script.CRC32=d690f492
+nbproject/[email protected]
diff --git a/src/redbook/src/glredbook10/GLSkeleton.java b/src/redbook/src/glredbook10/GLSkeleton.java
index 3a4c439..6b147fa 100644
--- a/src/redbook/src/glredbook10/GLSkeleton.java
+++ b/src/redbook/src/glredbook10/GLSkeleton.java
@@ -1,7 +1,7 @@
 package glredbook10;

 

 

-import com.sun.opengl.util.FPSAnimator;

+import com.jogamp.opengl.util.FPSAnimator;

 import javax.media.opengl.*;

 

 public abstract class GLSkeleton<D extends GLAutoDrawable> {

diff --git a/src/redbook/src/glredbook10/accanti.java b/src/redbook/src/glredbook10/accanti.java
index 12cd9cf..5aeeb70 100644
--- a/src/redbook/src/glredbook10/accanti.java
+++ b/src/redbook/src/glredbook10/accanti.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/accnot.java b/src/redbook/src/glredbook10/accnot.java
index cd5bcca..8403bc7 100644
--- a/src/redbook/src/glredbook10/accnot.java
+++ b/src/redbook/src/glredbook10/accnot.java
@@ -3,7 +3,7 @@ package glredbook10;
 import java.awt.event.*;

 import javax.swing.*;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/accpersp.java b/src/redbook/src/glredbook10/accpersp.java
index 8bd4ef1..4d8bfbe 100644
--- a/src/redbook/src/glredbook10/accpersp.java
+++ b/src/redbook/src/glredbook10/accpersp.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 

 import javax.swing.*;

diff --git a/src/redbook/src/glredbook10/accum.java b/src/redbook/src/glredbook10/accum.java
index fa335b6..bbd040d 100644
--- a/src/redbook/src/glredbook10/accum.java
+++ b/src/redbook/src/glredbook10/accum.java
@@ -5,7 +5,7 @@ import java.awt.event.KeyListener;
 

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.*;

 import javax.media.opengl.awt.GLJPanel;

 

diff --git a/src/redbook/src/glredbook10/aim.java b/src/redbook/src/glredbook10/aim.java
index 9bed4bc..2f6a009 100644
--- a/src/redbook/src/glredbook10/aim.java
+++ b/src/redbook/src/glredbook10/aim.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/alpha3D.java b/src/redbook/src/glredbook10/alpha3D.java
index 9225e23..06a592d 100644
--- a/src/redbook/src/glredbook10/alpha3D.java
+++ b/src/redbook/src/glredbook10/alpha3D.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 

 import javax.swing.*;

diff --git a/src/redbook/src/glredbook10/anti.java b/src/redbook/src/glredbook10/anti.java
index dda87e5..a207fb6 100644
--- a/src/redbook/src/glredbook10/anti.java
+++ b/src/redbook/src/glredbook10/anti.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/antipoly.java b/src/redbook/src/glredbook10/antipoly.java
index d015a94..f69c24d 100644
--- a/src/redbook/src/glredbook10/antipoly.java
+++ b/src/redbook/src/glredbook10/antipoly.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 

 import javax.swing.*;

diff --git a/src/redbook/src/glredbook10/bezcurve.java b/src/redbook/src/glredbook10/bezcurve.java
index bde4503..2399d4f 100644
--- a/src/redbook/src/glredbook10/bezcurve.java
+++ b/src/redbook/src/glredbook10/bezcurve.java
@@ -7,7 +7,7 @@ import java.nio.FloatBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import javax.media.opengl.awt.GLJPanel;

 

diff --git a/src/redbook/src/glredbook10/bezmesh.java b/src/redbook/src/glredbook10/bezmesh.java
index 01029bb..1dbc239 100644
--- a/src/redbook/src/glredbook10/bezmesh.java
+++ b/src/redbook/src/glredbook10/bezmesh.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/bezsurf.java b/src/redbook/src/glredbook10/bezsurf.java
index a223ef8..1503fd2 100644
--- a/src/redbook/src/glredbook10/bezsurf.java
+++ b/src/redbook/src/glredbook10/bezsurf.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/checker.java b/src/redbook/src/glredbook10/checker.java
index fcd2e23..c92a6d1 100644
--- a/src/redbook/src/glredbook10/checker.java
+++ b/src/redbook/src/glredbook10/checker.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/checker2.java b/src/redbook/src/glredbook10/checker2.java
index 861f633..7c41110 100644
--- a/src/redbook/src/glredbook10/checker2.java
+++ b/src/redbook/src/glredbook10/checker2.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/chess.java b/src/redbook/src/glredbook10/chess.java
index 354f4bc..fcbf4e9 100644
--- a/src/redbook/src/glredbook10/chess.java
+++ b/src/redbook/src/glredbook10/chess.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/clip.java b/src/redbook/src/glredbook10/clip.java
index 0166d9f..6506311 100644
--- a/src/redbook/src/glredbook10/clip.java
+++ b/src/redbook/src/glredbook10/clip.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/colormat.java b/src/redbook/src/glredbook10/colormat.java
index 924db22..99f8117 100644
--- a/src/redbook/src/glredbook10/colormat.java
+++ b/src/redbook/src/glredbook10/colormat.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 

 import javax.swing.*;

diff --git a/src/redbook/src/glredbook10/cone.java b/src/redbook/src/glredbook10/cone.java
index bc7a003..e5e9bfd 100644
--- a/src/redbook/src/glredbook10/cone.java
+++ b/src/redbook/src/glredbook10/cone.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/cube.java b/src/redbook/src/glredbook10/cube.java
index a767252..f72afa2 100644
--- a/src/redbook/src/glredbook10/cube.java
+++ b/src/redbook/src/glredbook10/cube.java
@@ -6,7 +6,7 @@ import java.awt.event.KeyListener;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/depthcue.java b/src/redbook/src/glredbook10/depthcue.java
index e8a3be7..b25759a 100644
--- a/src/redbook/src/glredbook10/depthcue.java
+++ b/src/redbook/src/glredbook10/depthcue.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/dof.java b/src/redbook/src/glredbook10/dof.java
index b73b2de..1f42f8d 100644
--- a/src/redbook/src/glredbook10/dof.java
+++ b/src/redbook/src/glredbook10/dof.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/dofnot.java b/src/redbook/src/glredbook10/dofnot.java
index 5d1a365..701bd62 100644
--- a/src/redbook/src/glredbook10/dofnot.java
+++ b/src/redbook/src/glredbook10/dofnot.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/doublebuf.java b/src/redbook/src/glredbook10/doublebuf.java
index 9c96e8f..af353d3 100644
--- a/src/redbook/src/glredbook10/doublebuf.java
+++ b/src/redbook/src/glredbook10/doublebuf.java
@@ -3,7 +3,7 @@ package glredbook10;
 import javax.swing.*;

 import java.awt.event.*;

 

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 

 import javax.media.opengl.*;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook10/feedback.java b/src/redbook/src/glredbook10/feedback.java
index 81ced6e..9f26aee 100644
--- a/src/redbook/src/glredbook10/feedback.java
+++ b/src/redbook/src/glredbook10/feedback.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/fog.java b/src/redbook/src/glredbook10/fog.java
index c74917e..636aae1 100644
--- a/src/redbook/src/glredbook10/fog.java
+++ b/src/redbook/src/glredbook10/fog.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/font.java b/src/redbook/src/glredbook10/font.java
index e4262f5..8019bd4 100644
--- a/src/redbook/src/glredbook10/font.java
+++ b/src/redbook/src/glredbook10/font.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/light.java b/src/redbook/src/glredbook10/light.java
index cbc5f09..afd3579 100644
--- a/src/redbook/src/glredbook10/light.java
+++ b/src/redbook/src/glredbook10/light.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/maplight.java b/src/redbook/src/glredbook10/maplight.java
index 2563420..ebd430d 100644
--- a/src/redbook/src/glredbook10/maplight.java
+++ b/src/redbook/src/glredbook10/maplight.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/material.java b/src/redbook/src/glredbook10/material.java
index c333040..13c6aa8 100644
--- a/src/redbook/src/glredbook10/material.java
+++ b/src/redbook/src/glredbook10/material.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 import javax.media.opengl.*;

diff --git a/src/redbook/src/glredbook10/mipmap.java b/src/redbook/src/glredbook10/mipmap.java
index b051e11..b8bfe83 100644
--- a/src/redbook/src/glredbook10/mipmap.java
+++ b/src/redbook/src/glredbook10/mipmap.java
@@ -6,7 +6,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/movelight.java b/src/redbook/src/glredbook10/movelight.java
index c8de5bc..c20e2c2 100644
--- a/src/redbook/src/glredbook10/movelight.java
+++ b/src/redbook/src/glredbook10/movelight.java
@@ -8,7 +8,7 @@ import java.awt.event.MouseListener;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/pickdepth.java b/src/redbook/src/glredbook10/pickdepth.java
index 9e2f78e..e7979a2 100644
--- a/src/redbook/src/glredbook10/pickdepth.java
+++ b/src/redbook/src/glredbook10/pickdepth.java
@@ -8,7 +8,7 @@ import java.nio.*;
 

 import javax.media.opengl.*;

 

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/pickline.java b/src/redbook/src/glredbook10/pickline.java
index 01cb613..8d7eb4b 100644
--- a/src/redbook/src/glredbook10/pickline.java
+++ b/src/redbook/src/glredbook10/pickline.java
@@ -7,7 +7,7 @@ import javax.swing.*;
 import java.nio.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook10/picksquare.java b/src/redbook/src/glredbook10/picksquare.java
index 7881ca0..0087e79 100644
--- a/src/redbook/src/glredbook10/picksquare.java
+++ b/src/redbook/src/glredbook10/picksquare.java
@@ -5,7 +5,7 @@ import java.awt.*;
 import java.awt.event.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import java.nio.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

diff --git a/src/redbook/src/glredbook10/planet.java b/src/redbook/src/glredbook10/planet.java
index 3938ce9..f7936f7 100644
--- a/src/redbook/src/glredbook10/planet.java
+++ b/src/redbook/src/glredbook10/planet.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/planetup.java b/src/redbook/src/glredbook10/planetup.java
index ceecf16..3cc3dbd 100644
--- a/src/redbook/src/glredbook10/planetup.java
+++ b/src/redbook/src/glredbook10/planetup.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 import javax.media.opengl.*;

diff --git a/src/redbook/src/glredbook10/robot.java b/src/redbook/src/glredbook10/robot.java
index 2575468..a244c0c 100644
--- a/src/redbook/src/glredbook10/robot.java
+++ b/src/redbook/src/glredbook10/robot.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 

 import javax.swing.*;

diff --git a/src/redbook/src/glredbook10/sccolorlight.java b/src/redbook/src/glredbook10/sccolorlight.java
index 59ac7ba..86e5a0d 100644
--- a/src/redbook/src/glredbook10/sccolorlight.java
+++ b/src/redbook/src/glredbook10/sccolorlight.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/scene.java b/src/redbook/src/glredbook10/scene.java
index 03392bf..800d8c0 100644
--- a/src/redbook/src/glredbook10/scene.java
+++ b/src/redbook/src/glredbook10/scene.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/scenebamb.java b/src/redbook/src/glredbook10/scenebamb.java
index a69759c..e01e404 100644
--- a/src/redbook/src/glredbook10/scenebamb.java
+++ b/src/redbook/src/glredbook10/scenebamb.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/sceneflat.java b/src/redbook/src/glredbook10/sceneflat.java
index 7431fa0..35cf950 100644
--- a/src/redbook/src/glredbook10/sceneflat.java
+++ b/src/redbook/src/glredbook10/sceneflat.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/select.java b/src/redbook/src/glredbook10/select.java
index f192bc7..98609c2 100644
--- a/src/redbook/src/glredbook10/select.java
+++ b/src/redbook/src/glredbook10/select.java
@@ -5,7 +5,7 @@ import javax.swing.*;
 import java.awt.event.*;

 

 import javax.media.opengl.*;

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import java.nio.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

diff --git a/src/redbook/src/glredbook10/sphere.java b/src/redbook/src/glredbook10/sphere.java
index 30fd514..ca5b739 100644
--- a/src/redbook/src/glredbook10/sphere.java
+++ b/src/redbook/src/glredbook10/sphere.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/stencil.java b/src/redbook/src/glredbook10/stencil.java
index a2a7c76..7bb2e1e 100644
--- a/src/redbook/src/glredbook10/stencil.java
+++ b/src/redbook/src/glredbook10/stencil.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.swing.*;

 

 import java.awt.event.*;

diff --git a/src/redbook/src/glredbook10/stroke.java b/src/redbook/src/glredbook10/stroke.java
index 6574da0..f8b4791 100644
--- a/src/redbook/src/glredbook10/stroke.java
+++ b/src/redbook/src/glredbook10/stroke.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import java.nio.*;

 

 

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.*;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

diff --git a/src/redbook/src/glredbook10/tea.java b/src/redbook/src/glredbook10/tea.java
index 5deb456..a73d0de 100644
--- a/src/redbook/src/glredbook10/tea.java
+++ b/src/redbook/src/glredbook10/tea.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.KeyEvent;

 import java.awt.event.KeyListener;

 import javax.swing.JFrame;

diff --git a/src/redbook/src/glredbook10/teaambient.java b/src/redbook/src/glredbook10/teaambient.java
index c9ddf88..02c7b74 100644
--- a/src/redbook/src/glredbook10/teaambient.java
+++ b/src/redbook/src/glredbook10/teaambient.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/teapots.java b/src/redbook/src/glredbook10/teapots.java
index ffdd9f5..f49d882 100644
--- a/src/redbook/src/glredbook10/teapots.java
+++ b/src/redbook/src/glredbook10/teapots.java
@@ -1,6 +1,6 @@
 package glredbook10;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import java.awt.event.*;

 import javax.swing.*;

 

diff --git a/src/redbook/src/glredbook10/texgen.java b/src/redbook/src/glredbook10/texgen.java
index 54118ab..c94616a 100644
--- a/src/redbook/src/glredbook10/texgen.java
+++ b/src/redbook/src/glredbook10/texgen.java
@@ -5,8 +5,8 @@ import javax.swing.*;
 

 import java.nio.*;

 

-import com.sun.opengl.util.*;

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.*;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.*; import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook10/texturesurf.java b/src/redbook/src/glredbook10/texturesurf.java
index fcd6e28..34f561d 100644
--- a/src/redbook/src/glredbook10/texturesurf.java
+++ b/src/redbook/src/glredbook10/texturesurf.java
@@ -6,7 +6,7 @@ import java.awt.event.*;
 

 import java.nio.*;

 

-import com.sun.opengl.util.*;

+import com.jogamp.opengl.util.*;

 import javax.media.opengl.*;

 import javax.media.opengl.awt.GLJPanel;

 

diff --git a/src/redbook/src/glredbook11/image.java b/src/redbook/src/glredbook11/image.java
index 857c1b1..eea4d24 100644
--- a/src/redbook/src/glredbook11/image.java
+++ b/src/redbook/src/glredbook11/image.java
@@ -22,7 +22,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook11/polyoff.java b/src/redbook/src/glredbook11/polyoff.java
index d90edce..4b192fd 100644
--- a/src/redbook/src/glredbook11/polyoff.java
+++ b/src/redbook/src/glredbook11/polyoff.java
@@ -8,7 +8,7 @@ import java.awt.event.MouseListener;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

diff --git a/src/redbook/src/glredbook11/texbind.java b/src/redbook/src/glredbook11/texbind.java
index 9cbdd90..7991f76 100644
--- a/src/redbook/src/glredbook11/texbind.java
+++ b/src/redbook/src/glredbook11/texbind.java
@@ -9,7 +9,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook11/texgen.java b/src/redbook/src/glredbook11/texgen.java
index aabda01..519d88f 100644
--- a/src/redbook/src/glredbook11/texgen.java
+++ b/src/redbook/src/glredbook11/texgen.java
@@ -8,9 +8,9 @@ import java.nio.ByteBuffer;
 

 import javax.media.opengl.*;import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.awt.GLJPanel;

 

 /**

diff --git a/src/redbook/src/glredbook11/texsub.java b/src/redbook/src/glredbook11/texsub.java
index 93a2d21..32b7d7d 100644
--- a/src/redbook/src/glredbook11/texsub.java
+++ b/src/redbook/src/glredbook11/texsub.java
@@ -9,7 +9,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook11/varray.java b/src/redbook/src/glredbook11/varray.java
index 7e9379a..a40b994 100644
--- a/src/redbook/src/glredbook11/varray.java
+++ b/src/redbook/src/glredbook11/varray.java
@@ -12,7 +12,7 @@ import java.nio.IntBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook11/wrap.java b/src/redbook/src/glredbook11/wrap.java
index 33e7281..778db3a 100644
--- a/src/redbook/src/glredbook11/wrap.java
+++ b/src/redbook/src/glredbook11/wrap.java
@@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/colormatrix.java b/src/redbook/src/glredbook12x/colormatrix.java
index 5415173..7662915 100644
--- a/src/redbook/src/glredbook12x/colormatrix.java
+++ b/src/redbook/src/glredbook12x/colormatrix.java
@@ -11,7 +11,7 @@ import java.nio.ByteBuffer;
 

 import javax.media.opengl.*;import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/colortable.java b/src/redbook/src/glredbook12x/colortable.java
index cd86fc0..4f5fd5e 100644
--- a/src/redbook/src/glredbook12x/colortable.java
+++ b/src/redbook/src/glredbook12x/colortable.java
@@ -12,7 +12,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;import javax.swing.JFrame;

 import javax.swing.SwingUtilities;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/convolution.java b/src/redbook/src/glredbook12x/convolution.java
index daed275..3f4fbdf 100644
--- a/src/redbook/src/glredbook12x/convolution.java
+++ b/src/redbook/src/glredbook12x/convolution.java
@@ -14,7 +14,7 @@ import javax.media.opengl.*;
 import javax.swing.JFrame;

 import javax.swing.SwingUtilities;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/histogram.java b/src/redbook/src/glredbook12x/histogram.java
index 676d993..dd3bb62 100644
--- a/src/redbook/src/glredbook12x/histogram.java
+++ b/src/redbook/src/glredbook12x/histogram.java
@@ -14,7 +14,7 @@ import javax.media.opengl.*;
 import javax.swing.JFrame;

 import javax.swing.SwingUtilities;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/minmax.java b/src/redbook/src/glredbook12x/minmax.java
index 1837f35..c7e40b4 100644
--- a/src/redbook/src/glredbook12x/minmax.java
+++ b/src/redbook/src/glredbook12x/minmax.java
@@ -12,7 +12,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;import javax.swing.JFrame; 

 import javax.swing.SwingUtilities;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook12x/multitex.java b/src/redbook/src/glredbook12x/multitex.java
index 33b9f63..3cda5f7 100644
--- a/src/redbook/src/glredbook12x/multitex.java
+++ b/src/redbook/src/glredbook12x/multitex.java
@@ -12,7 +12,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook12x/texture3d.java b/src/redbook/src/glredbook12x/texture3d.java
index 96ce680..7258ec1 100644
--- a/src/redbook/src/glredbook12x/texture3d.java
+++ b/src/redbook/src/glredbook12x/texture3d.java
@@ -10,7 +10,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook1314/combiner.java b/src/redbook/src/glredbook1314/combiner.java
index b24061b..fbab5de 100644
--- a/src/redbook/src/glredbook1314/combiner.java
+++ b/src/redbook/src/glredbook1314/combiner.java
@@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
 import javax.media.opengl.*;

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 

 import glredbook10.GLSkeleton;

 import javax.media.opengl.awt.GLJPanel;

diff --git a/src/redbook/src/glredbook1314/cubemap.java b/src/redbook/src/glredbook1314/cubemap.java
index 8f7a39e..c116cf8 100644
--- a/src/redbook/src/glredbook1314/cubemap.java
+++ b/src/redbook/src/glredbook1314/cubemap.java
@@ -9,8 +9,8 @@ import javax.swing.JFrame;
 

 import glredbook10.GLSkeleton;

  

-import com.sun.opengl.util.*; 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.*;

+import com.jogamp.opengl.util.gl2.GLUT;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook1314/mvarray.java b/src/redbook/src/glredbook1314/mvarray.java
index fe96532..405cfbf 100644
--- a/src/redbook/src/glredbook1314/mvarray.java
+++ b/src/redbook/src/glredbook1314/mvarray.java
@@ -10,7 +10,7 @@ import java.nio.IntBuffer;
 

 import javax.media.opengl.*;

 import javax.swing.JFrame;

-import com.sun.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.BufferUtil;

 import javax.media.opengl.awt.GLJPanel;

 import javax.media.opengl.glu.GLU;

 

diff --git a/src/redbook/src/glredbook1314/shadowmap.java b/src/redbook/src/glredbook1314/shadowmap.java
index 3dc79cc..57da6e9 100644
--- a/src/redbook/src/glredbook1314/shadowmap.java
+++ b/src/redbook/src/glredbook1314/shadowmap.java
@@ -8,11 +8,11 @@ import javax.media.opengl.*; import javax.media.opengl.awt.GLCanvas;
 

 import javax.swing.JFrame;

 

-import com.sun.opengl.util.BufferUtil;

-import com.sun.opengl.util.FPSAnimator;

+import com.jogamp.opengl.util.BufferUtil;

+import com.jogamp.opengl.util.FPSAnimator;

 

 

-import com.sun.opengl.util.gl2.GLUT;

+import com.jogamp.opengl.util.gl2.GLUT;

 import glredbook10.GLSkeleton;

 import javax.media.opengl.glu.GLU;