GraphUI: Promote API to JOGL via graphui.jar or within any jogl-all*.jar (WIP)

Root package is 'com.jogamp.graph.ui.gl', i.e. a sub-package of Graph denoting UI and OpenGL usage.

Implementation will stay small, hence relative files size costs are minimal.

Source and build is in parallel to nativewindow, jogl and newt
and has a dependency to all of them.
The NEWT dependencies are merely the input listener ..

6 files changed, 214 insertions, 21 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 78564d1ff..7f7d0ea1d 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -268,6 +268,10 @@
         </condition>
         <echo message="oculusvr.sdk.available: ${oculusvr.sdk.available}" />
 
+        <property name="graphui.make"               value="." />
+        <property name="graphui.build.xml"          value="${graphui.make}/build-graphui.xml" />
+        <property name="build.graphui"              value="${build}/graphui" />
+
         <property name="results.test"               value="${build}/test/results" />
         <property name="build.test"                 value="${build}/test/build" />
         <property name="obj.test"                   value="${build.test}/obj"/>
@@ -485,6 +489,13 @@
             <pathelement location="${oculusvr.jar}" />
         </path>
 
+        <property name="graphui.jar"                    value="${build.graphui}/graphui.jar" />
+
+        <path id="graphui_atoms.classpath">
+            <pathelement location="${graphui.jar}" />
+        </path>
+
+
         <!-- JavaSE combinations -->
         <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen-rt.jar" />
         <property name="gluegen-rt-android.jar"         value="${build.gluegen}/gluegen-rt-android.jar" />
@@ -567,6 +578,22 @@
             <path refid="jogl_all_atoms.classpath" />
         </path>
 
+        <!-- GraphUI Compilation .. -->
+        <path id="newt_jogl_nativewindow_gluegen.compile.classpath">
+            <pathelement location="${gluegen-rt.jar}" />
+            <path refid="nativewindow_all_atoms.classpath" />
+            <path refid="jogl_all_atoms.classpath" />
+            <path refid="newt_all_atoms.classpath" />
+        </path>
+        <path id="newt_jogl_nativewindow_gluegen_android.compile.classpath">
+            <pathelement location="${android.jar}" />
+            <pathelement location="${gluegen-rt-android.jar}" />
+            <path refid="nativewindow_all_atoms.classpath" />
+            <path refid="jogl_all_atoms.classpath" />
+            <path refid="newt_all_atoms.classpath" />
+        </path>
+
+
         <!-- Test Compilation .. -->
         <path id="junit_jogl_newt.compile.classpath">
             <pathelement location="${junit.jar}" />
@@ -582,6 +609,7 @@
             <path refid="nativewindow_all_atoms.classpath" />
             <path refid="jogl_all_atoms.classpath" />
             <path refid="newt_all_atoms.classpath" />
+            <pathelement location="${graphui.jar}" />
         </path>
 
         <path id="junit_jogl_newt_oculusvr.compile.classpath">
@@ -599,6 +627,7 @@
             <path refid="jogl_all_atoms.classpath" />
             <path refid="newt_all_atoms.classpath" />
             <path refid="oculusvr_all_atoms.classpath"/>
+            <pathelement location="${graphui.jar}" />
         </path>
 
         <path id="junit_jogl_newt_android.compile.classpath">
@@ -617,6 +646,7 @@
             <path refid="jogl_all_atoms.classpath" />
             <path refid="newt_all_atoms.classpath" />
             <pathelement location="${newt-driver-android.jar}" />
+            <pathelement location="${graphui.jar}" />
         </path>
 
         <!-- Postbuild: javadoc .. -->
@@ -628,6 +658,7 @@
             <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
             <pathelement location="${jogl-all.jar}" />
             <pathelement location="${oculusvr.jar}" />
+            <pathelement location="${graphui.jar}" />
         </path>
 
         <!-- Test Run w/ AWT .. -->
@@ -641,11 +672,12 @@
             <pathelement location="${gluegen-test-util.jar}" />
             <pathelement location="${jogl-all.jar}" />
             <pathelement location="${oculusvr.jar}" />
+            <pathelement location="${graphui.jar}" />
             <pathelement location="${jogl-test.jar}" />
         </path>
         <property name="junit_jogl_awt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
