Cleanup atomic JARs; Removed Debug/Trace pipelines of common profiles

GLU:
  jogl-glu.jar <- jogl-glutess.jar, jogl-glumipmap.jar and
                  javax/media/opengl/glu/*
                  javax/media/opengl/glu/gl2es1/*
                  jogamp/opengl/glu/* jogamp/opengl/glu/error/*

  jogl-glu-gldesktop.jar stays.

CORE (jogl.core.jar):
  + com/jogamp/opengl/util/*
  + jogamp/opengl/util/*
  + com/jogamp/opengl/util/glsl/*
  + jogamp/opengl/util/glsl/*

DEBUG/TRACE: Removed Debug/Trace pipelines of common profiles (won't work anyways)
  - [Debug|Trace]GL2ES1
  - [Debug|Trace]GL2ES2
  - [Debug|Trace]GL2GL3

2 files changed, 26 insertions, 50 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 414b0eba2..f68cc43be 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -279,8 +279,6 @@
         <property name="jogl-glmobile-dbg.jar"          value="${build.jogl}/jogl-glmobile-dbg.jar" />
         <property name="jogl-util.jar"                  value="${build.jogl}/jogl-util.jar" />
         <property name="jogl-util-graph.jar"            value="${build.jogl}/jogl-util-graph.jar" />
-        <property name="jogl-glutess.jar"               value="${build.jogl}/jogl-glu-tess.jar" />
-        <property name="jogl-glumipmap.jar"             value="${build.jogl}/jogl-glu-mipmap.jar" />
         <property name="jogl-util-fixedfuncemu.jar"     value="${build.jogl}/jogl-util-fixedfuncemu.jar" />
         <property name="jogl-awt.jar"                   value="${build.jogl}/jogl-awt.jar" />
         <property name="jogl-swt.jar"                   value="${build.jogl}/jogl-swt.jar" />
@@ -291,6 +289,7 @@
         <property name="jogl-os-android.jar"            value="${build.jogl}/jogl-os-android.jar" />
         <property name="jogl-gldesktop.jar"             value="${build.jogl}/jogl-gldesktop.jar" />
         <property name="jogl-gldesktop-dbg.jar"         value="${build.jogl}/jogl-gldesktop-dbg.jar" />
+        <property name="jogl-glu.jar"                   value="${build.jogl}/jogl-glu.jar" />
         <property name="jogl-glu-gldesktop.jar"         value="${build.jogl}/jogl-glu-gldesktop.jar" />
         <property name="jogl-util-gldesktop.jar"        value="${build.jogl}/jogl-util-gldesktop.jar" />
         <property name="jogl-omx.jar"                   value="${build.jogl}/jogl-omx.jar" />
@@ -303,8 +302,6 @@
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
             <pathelement location="${jogl-util-graph.jar}" />
-            <pathelement location="${jogl-glutess.jar}" />
-            <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
             <pathelement location="${jogl-awt.jar}" />
             <pathelement location="${jogl-swt.jar}" />
@@ -314,6 +311,7 @@
             <pathelement location="${jogl-os-osx.jar}" />
             <pathelement location="${jogl-gldesktop.jar}" />
             <pathelement location="${jogl-gldesktop-dbg.jar}" />
+            <pathelement location="${jogl-glu.jar}" />
             <pathelement location="${jogl-glu-gldesktop.jar}" />
             <pathelement location="${jogl-util-gldesktop.jar}" />
             <pathelement location="${jogl-omx.jar}" />
@@ -325,14 +323,13 @@
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
             <pathelement location="${jogl-util-graph.jar}" />
-            <pathelement location="${jogl-glutess.jar}" />
-            <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
             <pathelement location="${jogl-os-x11.jar}" />
             <pathelement location="${jogl-os-win.jar}" />
             <pathelement location="${jogl-os-osx.jar}" />
             <pathelement location="${jogl-gldesktop.jar}" />
             <pathelement location="${jogl-gldesktop-dbg.jar}" />
+            <pathelement location="${jogl-glu.jar}" />
             <pathelement location="${jogl-glu-gldesktop.jar}" />
             <pathelement location="${jogl-util-gldesktop.jar}" />
             <pathelement location="${jogl-omx.jar}" />
@@ -343,8 +340,7 @@
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
             <pathelement location="${jogl-util-graph.jar}" />
-            <pathelement location="${jogl-glutess.jar}" />
-            <pathelement location="${jogl-glumipmap.jar}" />
+            <pathelement location="${jogl-glu.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
             <pathelement location="${jogl-os-x11.jar}" />
             <pathelement location="${jogl-omx.jar}" />
@@ -355,14 +351,13 @@
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
             <pathelement location="${jogl-util-graph.jar}" />
-            <pathelement location="${jogl-glutess.jar}" />
-            <pathelement location="${jogl-glumipmap.jar}" />
+            <pathelement location="${jogl-glu.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
             <pathelement location="${jogl-os-android.jar}" />
             <pathelement location="${jogl-omx.jar}" />
         </path>
         <!-- 
-            ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} -->
+            ${jogl-core.jar} ${jogl-glu.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} -->
 
         <property name="newt-core.jar"                  value="${build.newt}/newt-core.jar" />
         <property name="newt-ogl.jar"                   value="${build.newt}/newt-ogl.jar" />
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index b72cf4024..379758392 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -88,9 +88,12 @@
         <property name="java.part.gluegen-gl-rt" 
                   value="com/jogamp/gluegen/runtime/opengl/*"/>
 
+        <property name="java.part.core.util"
+                  value="com/jogamp/opengl/util/* jogamp/opengl/util/* com/jogamp/opengl/util/glsl/* jogamp/opengl/util/glsl/* jogamp/opengl/shader/**"/>
+
         <property name="java.part.core" 
-                  value="${java.part.gluegen-gl-rt} javax/media/opengl/* javax/media/opengl/fixedfunc/* javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* com/jogamp/opengl/* com/jogamp/opengl/math/** jogamp/opengl/* jogamp/opengl/glu/* jogamp/opengl/glu/error/* jogamp/opengl/shader/**"/>
-        <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace*"/>
+                  value="${java.part.gluegen-gl-rt} javax/media/opengl/* javax/media/opengl/fixedfunc/* com/jogamp/opengl/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/>
+        <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl*"/>
 
         <property name="java.part.nv-cg"
                   value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/>
@@ -98,13 +101,10 @@
         <property name="java.part.egl"
                   value="jogamp/opengl/egl/*"/>
 
-        <property name="java.part.glutess"
-                  value="jogamp/opengl/glu/tessellator/**"/>
-
-        <property name="java.part.glumipmap"
-                  value="jogamp/opengl/glu/mipmap/**"/>
+        <property name="java.part.glu"
+                  value="javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* jogamp/opengl/glu/* jogamp/opengl/glu/error/* jogamp/opengl/glu/tessellator/** jogamp/opengl/glu/mipmap/**"/>
 
-        <property name="java.part.glugldesktop"
+        <property name="java.part.glu.gldesktop"
                   value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** javax/media/opengl/glu/gl2/**"/>
 
         <property name="java.part.openmax"
@@ -129,37 +129,37 @@
                   value="jogamp/opengl/**/gl2/** jogamp/opengl/**/gl3/** jogamp/opengl/**/gl4/**"/>
 
         <property name="java.part.gldesktop.dbg"
-                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL2GL3.* javax/media/opengl/DebugGL2GL3.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
+                  value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/>
 
         <property name="java.part.es1"
                   value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/>
 
         <property name="java.part.es1.dbg"
-                  value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.* javax/media/opengl/TraceGL2ES1.* javax/media/opengl/DebugGL2ES1.*"/>
+                  value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.*"/>
 
         <property name="java.part.es2"
                   value="javax/media/opengl/**/es2/** com/jogamp/opengl/**/es2/** jogamp/opengl/**/es2/**"/>
 
         <property name="java.part.es2.dbg"
-                  value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGL2ES2.* javax/media/opengl/DebugGL2ES2.*"/>
+                  value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.*"/>
 
         <property name="java.part.awt"
-                  value="javax/media/opengl/awt/** jogamp/opengl/**/awt/**"/>
+                  value="javax/media/opengl/awt/** jogamp/opengl/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
         
         <property name="java.part.swt"
                   value="com/jogamp/opengl/**/swt/**"/>
 
         <property name="java.part.util"
-                  value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** jogamp/opengl/util/* jogamp/opengl/util/av/** jogamp/opengl/util/pngj/**"/>
+                  value="com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/av/* com/jogamp/opengl/util/packrect/** jogamp/opengl/util/av/** jogamp/opengl/util/pngj/**"/>
 
         <property name="java.part.util.awt"
-                  value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/>
+                  value="com/jogamp/opengl/util/**/awt/**"/>
 
         <property name="java.part.util.gldesktop"
                   value="com/jogamp/opengl/util/**/gl2/**"/>
 
         <property name="java.part.util.glsl"
-                  value="com/jogamp/opengl/util/glsl/* com/jogamp/opengl/util/glsl/fixedfunc/* jogamp/opengl/util/glsl/*"/>
+                  value="com/jogamp/opengl/util/glsl/fixedfunc/*"/>
 
         <property name="java.part.util.graph"
                   value="com/jogamp/graph/** jogamp/graph/**"/>
@@ -183,7 +183,7 @@
                   value="${java.part.core.shadercode} ${java.part.util.fixedfuncemu.shadercode} ${java.part.util.graph.shadercode} ${java.part.util.graph.fonts}"/>
 
         <property name="java.part.all-desktop" 
-                  value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glugldesktop} ${java.part.util.gldesktop}"/>
+                  value="${java.part.sdk} ${java.part.glx} ${java.part.wgl} ${java.part.cgl} ${java.part.gldesktop} ${java.part.glu.gldesktop} ${java.part.util.gldesktop}"/>
 
         <!-- condition excludes -->
 
@@ -922,11 +922,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <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" />
-        </java>
     </target>          
 
     <target name="java.generate.composable.pipeline.es2" depends="java.generate.composable.pipeline.check.es2" unless="java.generate.composable.pipeline.skip.es2">
@@ -935,11 +930,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <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" />
-        </java>
     </target>          
 
     <target name="java.generate.composable.pipeline.gl2" depends="java.generate.composable.pipeline.check.gl2" unless="java.generate.composable.pipeline.skip.gl2">
@@ -948,11 +938,6 @@
             <arg value="${src.generated.java}/javax/media/opengl" />
             <classpath refid="pipeline.classpath" />
         </java>
-        <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" />
-        </java>
     </target>          
 
     <target name="java.generate.composable.pipeline.gl3" depends="java.generate.composable.pipeline.check.gl3" unless="java.generate.composable.pipeline.skip.gl3">
@@ -1625,7 +1610,7 @@
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.gldesktop}"
-                     excludes="${java.part.gldesktop.dbg} ${java.part.glugldesktop}"/>
+                     excludes="${java.part.gldesktop.dbg} ${java.part.glu.gldesktop}"/>
         </jar>
 
         <!-- misc -->
@@ -1635,7 +1620,7 @@
         </jar>
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glu-gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glugldesktop}"/>
+                     includes="${java.part.glu.gldesktop}"/>
         </jar>
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-gldesktop.jar}" filesonly="true">
             <fileset dir="${classes}"
@@ -1655,13 +1640,9 @@
             <fileset dir="${classes}"
                      includes="${java.part.sdk}"/>
         </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glutess.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.glutess}"/>
-        </jar>
-        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glumipmap.jar}" filesonly="true">
+        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-glu.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.glumipmap}"/>
+                     includes="${java.part.glu}"/>
         </jar>
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util.jar}" filesonly="true">
             <fileset dir="${classes}"