Remove CDC

9 files changed, 42 insertions, 499 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 876aa27ce..29faaef20 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -124,9 +124,12 @@
         </condition>
         <echo message="swt.jar=${swt.jar}" />
 
-        <property name="target.sourcelevel" value="1.4" />
+        <property name="target.sourcelevel" value="1.5" />
         <property name="host.sourcelevel"   value="1.5" />
 
+        <!-- property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" /-->
+        <property name="javadoc.link" value="http://download.oracle.com/javase/1.5.0/docs/api/" />
+
         <!-- NOTE: the value of the debug and optimise attributes will not be overridden if already set externally -->
         <property name="javacdebug"       value="true" /> 
         <property name="javacdebuglevel"  value="source,lines" /> 
@@ -140,9 +143,6 @@
              and need exact string matching, which is why they use file.separator
              instead of "/". -->
 
-        <property name="javac.bootclasspath-cdc.jar" value="${gluegen.root}/make/lib/cdc_fp.jar"/>
-        <echo message="javac.bootclasspath-cdc.jar: ${javac.bootclasspath-cdc.jar}" />
-
         <!-- NOTE that these require a checked-out GlueGen, etc workspace as a -->
         <!-- sibling of the JOGL workspace. -->
         <property name="gluegen.make"               value="${gluegen.root}/make" />
@@ -292,32 +292,6 @@
             <pathelement location="${newt.all-noawt.jar}" />
         </path>
 
-        <!-- CDC combinations . NO.AWT -->
-        <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="${nativewindow.all.cdc.jar}" />
-        </path>
-
-        <path id="nativewindow_gluegen_jogl.classpath-cdc">
-            <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="${nativewindow.all.cdc.jar}" />
-            <pathelement location="${jogl.all.cdc.jar}" />
-            <pathelement location="${newt.all.cdc.jar}" />
-        </path>
-
         <!-- Atomic JavaSE JARS -->
 
         <property name="nativewindow.core.jar"         value="${build.nativewindow}/nativewindow.core.jar" />
@@ -361,33 +335,6 @@
         <property name="newt.hw.broadcomegl.jar"        value="${build.newt}/newt.hw.broadcomegl.jar" />
         <property name="newt.hw.intelgdl.jar"           value="${build.newt}/newt.hw.intelgdl.jar" />
 
-        <!-- Atomic CDC JARS -->
-        <property name="nativewindow.core.cdc.jar"       value="${build.nativewindow}/nativewindow.core.cdc.jar" />
-        <property name="nativewindow.os.x11.cdc.jar"     value="${build.nativewindow}/nativewindow.os.x11.cdc.jar"  />
-        <property name="nativewindow.os.win.cdc.jar"     value="${build.nativewindow}/nativewindow.os.win.cdc.jar"  />
-
-        <property name="jogl.core.cdc.jar"              value="${build.jogl}/jogl.core.cdc.jar" />
-        <property name="jogl.gles1.cdc.jar"             value="${build.jogl}/jogl.gles1.cdc.jar" />
-        <property name="jogl.gles1.dbg.cdc.jar"         value="${build.jogl}/jogl.gles1.dbg.cdc.jar" />
-        <property name="jogl.gles2.cdc.jar"             value="${build.jogl}/jogl.gles2.cdc.jar" />
-        <property name="jogl.gles2.dbg.cdc.jar"         value="${build.jogl}/jogl.gles2.dbg.cdc.jar" />
-        <property name="jogl.egl.cdc.jar"               value="${build.jogl}/jogl.egl.cdc.jar" />
-        <property name="jogl.glutess.cdc.jar"           value="${build.jogl}/jogl.glu.tess.cdc.jar" />
-        <property name="jogl.glumipmap.cdc.jar"         value="${build.jogl}/jogl.glu.mipmap.cdc.jar" />
-        <property name="jogl.os.x11.cdc.jar"            value="${build.jogl}/jogl.os.x11.cdc.jar" />
-        <property name="jogl.os.win.cdc.jar"            value="${build.jogl}/jogl.os.win.cdc.jar" />
-        <property name="jogl.os.osx.cdc.jar"            value="${build.jogl}/jogl.os.osx.cdc.jar" />
-        <property name="jogl.util.cdc.jar"              value="${build.jogl}/jogl.util.cdc.jar" />
-        <property name="jogl.util.fixedfuncemu.cdc.jar" value="${build.jogl}/jogl.util.fixedfuncemu.cdc.jar" />
-
-        <property name="newt.core.cdc.jar"              value="${build.newt}/newt.core.cdc.jar" />
-        <property name="newt.os.x11.cdc.jar"            value="${build.newt}/newt.os.x11.cdc.jar" />
-        <property name="newt.os.win.cdc.jar"            value="${build.newt}/newt.os.win.cdc.jar" />
-        <property name="newt.os.osx.cdc.jar"            value="${build.newt}/newt.os.osx.cdc.jar" />
-        <property name="newt.ogl.cdc.jar"               value="${build.newt}/newt.ogl.cdc.jar" />
-        <property name="newt.hw.broadcomegl.cdc.jar"    value="${build.newt}/newt.hw.broadcomegl.cdc.jar" />
-        <property name="newt.hw.intelgdl.cdc.jar"       value="${build.newt}/newt.hw.intelgdl.cdc.jar" />
-
         <!-- The location and name of the configuration ANT file that will 
            - validate to ensure that all user-define variables are set. -->
         <property name="validate.user.properties" value="${make}/validate-properties.xml" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index cfdbf75e8..a0a9c70f8 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -163,11 +163,11 @@
         <property name="java.excludes.fixme" 
                   value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
 