-        <property name="junit_jogl_awt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
+        <property name="junit_jogl_awt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
 
         <!-- Test Run w/o AWT .. -->
         <path id="junit_jogl_noawt.run.classpath">
@@ -658,11 +690,12 @@
             <pathelement location="${gluegen-test-util.jar}" />
             <pathelement location="${jogl-all-noawt.jar}" />
             <pathelement location="${oculusvr.jar}" />
+            <pathelement location="${graphui.jar}" />
             <pathelement location="${jogl-test.jar}" />
         </path>
         <property name="junit_jogl_noawt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
-        <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
+        <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit4.jar${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
 
         <!-- Test Run w/ SWT .. -->
         <path id="junit_jogl_swt.run.classpath">
@@ -676,10 +709,11 @@
           <pathelement location="${swt.jar}" />
           <pathelement location="${jogl-all.jar}" />
           <pathelement location="${oculusvr.jar}" />
+          <pathelement location="${graphui.jar}" />
           <pathelement location="${jogl-test.jar}" />
         </path>
         <property name="junit_jogl_swt.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${swt.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${swt.jar}${path.separator}${jogl-all.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
 
         <!-- Test Run w/ Android [w/o AWT] .. -->
         <path id="junit_jogl_android.run.classpath">
@@ -693,12 +727,13 @@
             <pathelement location="${gluegen-test-util.jar}" />
             <pathelement location="${jogl-all-android.jar}" />
             <pathelement location="${oculusvr.jar}" />
+            <pathelement location="${graphui.jar}" />
             <pathelement location="${jogl-test.jar}" />
         </path>
         <property name="junit_jogl_android.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-android.jar}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${ant-junit4.jar}${path.separator}${semver.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${gluegen-test-util.jar}${path.separator}${jogl-all-android.jar}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.jar}"/>
         <property name="junit.run.remote.apks" 
-                  value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl-all-android.apk}${path.separator}${oculusvr.jar}${path.separator}${jogl-test.apk}"/>
+                  value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl-all-android.apk}${path.separator}${oculusvr.jar}${path.separator}${graphui.jar}${path.separator}${jogl-test.apk}"/>
 
         <!-- Dummy extra CLASSPATH value, maybe overwritten -->  
         <property name="junit_extra_classpath" value=""/>
