Gluegen parts in src/gluegen (clean)

- Adding gluegen-gl.jar for GlueGen GL compile time parts.
- Removed dead build-gluegen.xml
- Adding com/jogamp/gluegen/runtime/opengl/* to jogl core
- Moved gluegen gl part to jogl/classes

6 files changed, 115 insertions, 272 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index ab2c9df32..381bee1aa 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -167,6 +167,13 @@
           <pathelement location="${antlr.jar}" />
         </path>
 
+        <property name="gluegen-gl.jar"             value="${build.jogl}/gluegen-gl.jar" />
+
+        <path id="gluegen-gl.classpath">
+          <pathelement location="${gluegen.jar}" />
+          <pathelement location="${gluegen-gl.jar}" />
+        </path>
+
         <!-- JavaSE combinations -->
         <property name="gluegen-rt.jar"             value="${build.gluegen}/gluegen-rt.jar" />
         <property name="jogl.test.jar"              value="${build.jogl}/jogl.test.jar"/>
@@ -253,25 +260,26 @@
         </path>
 
         <!-- CDC combinations . NO.AWT -->
-        <property name="gluegen-rt-cdc.jar"         value="${build.gluegen}/gluegen-rt-cdc.jar" />
+        <property name="gluegen-rt.cdc.jar"         value="${build.gluegen}/gluegen-rt.cdc.jar" />
+        <property name="gluegen-gl.cdc.jar"         value="${build.jogl}/gluegen-gl.cdc.jar" />
 
         <property name="nativewindow.all.cdc.jar"   value="${build.nativewindow}/nativewindow.all.cdc.jar" />
         <property name="jogl.all.cdc.jar"           value="${build.jogl}/jogl.all.cdc.jar" />
         <property name="newt.all.cdc.jar"           value="${build.newt}/newt.all.cdc.jar" />
 
         <path id="nativewindow_gluegen.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${gluegen-rt.cdc.jar}" />
             <pathelement location="${nativewindow.all.cdc.jar}" />
         </path>
 
         <path id="nativewindow_gluegen_jogl.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${gluegen-rt.cdc.jar}" />
             <pathelement location="${nativewindow.all.cdc.jar}" />
             <pathelement location="${jogl.all.cdc.jar}" />
         </path>
 
         <path id="jogl_newt_all.classpath-cdc">
-            <pathelement location="${gluegen-rt-cdc.jar}" />
+            <pathelement location="${gluegen-rt.cdc.jar}" />
             <pathelement location="${nativewindow.all.cdc.jar}" />
             <pathelement location="${jogl.all.cdc.jar}" />
             <pathelement location="${newt.all.cdc.jar}" />
diff --git a/make/build-gluegen.xml b/make/build-gluegen.xml
deleted file mode 100644
index cac29362c..000000000
--- a/make/build-gluegen.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   - Ant build for JOGL's GlueGen and corresponding ANT task.  This build 
-   - should not be called directly.  It is invoked from the main "build.xml"
-   - file and relies on the properties set therein.
-   -
-   - The optional.jar that contains the optional ANT tasks must be in the ANT
-   - classpath (typically the ant/lib directory).
-   -
-   - This build has been tested with ANT 1.5.3 and JOGL 1.1.1.1.
-   -
-   - Public targets:
-   -   all:  clean and build GlueGen and GlueGen Ant task
-   -   clean:  clean all built
-  -->
-<project name="JOGL.GlueGen" default="all">
-    <!-- ================================================================== -->
-    <!-- 
-       - Declare all paths and user defined variables.
-      -->
-    <target name="declare" description="Declare properties">
-
-        <!-- Create the classpath for ANTLR.  This requires the user-defined
-           - "antlr.jar" property. -->
-        <path id="antlr.classpath">
-            <pathelement location="${antlr.jar}" />
-        </path>
-    
-        <!-- The location of the GlueGen source and the C grammar files. -->
-        <property name="gluegen" value="${src.java}/com/sun/gluegen" />
-        <property name="c.grammar" value="${gluegen}/cgram" />
-        
-        <!-- The resulting location of the generated Java files from the
-           - C grammar via ANTLR. -->
-        <property name="gluegen.build" value="${src.generated.java}/com/sun/gluegen" />
-        <property name="generated.java.from.grammar" value="${gluegen.build}/cgram" />
-
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Build GlueGen.
-      -->
-    <target name="build.gluegen" depends="declare">
-
-        <!-- Because ANTLR looks for importVocab files in the current
-             working directory, it likes to have all of its files,
-             including supergrammars, in one place, so copy all of the
-             grammars to the output directory up front so we don't put
-             temporary files into the source tree -->
-        <mkdir dir="${generated.java.from.grammar}" />
-	<copy todir="${generated.java.from.grammar}">
-	    <fileset dir="${c.grammar}">
-	        <include name="*.g" />
-            </fileset>
-	</copy>
-
-        <!-- Generate the Java files from the C grammar using ANTLR. -->
-        <antcall target="generate.c.grammar">
-	    <param name="output.dir" value="${generated.java.from.grammar}" />
-            <param name="target" value="StdCParser.g" />
-        </antcall>
-        <antcall target="generate.c.grammar.glib">
-	    <param name="output.dir" value="${generated.java.from.grammar}" />
-            <param name="target" value="GnuCParser.g" />
-            <param name="glib" value="StdCParser.g" />
-        </antcall>
-        <antcall target="generate.c.grammar">
-	    <param name="output.dir" value="${generated.java.from.grammar}" />
-            <param name="target" value="GnuCTreeParser.g" />
-        </antcall>
-        <antcall target="generate.c.grammar.glib">
-	    <param name="output.dir" value="${generated.java.from.grammar}" />
-            <param name="target" value="GnuCEmitter.g" />
-            <param name="glib" value="GnuCTreeParser.g" />
-        </antcall>
-        <antcall target="generate.c.grammar.glib">
-	    <param name="output.dir" value="${generated.java.from.grammar}" />
-            <param name="target" value="HeaderParser.g" />
-            <param name="glib" value="GnuCTreeParser.g" />
-        </antcall>
-    
-        <!-- Ensure that the output classes directory exists. -->
-        <mkdir dir="${classes}" />
-            
-        <!-- Build GlueGen using the generated Java files along with the
-           - original source. 
-           - NOTE:  GlueGenTask is NOT built at this time.  It is done in
-           -        a separate task.  -->
-        <javac destdir="${classes}" includes="**/gluegen/**" excludes="**/GlueGenTask.java"
-               includeAntRuntime="false"
-               source="1.4" debug="true" debuglevel="${javacdebuglevel}">
-            <src path="${src.java}" />
-            <src path="${src.generated.java}" />
-            <classpath refid="antlr.classpath" />
-        </javac>
-        
-        <!-- Inform the user that GlueGen has been successfully built. -->
-        <echo message="" />
-        <echo message="GlueGen has been built successfully." />
-    </target>      
-    
-    <!--
-       - Using ANTLR generate the specified Java files.
-       -
-       - @param target the grammar file to process
-       - @param output.dir the directory to write the generated files to.  If
-       -        the directory does not exist, it will be created.
-      -->
-    <target name="generate.c.grammar" depends="declare">
-        <!-- Generate the Java files -->
-        <antlr target="${output.dir}/${target}" outputdirectory="${output.dir}">
-            <classpath refid="antlr.classpath" />
-        </antlr>
-    </target>
-    
-    <!--
-       - Using ANTLR generate the specified Java files with an overridden
-       - grammar file.
-       -
-       - @param target the grammar file to process
-       - @param glib the overridding grammar file
-       - @param output.dir the directory to write the generated files to.  If
-       -        the directory does not exist, it will be created.
-      -->
-    <target name="generate.c.grammar.glib" depends="declare">
-        <!-- Generate the Java files -->
-        <antlr target="${output.dir}/${target}" glib="${output.dir}/${glib}" outputdirectory="${output.dir}">
-            <classpath refid="antlr.classpath" />
-        </antlr>
-    </target>
-    
-    <!-- ================================================================== -->
-    <!--
-       - Build the GlueGen ANT task.
-      -->
-    <target name="build.gluegen.task" depends="declare">
-        <!-- Ensure that the output classes directory exists. -->
-        <mkdir dir="${classes}" />
-            
-        <!-- Build the GlueGen ANT task.
-           - NOTE:  ONLY the GlueGenTask is built at this time.  GlueGen 
-           -        itself is built in a separate task.  -->
-        <javac destdir="${classes}" includes="**/GlueGenTask.java" source="1.4" debug="true" debuglevel="source,lines"
-               includeAntRuntime="false">
-            <src path="${src.java}" />
-            <classpath refid="antlr.classpath" />
-        </javac>
-        
-        <!-- Inform the user that the GlueGen ANT task has been successfully 
-             built. -->
-        <echo message="" />
-        <echo message="GlueGen ANT task has been built successfully." />
-    </target>
-
-    <!-- ================================================================== -->
-    <!--
-       - Clean up all that is built.  
-       - NOTE:  this is a bit heavy-handed as it may delete more than just
-       -        what is built with this build.
-      -->
-    <target name="clean" depends="declare">
-        <delete includeEmptyDirs="true" quiet="true">
-            <fileset dir="${src.generated.java}" />
-            <fileset dir="${classes}" />
-        </delete>
-    </target>
-    
-    <!-- ================================================================== -->
-    <!--
-       - Build GlueGen and the GlueGen ANT task.
-      -->
-    <target name="all" depends="declare">
-        <!-- Build GlueGen -->
-        <antcall target="build.gluegen" />    
-    
-        <!-- Build the GlueGen ANT task -->
-        <antcall target="build.gluegen.task" />
-    </target>      
-
-</project>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 6c1996503..10ad52948 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -22,7 +22,7 @@
    -   clean:        clean all built
    -   javadoc:      create the standard developer Javadoc (recommended)
    -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec:   create the standard developer Javadoc but exclude com.sun.* classes