-        <property name="java.excludes.cdcfp"
-                  value="${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gldesktop} ${java.part.gldesktop.dbg} ${java.part.awt} ${java.part.glugldesktop} ${java.part.util.awt} ${java.part.util.gldesktop} com/jogamp/opengl/util/TGAWriter.java"/>
+        <property name="java.part.desktop"
+                   value="${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.excludes.fixme} ${java.part.nv-cg} ${java.part.gldesktop} ${java.part.gldesktop.dbg} ${java.part.awt} ${java.part.glugldesktop} ${java.part.util.awt} ${java.part.util.gldesktop} com/jogamp/opengl/util/TGAWriter.java"/>
 
         <condition property="java.excludes.desktop"
-                   value="${java.part.glx} ${java.excludes.cdcfp}">
+                   value="${java.part.desktop}">
            <isset property="setup.nodesktop"/> 
         </condition>
 
@@ -198,7 +198,6 @@
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build.jogl}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
         <property name="src.generated.java.cg" value="${src.generated.java}/com/jogamp/opengl/cg" />
         <property name="src.generated.c" value="${src.generated}/native/jogl" />
         <property name="src.generated.c.openmax" value="${src.generated}/native/openmax" />
@@ -206,7 +205,6 @@
         
         <!-- The compiler output directories. -->
         <property name="classes"                    value="${build.jogl}/classes" />
-        <property name="classes-cdc"                value="${build.jogl}/classes-cdc" />
         <property name="obj.joglsub"                value="${obj.jogl}/jogl" />
         <property name="obj.cgsub"                  value="${obj.jogl}/cg" />
 
@@ -264,7 +262,6 @@
         <property name="javadoc" value="${project.root}/javadoc_jogl_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_jogl_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" />
-        <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="JOGL API -- JSR-231 ${jogl_base_version} Specification" />
         <property name="javadoc.overview" value="doc/jogl/spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" />
@@ -294,20 +291,6 @@
         <property name="gl2.headers" value="${stub.includes}/opengl/GL/*.h" /> <!-- NOTE:  this MUST be relative for FileSet --> <!-- CHECK:  this may need to be pruned for each platform -->
     </target>
 
-    <target name="setup.javacdc">
-        <copy file="../src/jogl/classes/jogamp/opengl/SystemUtil.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/jogamp/opengl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/TextureIO.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javame_cdc_fp" tofile="${src.generated.java-cdc}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
-    </target>
-
-    <target name="setup.javase">
-        <copy file="../src/jogl/classes/jogamp/opengl/SystemUtil.java.javase" tofile="${src.generated.java}/jogamp/opengl/SystemUtil.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/TextureIO.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/TextureIO.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/DDSImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/DDSImage.java" />
-        <copy file="../src/jogl/classes/com/jogamp/opengl/util/texture/spi/TGAImage.java.javase" tofile="${src.generated.java}/com/jogamp/opengl/util/texture/spi/TGAImage.java" />
-    </target>
-
     <!-- ================================================================== -->
     <!-- 
        - Initialize all parameters required for the build and create any
@@ -316,21 +299,15 @@
     <target name="init" depends="declare.common, declare.gl.gles, declare.gl.gl2">
         <!-- Create the required output directories. -->
         <mkdir dir="${src.generated.java}" />
-        <mkdir dir="${src.generated.java-cdc}" />
         <mkdir dir="${src.generated.c}" />
         <mkdir dir="${src.generated.c}/MacOSX" />
         <mkdir dir="${src.generated.c}/Windows" />
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${src.generated.c.openmax}" />
         <mkdir dir="${classes}" />
-        <mkdir dir="${classes-cdc}" />
         <mkdir dir="${obj.jogl}" />
         <mkdir dir="${obj.joglsub}" />
         <mkdir dir="${obj.cgsub}" />