diff --git a/make/build-graphui.xml b/make/build-graphui.xml
new file mode 100644
index 000000000..997068aa0
--- /dev/null
+++ b/make/build-graphui.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   - Ant build for GraphUI.  This build has been tested with ANT 1.7.0.  The
+   - optional.jar that contains the optional ANT tasks must be in the ANT
+   - classpath (typically the ant/lib directory).
+   -
+   - Public targets:
+   -   all: (default)
+   -   clean:        clean all built
+   -->
+<project name="GraphUI" basedir="." default="all">
+
+    <import file="build-common.xml"/>
+
+    <!-- needed for outofdate task -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+      <classpath> <pathelement location="${ant-contrib.jar}"/> </classpath>
+    </taskdef>
+
+    <!-- ================================================================== -->
+    <!-- 
+       - Base initialization and detection of operating system.
+      -->
+    <target name="partitioning.setup" depends="common.init">
+        <property name="java.part.graph.ui"
+                  value="com/jogamp/graph/ui/** jogamp/graph/ui/**"/>
+
+        <property name="java.part.graph.ui.shadercode"
+                  value="jogamp/graph/ui/opengl/shader/* jogamp/graph/ui/opengl/shader/bin/**"/>
+
+        <property name="java.part.nonjava" 
+                  value="${java.part.graph.ui.shadercode}"/>
+    </target>
+
+    <!-- ================================================================== -->
+    <!-- 
+       - Declare all paths and user defined variables.
+      -->
+    <target name="declare.common" description="Declare properties" depends="partitioning.setup">
+        <property name="rootrel.src.java"         value="src/graphui/classes" />
+
+        <!-- The source directories. -->
+        <property name="src.java"                 value="${project.root}/${rootrel.src.java}" />
+        
+        <!-- The compiler output directories. -->
+        <property name="classes"                  value="${build.graphui}/classes" />
+    </target>
+    
+    <!-- ================================================================== -->
+    <!-- 
+       - Initialize all parameters required for the build and create any
+       - required directories.
+      -->
+    <target name="init" depends="declare.common">
+        <!-- Create the required output directories. -->
+        <mkdir dir="${classes}" />
+    </target>
+
+    <target name="java.compile">
+        <javac destdir="${classes}"
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               encoding="UTF-8"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="newt_jogl_nativewindow_gluegen.compile.classpath"/>
+            <src path="${src.java}" />
+        </javac>
+        <!-- make shadercode and fonts available in classpath -->
+        <copy todir="${classes}">
+            <fileset dir="${src.java}"
+                     includes="${java.part.nonjava}"
+                     excludes="**/*.java"/>
+        </copy>
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Build the jar files.
+      -->
+    <target name="setup-manifestfile" depends="common.init">
+        <property name="manifestfile" value="graphuiversion"/>
+        <copy file="${manifestfile}"
+            tofile="${build.graphui}/manifest.mf"
+            overwrite="true">
+            <filterset>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${jogl.version}"/>
+                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+                <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+                <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+            </filterset>
+        </copy>
+    </target>
+
+    <target name="build-jars" depends="setup-manifestfile">
+        <jar manifest="${build.graphui}/manifest.mf" destfile="${graphui.jar}" filesonly="true">
+            <fileset dir="${classes}" includes="${java.part.graph.ui}"/>
+        </jar>
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Clean up all that is built.
+      -->
+    <target name="clean" description="Remove all build products" depends="declare.common">
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.graphui}" />
+        </delete>
+    </target>
+
+    <!-- ================================================================== -->
+    <!--
+       - Build everything.
+      -->
+    <target name="all" description="Build GraphUI JAR file." depends="init,java.compile,build-jars,generate.version.txt" />
+
+    <target name="generate.version.txt" depends="init">
+        <!-- Create a version.txt file indicating which version we just built -->
+        <echo message="${jogl.version}" file="${build.graphui}/version.txt" />
+    </target>
+
+</project>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 7a08abe56..ed5919b94 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1205,7 +1205,7 @@
         </javac>
     </target>
 
-        <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
+    <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
     <target name="java.compile.secondpass" depends="java.generate.composable.pipeline, java.compile.secondpass.openal, java.compile.secondpass.javase, java.compile.secondpass.android" />
 
     <target name="java.compile.thirdpass.javase">
diff --git a/make/build.xml b/make/build.xml
index 70414f903..44ede60b9 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -8,13 +8,13 @@
        - Main build target.
       -->
 
-    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
+    <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.graphui,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
 
-    <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
+    <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.graphui,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
 
-    <target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile" />
+    <target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.graphui,build.oculusvr,one.dir,tag.build,test.compile" />
 
-    <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,test.compile" />
+    <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,build.graphui,build.oculusvr,one.dir,test.compile" />
 
     <target name="test.compile">
       <ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/>
@@ -84,6 +84,10 @@
         <ant antfile="${newt.build.xml}" dir="${newt.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
 
+    <target name="build.graphui" depends="init">
+        <ant antfile="${graphui.build.xml}" dir="${graphui.make}" target="all" inheritRefs="true" inheritAll="true"/>
+    </target>
+
     <target name="build.oculusvr" depends="init" if="oculusvr.sdk.available">
         <ant antfile="${oculusvr.build.xml}" dir="${oculusvr.make}" target="all" inheritRefs="true" inheritAll="true"/>
     </target>
@@ -105,6 +109,7 @@
             <fileset dir="${build.jogl}" includes="*.jar" />
             <fileset dir="${build.nativewindow}" includes="*.jar" />
             <fileset dir="${build.newt}" includes="*.jar" />
+            <fileset dir="${build.graphui}" includes="*.jar" />
             <fileset dir="${build.oculusvr}" includes="*.jar" erroronmissingdir="false"/> <!-- optional -->
         </copy>
 
@@ -141,6 +146,7 @@
                     <path refid="nativewindow_android_atoms.classpath"/>
                     <path refid="jogl_all-android_atoms.classpath"/>
                     <path refid="newt_all-android_atoms.classpath"/>