+   -   javadoc.spec:   create the standard developer Javadoc but exclude com.jogamp.* classes
    -   javadoc.dev.all: create the internal developer Javadoc.  This includes the
    -                       Java and C file generators. Note that it is only supported
    -                       to create the Javadoc for the platform on which you are
@@ -67,8 +67,11 @@
        - Base initialization and detection of operating system.
       -->
     <target name="partitioning.setup" depends="common.init">
+        <property name="java.part.gluegen-gl" 
+                  value="com/jogamp/gluegen/opengl/** com/jogamp/gluegen/runtime/opengl/*"/>
+
         <property name="java.part.core" 
-                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/>
+                  value="javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/gluegen/runtime/opengl/* com/jogamp/opengl/impl/* com/jogamp/opengl/impl/glu/* com/jogamp/opengl/impl/glu/error/*"/>
         <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
 
         <property name="java.part.nv-cg"
@@ -268,7 +271,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
@@ -406,9 +409,9 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -419,8 +422,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es1.cfg" 
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -431,8 +434,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_es2.cfg" 
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -443,16 +446,16 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3-subset.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
         <gluegen src="${stub.includes.opengl}/gl2.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2_gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -463,8 +466,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -475,8 +478,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -487,8 +490,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl3bc.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -499,8 +502,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-if-gl4.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -511,9 +514,9 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-gl4bc.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -524,9 +527,9 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es1.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -537,8 +540,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/gl-es2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -549,8 +552,8 @@
         <gluegen src="${gl.c}" 
                  config="${gl.cfg.nsig}"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.nativesig.NativeSignatureEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.nativesig.NativeSignatureEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target> -->
 