-
-        <!-- Set up Java SE and Java CDC files -->
-        <antcall target="setup.javase"  inheritRefs="true" />
-        <antcall target="setup.javacdc" inheritRefs="true" />
     </target>
 
     <!--
@@ -676,7 +653,7 @@
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                includeAntRuntime="true"
-               source="1.5" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="gluegen-gl.classpath"/>
             <src path="${src.java}" />
         </javac>
@@ -880,10 +857,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGLES1.java javax/media/opengl/TraceGLES1.java javax/media/opengl/DebugGL2ES1.java javax/media/opengl/TraceGL2ES1.java" />
-        </copy>
     </target>          
 
     <target name="java.generate.composable.pipeline.es2" depends="java.generate.composable.pipeline.check.es2" unless="java.generate.composable.pipeline.skip.es2">
@@ -897,10 +870,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGLES2.java javax/media/opengl/TraceGLES2.java javax/media/opengl/DebugGL2ES2.java javax/media/opengl/TraceGL2ES2.java" />
-        </copy>
     </target>          
 
     <target name="java.generate.composable.pipeline.gl2" depends="java.generate.composable.pipeline.check.gl2" unless="java.generate.composable.pipeline.skip.gl2">
@@ -914,10 +883,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGL2.java javax/media/opengl/TraceGL2.java javax/media/opengl/DebugGL2GL3.java javax/media/opengl/TraceGL2GL3.java" />
-        </copy>
     </target>          
 
     <target name="java.generate.composable.pipeline.gl3" depends="java.generate.composable.pipeline.check.gl3" unless="java.generate.composable.pipeline.skip.gl3">
@@ -926,20 +891,12 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGL3.java javax/media/opengl/TraceGL3.java" />
-        </copy>
 
         <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" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGL3bc.java javax/media/opengl/TraceGL3bc.java" />
-        </copy>
     </target>          
 
     <target name="java.generate.composable.pipeline.gl4" depends="java.generate.composable.pipeline.check.gl4" unless="java.generate.composable.pipeline.skip.gl4">
@@ -948,20 +905,12 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGL4.java javax/media/opengl/TraceGL4.java" />
-        </copy>
 
         <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" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="javax/media/opengl/DebugGL4bc.java javax/media/opengl/TraceGL4bc.java" />
-        </copy>
     </target>          
 
     <target name="java.generate.composable.pipeline" depends="java.generate.composable.pipeline.es1, java.generate.composable.pipeline.es2, java.generate.composable.pipeline.gl2, java.generate.composable.pipeline.gl3, java.generate.composable.pipeline.gl4">
@@ -993,10 +942,6 @@
             <arg value="prolog_xor_downstream" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" />
-        </copy>
     </target>          
     <target name="java.generate.composable.pipeline.custom" depends="init, common.gluegen.build, java.generate.composable.pipeline.custom.glfixfunc">
     </target>
@@ -1015,21 +960,11 @@
                fork="yes"
                memoryMaximumSize="${javac.memorymax}"
                includeAntRuntime="false"
-               source="1.4" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+               source="${target.sourcelevel}" debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
         </javac>
-
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="**" 
-                     excludes="com/jogamp/opengl/cg/** jogamp/opengl/gl2/** jogamp/opengl/gl3/** jogamp/opengl/gl4/** jogamp/opengl/glu/gl2/** javax/media/opengl/glu/gl2/**"/>
-        </copy>
-        <copy todir="${classes-cdc}">
-            <fileset dir="${classes}"
-                     includes="**" />
-        </copy>
     </target>
 
     <target name="java.compile.secondpass.javase">
@@ -1047,23 +982,7 @@
         </javac>
     </target>
 
-           <!--    bootclasspath="${javac.bootclasspath-cdc.jar}" -->
-    <target name="java.compile.secondpass.javacdc" unless="setup.noCDC">
-        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
-        <javac destdir="${classes-cdc}"
-               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.excludes.cdcfp}"
-               source="${target.sourcelevel}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen.classpath-cdc"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java-cdc}" />
-        </javac>
-    </target>
-
-    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase, java.compile.secondpass.javacdc" />
+    <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.javase" />
 
     <target name="java.compile.thirdpass.javase">
         <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
@@ -1080,23 +999,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.thirdpass.javacdc" unless="setup.noCDC">
-        <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
-        <javac destdir="${classes-cdc}"
-               excludes="${java.excludes.all},${java.excludes.cdcfp}"
-               source="${target.sourcelevel}"
-               bootclasspath="${javac.bootclasspath-cdc.jar}"
-               fork="yes"
-               memoryMaximumSize="${javac.memorymax}"
-               includeAntRuntime="false"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen.classpath-cdc"/>
-            <src path="${src.java}" />
-            <src path="${src.generated.java-cdc}" />
-        </javac>
-    </target>
-
-    <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase, java.compile.thirdpass.javacdc" />
+    <target name="java.compile.thirdpass" depends="java.generate.composable.pipeline.custom, java.compile.thirdpass.javase" />
 
     <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass,java.compile.thirdpass" />
 