+                    <path refid="graphui_atoms.classpath"/>
                 </zips>
             </archives>
         </jar>
@@ -153,6 +159,7 @@
                     <path refid="nativewindow_all_atoms.classpath"/>
                     <path refid="jogl_all_atoms.classpath"/>
                     <path refid="newt_all_atoms.classpath"/>
+                    <path refid="graphui_atoms.classpath"/>
                     <!-- path refid="oculusvr_all_atoms.classpath"/-->
                 </zips>
             </archives>
@@ -166,6 +173,7 @@
                     <path refid="nativewindow_all-noawt_atoms.classpath"/>
                     <path refid="jogl_all-noawt_atoms.classpath"/>
                     <path refid="newt_all-noawt_atoms.classpath"/>
+                    <path refid="graphui_atoms.classpath"/>
                     <!-- path refid="oculusvr_all_atoms.classpath"/-->
                 </zips>
             </archives>
@@ -176,6 +184,7 @@
                     <path refid="nativewindow_all-noawt_atoms.classpath"/>
                     <path refid="jogl_all-mobile_atoms.classpath"/>
                     <path refid="newt_all-mobile_atoms.classpath"/>
+                    <path refid="graphui_atoms.classpath"/>
                     <!-- path refid="oculusvr_all_atoms.classpath"/-->
                 </zips>
             </archives>
@@ -231,11 +240,13 @@
         <srcfiles dir="${build.nativewindow}" includes="*.jar"/>
         <srcfiles dir="${build.jogl}" includes="*.jar"/>
         <srcfiles dir="${build.newt}" includes="*.jar"/>
+        <srcfiles dir="${build.graphui}" includes="*.jar"/>
       </uptodate>
       <uptodate property="one.dir.skip.android" targetfile="${jogl-all-android.jar}">
         <srcfiles dir="${build.nativewindow}" includes="*.jar"/>
         <srcfiles dir="${build.jogl}" includes="*.jar"/>
         <srcfiles dir="${build.newt}" includes="*.jar"/>
+        <srcfiles dir="${build.graphui}" includes="*.jar"/>
       </uptodate>
       <uptodate property="one.dir.skip.oculusvr" targetfile="${oculusvr.jar}">
         <srcfiles dir="${build.oculusvr}" includes="*.jar"/>
@@ -286,6 +297,7 @@
             <fileset dir="${src}/jogl/classes"/>
             <fileset dir="${build}/jogl/gensrc/classes"/>
             <fileset dir="${src}/newt/classes"/>
+            <fileset dir="${src}/graphui/classes"/>
             <fileset dir="${src}/oculusvr/classes"/>
             <fileset dir="${build}/oculusvr/gensrc/classes"/>
         </zip>
diff --git a/make/graphuiversion b/make/graphuiversion
new file mode 100644
index 000000000..30ac40a6d
--- /dev/null
+++ b/make/graphuiversion
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Application-Name: GraphUI
+Specification-Title: GraphUI API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: GraphUI Runtime Environment
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: com.jogamp.graph.ui
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
+Permissions: all-permissions
+Application-Library-Allowable-Codebase: *
+@JAR_CODEBASE_TAG@
+
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index dbb8ccb27..a20a0f9fd 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -508,8 +508,8 @@ function testawtswt() {
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestGLCanvasSWTNewtCanvasSWTPosInTabs $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
-#testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
+#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
+#testawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtCanvasAWTDemo $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $*
 
 #
@@ -963,10 +963,10 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.UIShapeDemo01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.UITypeDemo01 $*
-#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
-#testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
+#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.UIShapeDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.UITypeDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
+#testawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtCanvasAWTDemo $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
@@ -997,9 +997,9 @@ function testawtswt() {
 #
 #testmobile com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.PerfTextRendererNEWT00 $*
-#testmobile com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
-#testmobile com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
-testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
+#testmobile com.jogamp.opengl.test.junit.graph.ui.demos.GPUTextNewtDemo $*
+#testmobile com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
+testnoawt com.jogamp.opengl.test.junit.graph.ui.demos.GPUUISceneNewtDemo $*
 #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $*
 #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $*
 #testmobile com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*