From 0d46fa3091e40271ba2247f6c4236cb2358f5151 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Sat, 27 Mar 2010 22:00:35 +0100
Subject: modifications due to refactorings: com.sun.opengl ->
 com.jogamp.opengl.

---
 src/redbook/nbproject/build-impl.xml          | 187 ++++++++++++++++++++------
 src/redbook/nbproject/genfiles.properties     |   4 +-
 src/redbook/src/glredbook10/GLSkeleton.java   |   2 +-
 src/redbook/src/glredbook10/accanti.java      |   2 +-
 src/redbook/src/glredbook10/accnot.java       |   2 +-
 src/redbook/src/glredbook10/accpersp.java     |   2 +-
 src/redbook/src/glredbook10/accum.java        |   2 +-
 src/redbook/src/glredbook10/aim.java          |   2 +-
 src/redbook/src/glredbook10/alpha3D.java      |   2 +-
 src/redbook/src/glredbook10/anti.java         |   2 +-
 src/redbook/src/glredbook10/antipoly.java     |   2 +-
 src/redbook/src/glredbook10/bezcurve.java     |   2 +-
 src/redbook/src/glredbook10/bezmesh.java      |   2 +-
 src/redbook/src/glredbook10/bezsurf.java      |   2 +-
 src/redbook/src/glredbook10/checker.java      |   2 +-
 src/redbook/src/glredbook10/checker2.java     |   2 +-
 src/redbook/src/glredbook10/chess.java        |   2 +-
 src/redbook/src/glredbook10/clip.java         |   2 +-
 src/redbook/src/glredbook10/colormat.java     |   2 +-
 src/redbook/src/glredbook10/cone.java         |   2 +-
 src/redbook/src/glredbook10/cube.java         |   2 +-
 src/redbook/src/glredbook10/depthcue.java     |   2 +-
 src/redbook/src/glredbook10/dof.java          |   2 +-
 src/redbook/src/glredbook10/dofnot.java       |   2 +-
 src/redbook/src/glredbook10/doublebuf.java    |   2 +-
 src/redbook/src/glredbook10/feedback.java     |   2 +-
 src/redbook/src/glredbook10/fog.java          |   2 +-
 src/redbook/src/glredbook10/font.java         |   2 +-
 src/redbook/src/glredbook10/light.java        |   2 +-
 src/redbook/src/glredbook10/maplight.java     |   2 +-
 src/redbook/src/glredbook10/material.java     |   2 +-
 src/redbook/src/glredbook10/mipmap.java       |   2 +-
 src/redbook/src/glredbook10/movelight.java    |   2 +-
 src/redbook/src/glredbook10/pickdepth.java    |   2 +-
 src/redbook/src/glredbook10/pickline.java     |   2 +-
 src/redbook/src/glredbook10/picksquare.java   |   2 +-
 src/redbook/src/glredbook10/planet.java       |   2 +-
 src/redbook/src/glredbook10/planetup.java     |   2 +-
 src/redbook/src/glredbook10/robot.java        |   2 +-
 src/redbook/src/glredbook10/sccolorlight.java |   2 +-
 src/redbook/src/glredbook10/scene.java        |   2 +-
 src/redbook/src/glredbook10/scenebamb.java    |   2 +-
 src/redbook/src/glredbook10/sceneflat.java    |   2 +-
 src/redbook/src/glredbook10/select.java       |   2 +-
 src/redbook/src/glredbook10/sphere.java       |   2 +-
 src/redbook/src/glredbook10/stencil.java      |   2 +-
 src/redbook/src/glredbook10/stroke.java       |   2 +-
 src/redbook/src/glredbook10/tea.java          |   2 +-
 src/redbook/src/glredbook10/teaambient.java   |   2 +-
 src/redbook/src/glredbook10/teapots.java      |   2 +-
 src/redbook/src/glredbook10/texgen.java       |   4 +-
 src/redbook/src/glredbook10/texturesurf.java  |   2 +-
 src/redbook/src/glredbook11/image.java        |   2 +-
 src/redbook/src/glredbook11/polyoff.java      |   2 +-
 src/redbook/src/glredbook11/texbind.java      |   2 +-
 src/redbook/src/glredbook11/texgen.java       |   4 +-
 src/redbook/src/glredbook11/texsub.java       |   2 +-
 src/redbook/src/glredbook11/varray.java       |   2 +-
 src/redbook/src/glredbook11/wrap.java         |   2 +-
 src/redbook/src/glredbook12x/colormatrix.java |   2 +-
 src/redbook/src/glredbook12x/colortable.java  |   2 +-
 src/redbook/src/glredbook12x/convolution.java |   2 +-
 src/redbook/src/glredbook12x/histogram.java   |   2 +-
 src/redbook/src/glredbook12x/minmax.java      |   2 +-
 src/redbook/src/glredbook12x/multitex.java    |   2 +-
 src/redbook/src/glredbook12x/texture3d.java   |   2 +-
 src/redbook/src/glredbook1314/combiner.java   |   2 +-
 src/redbook/src/glredbook1314/cubemap.java    |   4 +-
 src/redbook/src/glredbook1314/mvarray.java    |   2 +-
 src/redbook/src/glredbook1314/shadowmap.java  |   6 +-
 70 files changed, 223 insertions(+), 114 deletions(-)

(limited to 'src/redbook')

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/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45
+nbproject/build-impl.xml.script.CRC32=d690f492
+nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
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;
  
-- 
cgit v1.2.3