@@ -1282,7 +1185,6 @@
 
     <target name="rename.dylib" if="isOSX">
         <move file="${src}" tofile="${dest}" />
-        <copy file="${dest}" tofile="${dest-cdc}" />
     </target>
 
     <macrodef name="c.build">
@@ -1390,7 +1292,6 @@
         <antcall target="rename.dylib" inheritRefs="true">
             <param name="src"  value="${build.jogl}/obj/lib@{output.lib.name}.dylib" />
             <param name="dest" value="${build.jogl}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build.jogl}/obj/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
@@ -1403,7 +1304,7 @@
     </macrodef>  
 
     <target name="c.build.jogl.prepare.openMAX" if="useOpenMAX">
-      <javah destdir="${src.generated.c.openmax}" classpath="${classes-cdc}" class="com.jogamp.openmax.OMXInstance" />
+      <javah destdir="${src.generated.c.openmax}" classpath="${classes}" class="com.jogamp.openmax.OMXInstance" />
     </target>
 
     <target name="c.build.jogl.prepare" depends="c.build.jogl.prepare.openMAX">
@@ -1464,7 +1365,7 @@
     <!--
        - Build the jogl.jar files.
       -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
 
     <target name="setup-manifestfile" depends="common.init">
         <property name="manifestfile" value="joglversion"/>
@@ -1480,20 +1381,6 @@
         </copy>
     </target>
 
-    <target name="setup-manifestfile-cdc" unless="setup.noCDC" depends="common.init">
-        <property name="manifestfile" value="joglversion-cdc"/>
-        <copy file="${manifestfile}"
-            tofile="${build.jogl}/tempversion-cdc"
-            overwrite="true">
-            <filterset>
-                <filter token="VERSION" value="${jogl.version}"/>
-                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-                <filter token="BASEVERSION" value="${jogl_base_version}"/>
-            </filterset>
-        </copy>
-    </target>
-
     <target name="build-cg-jar-javase" depends="setup-manifestfile" if="jogl.cg">
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.cg.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -1539,44 +1426,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-os-desktop-cdc" depends="setup-manifestfile" unless="setup.nodesktop">
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.x11.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}" includes="${java.part.glx}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.win.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}" includes="${java.part.wgl}" />
-        </jar>
-        <jar manifest="${build.jogl}/tempversion" destfile="${jogl.os.osx.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}" includes="${java.part.cgl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-es-cdc" depends="setup-manifestfile-cdc" unless="setup.noCDC">
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.egl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.egl}"
-                     excludes="${java.part.awt}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.es1}"
-                     excludes="${java.part.es1.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles1.dbg.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.es1.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.es2} ${java.part.openmax}"
-                     excludes="${java.part.es2.dbg}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.gles2.dbg.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.es2.dbg}"/>
-        </jar>
-    </target>
-
     <target name="build-jars-awt-javase" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="${build.jogl}/tempversion" destfile="${jogl.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -1615,49 +1464,6 @@
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
     </target>
-    <target name="build-jars-all-cdc" depends="setup-manifestfile">
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.all.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.core} ${java.part.egl} ${java.part.glutess} ${java.part.glumipmap} ${java.part.openmax} ${java.part.sdk} ${java.part.glx} ${java.part.cgl} ${java.part.wgl} ${java.part.es1} ${java.part.es1.dbg} ${java.part.es2} ${java.part.es2.dbg} ${java.part.util} ${java.part.util.glsl} ${java.part.util.fixedfuncemu}"
-                     excludes="${java.excludes.cdcfp}"/>
-            <fileset dir="${src.java}"
-                     includes="${java.part.util.fixedfuncemu.shadercode}"/>
-        </jar>
-    </target>
-
-
-    <target name="build-jars-cdc" depends="setup-manifestfile-cdc, build-jars-es-cdc, build-jars-all-cdc" unless="setup.noCDC">
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.core.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.core}"
-                     excludes="${java.part.core.exclude}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glutess.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.glutess}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.glumipmap.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.glumipmap}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.util} ${java.part.util.glsl}"
-                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${jogl.util.fixedfuncemu.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.util.fixedfuncemu}"/>
-            <fileset dir="${src.java}"
-                     includes="${java.part.util.fixedfuncemu.shadercode}"/>
-        </jar>
-        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
-            <fileset dir="${obj.jogl}">
-              <include name="*_es1.${native.library.suffix-cdc}" />
-              <include name="*_es2.${native.library.suffix-cdc}" />
-            </fileset>
-        </jar>
-    </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
         <!--os specific gldesktop-->
@@ -1733,7 +1539,7 @@
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -1750,7 +1556,7 @@
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -1768,7 +1574,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
@@ -1785,7 +1591,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
@@ -1803,7 +1609,7 @@
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
@@ -1820,7 +1626,7 @@
                  sourcepath="${src.java};${src.generated.java}"        
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="512m"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 2ed2bca04..50ed109a2 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -118,12 +118,10 @@
         <!-- The generated source directories. -->
         <property name="src.generated" value="${build.nativewindow}/gensrc" />
         <property name="src.generated.java" value="${src.generated}/classes" />
-        <property name="src.generated.java-cdc" value="${src.generated}/classes-cdc" />
         <property name="src.generated.c" value="${src.generated}/native" />
         
         <!-- The compiler output directories. -->
         <property name="classes" value="${build.nativewindow}/classes" />
-        <property name="classes-cdc" value="${build.nativewindow}/classes-cdc" />
 
         <!-- The headers from which Java files are generated -->
         <dirset id="stub.includes.fileset.all" dir=".">
@@ -152,7 +150,6 @@
         <property name="javadoc" value="${project.root}/javadoc_nativewindow_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" />
-        <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${nativewindow_base_version} Specification" />
         <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" />
         <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" />
@@ -171,13 +168,11 @@
     <target name="init" depends="declare.common">
         <!-- Create the required output directories. -->
         <mkdir dir="${src.generated.java}" />
-        <mkdir dir="${src.generated.java-cdc}" />
         <mkdir dir="${src.generated.c}" />
         <mkdir dir="${src.generated.c}/MacOSX" />
         <mkdir dir="${src.generated.c}/Windows" />
         <mkdir dir="${src.generated.c}/X11" />
         <mkdir dir="${classes}" />
-        <mkdir dir="${classes-cdc}" />
         <mkdir dir="${obj.nativewindow}" />
     </target>
 
@@ -232,10 +227,6 @@
                  emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="jogamp/nativewindow/x11/** jogamp/nativewindow/windows/**" />
-        </copy>
     </target>
 
     <target name="java.generate.jawt" unless="setup.noAWT">
@@ -252,10 +243,6 @@
                  emitter="com.jogamp.gluegen.JavaEmitter">
             <classpath refid="gluegen.classpath" />
         </gluegen>
-        <copy todir="${src.generated.java-cdc}">
-            <fileset dir="${src.generated.java}"
-                     includes="jogamp/nativewindow/jawt/**" />
-        </copy>
     </target>
 
     <target name="java.generate.platforms" >
@@ -313,22 +300,6 @@
        - Compile the original and generated source.  The composable pipelines
        - will be generated.
       -->
-    <target name="java.compile.javacdc" depends="java.generate" unless="setup.noCDC">
-        <!-- Perform the first pass Java compile; everything -->
-        <javac destdir="${classes-cdc}"
-               excludes="${java.part.awt} ${java.excludes.all}"
-               source="${target.sourcelevel}"
-               classpath="${gluegen-rt.cdc.jar}"
-               bootclasspath="${javac.bootclasspath-cdc.jar}"
-               fork="yes"
-               includeAntRuntime="false"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <src path="${src.java}" />
-            <src path="${src.generated.java-cdc}" />
-        </javac>
-    </target>
-
     <target name="java.compile.javase" depends="java.generate">
         <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
@@ -344,7 +315,7 @@
         </javac>
     </target>
 
-    <target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
+    <target name="java.compile" depends="java.compile.javase" />
 
     <!-- ================================================================== -->
     <!-- 
@@ -519,7 +490,6 @@
 
     <target name="rename.dylib" if="isOSX">
         <move file="${src}" tofile="${dest}" />
-        <copy file="${dest}" tofile="${dest-cdc}" />
     </target>
 
     <macrodef name="c.build">
@@ -610,7 +580,6 @@
         <antcall target="rename.dylib" inheritRefs="true">
             <param name="src"  value="${build.nativewindow}/obj/lib@{output.lib.name}.dylib" />
             <param name="dest" value="${build.nativewindow}/obj/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${build.nativewindow}/obj/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
@@ -682,7 +651,7 @@
     <!--
        - Build the nativewindow.jar files.
       -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
 
     <target name="setup-manifestfile">
         <property name="manifestfile" value="nativewindowversion"/>
@@ -698,20 +667,6 @@
         </copy>
     </target>
 
-    <target name="setup-manifestfile-cdc">
-        <property name="manifestfile" value="nativewindowversion-cdc"/>
-        <copy file="${manifestfile}"
-          tofile="tempversion-cdc"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${nativewindow.version}"/>
-              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-              <filter token="BASEVERSION" value="${nativewindow_base_version}"/>
-          </filterset>
-        </copy>
-    </target>
-
     <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${nativewindow.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -726,12 +681,6 @@
                      includes="${java.part.x11}" />
         </jar>
     </target>
-    <target name="build-jars-x11-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.os.x11.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.x11}" />
-        </jar>
-    </target>
 
     <target name="build-jars-windows" depends="setup-manifestfile">
         <jar manifest="tempversion" destfile="${nativewindow.os.win.jar}" filesonly="true">
@@ -739,12 +688,6 @@
                      includes="${java.part.windows}" />
         </jar>
     </target>
-    <target name="build-jars-windows-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.os.win.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.windows}" />
-        </jar>
-    </target>
 
     <target name="build-jars-all" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${nativewindow.all.jar}" filesonly="true">
@@ -759,12 +702,6 @@
                      excludes="${java.part.awt}"/>
         </jar>
     </target>
-    <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.all.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="javax/media/nativewindow/** com/jogamp/nativewindow/** jogamp/nativewindow/**" />
-        </jar>
-    </target>
 
     <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-x11,build-jars-windows,build-jars-all,build-jars-all-noawt">
         <jar manifest="tempversion" destfile="${nativewindow.core.jar}" filesonly="true">
@@ -780,22 +717,6 @@
         <delete file="tempversion"/>
     </target>
 
-    <target name="build-jars-cdc" depends="setup-manifestfile-cdc,build-jars-x11-cdc,build-jars-windows-cdc,build-jars-all-cdc">
-        <jar manifest="tempversion-cdc" destfile="${nativewindow.core.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.core}"
-                     excludes="${java.part.awt} ${java.part.x11} ${java.part.windows}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
-            <fileset dir="${obj.nativewindow}">
-              <include name="*_jvm.${native.library.suffix-cdc}" />
-              <include name="*_x11.${native.library.suffix-cdc}" />
-            </fileset>
-        </jar>
-
-        <delete file="tempversion-cdc"/>
-    </target>
-
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
@@ -808,10 +729,10 @@
         <javadoc packagenames="${javadoc.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
-                 classpath="${gluegen-rt.cdc.jar}"
+                 classpath="${gluegen-rt.jar}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
         </javadoc>
@@ -822,10 +743,10 @@
         <javadoc packagenames="${javadoc.spec.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"
-                 classpath="${gluegen-rt.cdc.jar}"
+                 classpath="${gluegen-rt.jar}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
         </javadoc>
@@ -836,10 +757,10 @@
         <javadoc packagenames="${javadoc.dev.packagenames}"
                  excludepackagenames="${java.excludes.javadoc.packagenames}"
                  sourcepath="${src.java};${src.generated.java}"        
-                 classpath="${gluegen-rt.cdc.jar}"
+                 classpath="${gluegen-rt.jar}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
         </javadoc>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 7ad013f6c..c91a2fda1 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -122,8 +122,6 @@
            <isset property="setup.noOpenGL"/>
         </condition>
 
-        <property name="java.excludes.cdcfp" value="${java.part.awt}"/>
-
         <condition property="java.excludes.desktop"
                    value="${java.part.x11} ${java.part.windows}, ${java.part.macosx}, ${java.part.awt}">
            <isset property="setup.nodesktop"/>
@@ -153,13 +151,11 @@
 
         <!-- The compiler output directories. -->
         <property name="classes" value="${build.newt}/classes" />
-        <property name="classes-cdc" value="${build.newt}/classes-cdc" />
 
         <!-- The javadoc dirs. -->
         <property name="javadoc" value="${project.root}/javadoc_newt_public" />
         <property name="javadoc.spec" value="${project.root}/javadoc_newt_spec" />
         <property name="javadoc.dev" value="${project.root}/javadoc_newt_dev" />
-        <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
         <property name="javadoc.windowtitle" value="NEWT API -- ${newt_base_version} Specification" />
         <property name="javadoc.overview" value="spec-overview.html" />
         <property name="javadoc.spec.packagenames" value="com.jogamp.newt, com.jogamp.newt.event.*, com.jogamp.newt.opengl" />
@@ -184,7 +180,6 @@
         <mkdir dir="${src.generated.c}/IntelGDL" />
         <mkdir dir="${src.generated.c}/BroadcomEGL" />
         <mkdir dir="${classes}" />
-        <mkdir dir="${classes-cdc}" />
         <mkdir dir="${obj.newt}" />
     </target>
 
@@ -206,22 +201,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.javacdc" unless="setup.noCDC">
-        <!-- Perform the first pass Java compile; everything -->
-        <javac destdir="${classes-cdc}"
-               excludes="${java.excludes.all} ${java.excludes.cdcfp}"
-               source="${target.sourcelevel}"
-               bootclasspath="${javac.bootclasspath-cdc.jar}"
-               fork="yes"
-               includeAntRuntime="false"
-               memoryMaximumSize="${javac.memorymax}"
-               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="nativewindow_gluegen_jogl.classpath-cdc"/>
-            <src path="${src.java}" />
-        </javac>
-    </target>
-
-    <target name="java.compile" depends="java.compile.javase,java.compile.javacdc" />
+    <target name="java.compile" depends="java.compile.javase" />
 
     <!-- ================================================================== -->
     <!--
@@ -428,7 +408,6 @@
 
     <target name="rename.dylib" if="isOSX">
         <move file="${src}" tofile="${dest}" />
-        <copy file="${dest}" tofile="${dest-cdc}" />
     </target>
 
     <macrodef name="c.build">
@@ -502,7 +481,6 @@
         <antcall target="rename.dylib" inheritRefs="true">
             <param name="src"  value="${obj.newt}/lib@{output.lib.name}.dylib" />
             <param name="dest" value="${obj.newt}/lib@{output.lib.name}.jnilib" />
-            <param name="dest-cdc" value="${obj.newt}/lib@{output.lib.name}.so" />
         </antcall>
 
         <!-- FIXME: this is a hack; the cpptask should have an option to change the
@@ -569,7 +547,7 @@
     <!--
        - Build the newt.jar files.
       -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
 
     <target name="setup-manifestfile">
         <property name="manifestfile" value="newtversion"/>
@@ -585,20 +563,6 @@
         </copy>
     </target>
 
-    <target name="setup-manifestfile-cdc">
-        <property name="manifestfile" value="newtversion-cdc"/>
-        <copy file="${manifestfile}"
-          tofile="tempversion-cdc"
-          overwrite="true">
-          <filterset>
-              <filter token="VERSION" value="${newt.version}"/>
-              <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
-              <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
-              <filter token="BASEVERSION" value="${newt_base_version}"/>
-          </filterset>
-        </copy>
-    </target>
-
     <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${newt.awt.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -624,24 +588,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-opengl-cdc" depends="setup-manifestfile-cdc" unless="setup.noOpenGL">
-        <jar manifest="tempversion-cdc" destfile="${newt.ogl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.opengl}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.hw.broadcomegl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.broadcomegl}"/>
-        </jar>
-    </target>
-
-    <target name="build-jars-driver-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${newt.hw.intelgdl.cdc.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.intelgdl}"/>
-        </jar>
-    </target>
-
     <target name="build-jars-desktop" depends="setup-manifestfile" unless="setup.nodesktop">
         <jar manifest="tempversion" destfile="${newt.os.x11.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -657,21 +603,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-desktop-cdc" depends="setup-manifestfile-cdc" unless="setup.nodesktop">
-        <jar manifest="tempversion-cdc" destfile="${newt.os.x11.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.x11}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.os.win.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.windows}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${newt.os.osx.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.macosx}"/>
-        </jar>
-    </target>
-
     <target name="build-jars-all-awt" depends="setup-manifestfile" unless="setup.noAWT">
         <jar manifest="tempversion" destfile="${newt.all.jar}" filesonly="true">
             <fileset dir="${classes}">
@@ -701,16 +632,6 @@
         </jar>
     </target>
 
-    <target name="build-jars-all-cdc" depends="setup-manifestfile-cdc">
-        <jar manifest="tempversion-cdc" destfile="${newt.all.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     excludes="${java.excludes.cdcfp}" >
-                <include name="com/jogamp/newt/**" />
-                <include name="jogamp/newt/**" />
-            </fileset>
-        </jar>
-    </target>
-
     <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-opengl,build-jars-all-noawt,build-jars-all-awt,build-jars-desktop,build-jars-driver">
         <jar manifest="tempversion" destfile="${newt.core.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -724,19 +645,6 @@
         <delete file="tempversion"/>
     </target>
 
-    <target name="build-jars-cdc" depends="setup-manifestfile-cdc,build-jars-opengl-cdc,build-jars-all-cdc,build-jars-desktop-cdc,build-jars-driver-cdc" unless="setup.noCDC">
-        <jar manifest="tempversion-cdc" destfile="${newt.core.cdc.jar}" filesonly="true">
-            <fileset dir="${classes-cdc}"
-                     includes="${java.part.core}"/>
-        </jar>
-        <jar manifest="tempversion-cdc" destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-            <fileset dir="${obj.newt}">
-              <include name="*.${native.library.suffix-cdc}" />
-            </fileset>
-        </jar>
-        <delete file="tempversion-cdc"/>
-    </target>
-
     <!-- ================================================================== -->
     <!--
        - Build the Javadocs for the sources.
@@ -751,7 +659,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -765,7 +673,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.spec}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
@@ -779,7 +687,7 @@
                  sourcepath="${src.java};${src.generated.java}"
                  destdir="${javadoc.dev}" windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
          <classpath refid="nativewindow_gluegen_jogl.classpath"/>
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml
index 505129d6d..325b737bb 100644
--- a/make/build-staticglgen.xml
+++ b/make/build-staticglgen.xml
@@ -29,7 +29,7 @@
         <mkdir dir="${classes}" />
 
         <!-- Compile BuildStaticGLInfo -->
-        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="1.4" debug="true" debuglevel="${javacdebuglevel}"
+        <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
                includeAntRuntime="false">
             <classpath refid="antlr.classpath" />
         </javac>
@@ -50,7 +50,7 @@
         <!-- Build the BuildStaticGLInfo ANT task.
            - NOTE:  ONLY the StaticGLGen is built at this time.  BuildStaticGLInfo 
            -        itself is built in a separate task.  -->
-        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="1.4" debug="true" debuglevel="${javacdebuglevel}"
+        <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}"
                includeAntRuntime="false">
             <src path="${src.java}" />
             <classpath refid="classpath" />
diff --git a/make/build.xml b/make/build.xml
index 69609881b..518e17309 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -72,10 +72,10 @@
         <delete includeEmptyDirs="true" quiet="true" dir="${lib}" failonerror="false" />
         <mkdir dir="${lib}" />
         <copy todir="${lib}">
-            <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
-            <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix} *.${native.library.suffix-cdc}" />
+            <fileset dir="${gluegen.root}/${rootrel.build}/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/jogl/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/nativewindow/obj" includes="*.${native.library.suffix}" />
+            <fileset dir="${build}/newt/obj" includes="*.${native.library.suffix}" />
         </copy>
     </target>
 
@@ -185,9 +185,6 @@
     </target>
 
     <target name="javadoc.init" depends="init">
-        <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/" />
-        <!--property name="javadoc.link" value="http://download.oracle.com/javase/1.4.2/docs/api/"/-->
-
         <!-- Link offline with relative URLs does not work.
              Link online with relative URLs works, 
              so we have to assume the same relative online folder structure:
@@ -252,7 +249,7 @@
                  windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  access="public"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
@@ -273,7 +270,7 @@
                  windowtitle="${javadoc.spec.windowtitle}"
                  overview="${javadoc.overview}"
                  access="public"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
@@ -295,7 +292,7 @@
                  windowtitle="${javadoc.windowtitle}"
                  overview="${javadoc.overview}" 
                  access="protected"