@@ -561,8 +564,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-base.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -573,8 +576,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2es1.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -585,8 +588,8 @@
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/glu-gl2.cfg"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -597,8 +600,8 @@
                  outputRootDir="${build.jogl}"
                  config="${glext.platform.cfg}"
                  includeRefid="stub.includes.fileset.all.gldesktop"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -610,9 +613,9 @@
                  outputRootDir="${build.jogl}"
                  config="${window.es.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -624,9 +627,9 @@
                  outputRootDir="${build.jogl}"
                  config="${window.es.ext.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.opengl.GLEmitter"
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter"
                  debug="false">
-            <classpath refid="gluegen.classpath" />
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -637,8 +640,8 @@
                  outputRootDir="${build.jogl}"
                  config="${window.os0.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -649,8 +652,8 @@
                  outputRootDir="${build.jogl}"
                  config="${window.os1.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.opengl.GLEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.opengl.GLEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -667,16 +670,32 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
+    <target name="build.gluegen-gl.jar" depends="init, common.gluegen.build, setup-manifestfile">
+        <javac destdir="${classes}"
+               includes="${java.part.gluegen-gl}"
+               fork="yes"
+               memoryMaximumSize="${javac.memorymax}"
+               includeAntRuntime="true"
+               source="1.5" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="gluegen-gl.classpath"/>
+            <src path="${src.java}" />
+        </javac>
+
+        <jar manifest="${build.jogl}/tempversion" destfile="${gluegen-gl.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.gluegen-gl}"/>
+        </jar>
+    </target>
+
+    <target name="java.generate" depends="build.gluegen-gl.jar, java.generate.check" unless="java.generate.skip">
 
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
+        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
+        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
+                 classpathref="gluegen-gl.classpath" />
                  
-        <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the 
-           - Java files -->
+        <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the Java files -->
 
         <!-- Just to have a fast test of single interfaces .. 
             <antcall target="java.generate.gl_if"      inheritRefs="true" />