-                 source="1.5"
+                 source="${target.sourcelevel}"
                  maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
@@ -316,7 +313,7 @@
                  windowtitle="${javadoc.nw.spec.windowtitle}"
                  overview="${javadoc.nw.overview}"
                  access="public"
-                 source="1.4"
+                 source="${target.sourcelevel}"
                  maxmemory="1024m"
                  bottom="${javadoc.bottom}" >
             <classpath refid="jogl_newt_all.classpath"/>
diff --git a/make/joglversion-cdc b/make/joglversion-cdc
deleted file mode 100644
index 4b1745606..000000000
--- a/make/joglversion-cdc
+++ /dev/null
@@ -1,12 +0,0 @@
-Specification-Title: Java Bindings for OpenGL API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp Community
-Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
-Implementation-Version: @VERSION@
-Implementation-Branch: @SCM_BRANCH@
-Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp Community
-Implementation-URL: http://jogamp.org/
-Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/nativewindowversion-cdc b/make/nativewindowversion-cdc
deleted file mode 100644
index 78098c9ff..000000000
--- a/make/nativewindowversion-cdc
+++ /dev/null
@@ -1,12 +0,0 @@
-Specification-Title: Native Window Interface API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp Community
-Implementation-Title: Native Window Interface Runtime Environment CDC
-Implementation-Version: @VERSION@
-Implementation-Branch: @SCM_BRANCH@
-Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp Community
-Implementation-URL: http://jogamp.org/
-Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true
diff --git a/make/newtversion-cdc b/make/newtversion-cdc
deleted file mode 100644
index d687ca320..000000000
--- a/make/newtversion-cdc
+++ /dev/null
@@ -1,12 +0,0 @@
-Specification-Title: NEWT API Specification CDC
-Specification-Version: @BASEVERSION@
-Specification-Vendor: JogAmp Community
-Implementation-Title: NEWT Runtime Environment CDC
-Implementation-Version: @VERSION@
-Implementation-Branch: @SCM_BRANCH@
-Implementation-Commit: @SCM_COMMIT@
-Implementation-Vendor: JogAmp Community
-Implementation-URL: http://jogamp.org/
-Extension-Name: com.jogamp.newt
-Implementation-Vendor-Id: com.jogamp
-Trusted-Library: true