@@ -753,20 +772,20 @@
        - from the C GL headers.  This involves setting the taskdef and creating
        - the classpath reference id then running the task on each header.
       -->
-    <target name="java.generate.cg" depends="java.generate.cg.check" if="jogl.cg" unless="java.generate.cg.skip">
+    <target name="java.generate.cg" depends="build.gluegen-gl.jar,java.generate.cg.check" if="jogl.cg" unless="java.generate.cg.skip">
         <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
+        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
+        <taskdef name="staticglgen" classname="com.jogamp.gluegen.opengl.ant.StaticGLGenTask"
+                 classpathref="gluegen-gl.classpath" />
 
         <!-- Generate CgGL interface class -->
         <gluegen src="${stub.includes.opengl}/cg.c" 
                  outputRootDir="${build.jogl}"
                  config="${config.jogl}/cg-common.cfg"
                  includeRefid="stub.includes.cg.fileset.all"
-                 emitter="com.sun.gluegen.procaddress.ProcAddressEmitter">
-            <classpath refid="gluegen.classpath" />
+                 emitter="com.jogamp.gluegen.procaddress.ProcAddressEmitter">
+            <classpath refid="gluegen-gl.classpath" />
         </gluegen>
     </target>
 
@@ -852,12 +871,12 @@
     </target>        
 
     <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GLES1" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2ES1" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -869,12 +888,12 @@
     </target>          
 
     <target name="java.generate.composable.pipeline.es2" depends="java.generate.composable.pipeline.check.es2" unless="java.generate.composable.pipeline.skip.es2">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GLES2" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2ES2" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -886,12 +905,12 @@
     </target>          
 
     <target name="java.generate.composable.pipeline.gl2" depends="java.generate.composable.pipeline.check.gl2" unless="java.generate.composable.pipeline.skip.gl2">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2GL3" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -903,7 +922,7 @@
     </target>          
 
     <target name="java.generate.composable.pipeline.gl3" depends="java.generate.composable.pipeline.check.gl3" unless="java.generate.composable.pipeline.skip.gl3">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL3" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -913,7 +932,7 @@
                      includes="javax/media/opengl/DebugGL3.java javax/media/opengl/TraceGL3.java" />
         </copy>
 
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL3bc" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -925,7 +944,7 @@
     </target>          
 
     <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL4" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -935,7 +954,7 @@
                      includes="javax/media/opengl/DebugGL4.java javax/media/opengl/TraceGL4.java" />
         </copy>
 
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL4bc" />
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
@@ -966,7 +985,7 @@
                   targetfile="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl/FixedFuncImpl.java" />
     </target>        
     <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc">
-        <java classname="com.sun.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
+        <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true">
             <arg value="javax.media.opengl.GL2ES1" />
             <arg value="${src.generated.java}/com/jogamp/opengl/util/glsl/fixedfunc/impl" />
             <arg value="com.jogamp.opengl.util.glsl.fixedfunc.impl.FixedFuncImpl" />
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index ede1f0f2d..51596fdeb 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -22,7 +22,7 @@
    -   clean:        clean all built
    -   javadoc:      create the standard developer Javadoc (recommended)
    -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec: create the standard developer Javadoc but exclude com.sun.* classes
+   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
    -   javadoc.dev:  create the internal developer Javadoc.  This includes the
    -                       Java and C file generators. Note that it is only supported
    -                       to create the Javadoc for the platform on which you are
@@ -36,7 +36,7 @@
    - directory.
    -   
    - Thanks to Rob Grzywinski and Artur Biesiadowski for the bulk of the
-   - ANT build, including the GlueGen and StaticGLInfo tasks, the building of
+   - ANT build, including the GlueGen tasks, the building of
    - the Java generated sources, the first and second phase Java compiles, and
    - the building of the jar file. Thanks to Alex Radeski for the bulk of the
    - port to the ant-contrib CPPTask framework. Thanks to Athomas Goldberg for
@@ -156,7 +156,7 @@
 
         <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" />
 
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.util.*,com.jogamp.nativewindow.impl.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.nativewindow.util.*,com.jogamp.nativewindow.impl.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
     <property name="javadoc.bottom" value="Copyright 2005 Sun Microsystems, Inc. All rights reserved. Use is subject to &lt;a href=&quot;http://jcp.org/en/jsr/detail?id=231&quot;&gt;license terms&lt;/a&gt;." />
     </target>
     
@@ -226,7 +226,7 @@
                  outputRootDir="${build.nativewindow}"
                  config="${windowlib.os.cfg}"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.JavaEmitter">
+                 emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
         <copy todir="${src.generated.java-cdc}">
@@ -246,7 +246,7 @@
                  config="${jawt.cfg}"
                  literalInclude="${stub.includes}/jni"
                  includeRefid="stub.includes.fileset.platform"
-                 emitter="com.sun.gluegen.JavaEmitter">
+                 emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
         <copy todir="${src.generated.java-cdc}">
@@ -269,14 +269,11 @@
       -->
     <target name="java.generate" depends="init, common.gluegen.build, java.generate.check" unless="java.generate.skip">
 
-        <!-- Add the GlueGen and BuildStaticGLInfo tasks to ANT -->
-        <taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask"
-                 classpathref="gluegen.classpath" />
-        <taskdef name="staticglgen" classname="com.sun.gluegen.ant.StaticGLGenTask"
+        <!-- Add the GlueGen task to ANT -->
+        <taskdef name="gluegen" classname="com.jogamp.gluegen.ant.GlueGenTask"
                  classpathref="gluegen.classpath" />
                  
-        <!-- Use the GlueGen and BuildStaticGLInfo tasks to generate the 
-           - Java files -->
+        <!-- Use the GlueGen task to generate the Java files -->
 
         <echo message="Generating platform-specifics: X11" />
         <antcall target="java.generate.platforms" inheritRefs="true">
@@ -303,7 +300,7 @@
         <!-- Inform the user that the generators have successfully created 
            - the necessary Java files -->
         <echo message="" />
-        <echo message="GlueGen and BuildStaticGLInfo have successfully generated files." />
+        <echo message="GlueGen has successfully generated files." />
     
     </target>      
 
@@ -317,7 +314,7 @@
         <javac destdir="${classes-cdc}"
                excludes="${java.part.awt} ${java.excludes.all}"
                source="${target.sourcelevel}"
-               classpath="${gluegen-rt-cdc.jar}"
+               classpath="${gluegen-rt.cdc.jar}"
                bootclasspath="${javac.bootclasspath-cdc.jar}"
                fork="yes"
                includeAntRuntime="false"
@@ -802,7 +799,7 @@
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
-                 classpath="${gluegen-rt-cdc.jar}"
+                 classpath="${gluegen-rt.cdc.jar}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  source="1.4"
@@ -816,7 +813,7 @@
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"
-                 classpath="${gluegen-rt-cdc.jar}"
+                 classpath="${gluegen-rt.cdc.jar}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
                  source="1.4"
@@ -830,7 +827,7 @@
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
-                 classpath="${gluegen-rt-cdc.jar}"
+                 classpath="${gluegen-rt.cdc.jar}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  source="1.4"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 2946084f8..d8fb0a59d 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -22,7 +22,7 @@
    -   clean:        clean all built
    -   javadoc:      create the standard developer Javadoc (recommended)
    -                 (Note: should build all first - may be dependence in the future)
-   -   javadoc.spec: create the standard developer Javadoc but exclude com.sun.* classes
+   -   javadoc.spec: create the standard developer Javadoc but exclude com.jogamp.* classes
    -   javadoc.dev:  create the internal developer Javadoc.  This includes the
    -                       Java and C file generators. Note that it is only supported
    -                       to create the Javadoc for the platform on which you are
diff --git a/make/build.xml b/make/build.xml
index c4ee35091..cdf7f38db 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -22,7 +22,7 @@
         <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames},${javadoc.spec.packagenames},com.jogamp.opengl.util.*,com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" />
 
         <property name="javadoc.dev" value="${build}/javadoc_dev" />
-        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.newt.*,com.sun.gluegen,com.jogamp.gluegen.runtime" />
+        <property name="javadoc.dev.packagenames" value="${javadoc.packagenames},com.jogamp.opengl.impl.*,com.jogamp.nativewindow.impl.*,com.jogamp.newt.*,com.jogamp.gluegen,com.jogamp.gluegen.runtime" />
 
         <property name="java.excludes.javadoc.packagenames" value="com.jogamp.opengl.impl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
         <property name="javadoc.bottom" value="Copyright 2010 JogAmp Community." />
@@ -104,7 +104,7 @@
         </copy>
         <mkdir dir="${archive}/lib" />
         <copy todir="${archive}/lib">
-            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt-cdc.jar" />
+            <fileset dir="${gluegen.root}/${rootrel.build}" includes="gluegen-rt.jar gluegen-rt.cdc.jar" />
             <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
             <fileset dir="${build}/jogl" includes="*.jar" excludes="*natives*.jar" />
             <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />