diff --git a/make/Manifest-android-launcher b/make/Manifest-android-launcher
index d97af775..52dfca67 100755
--- a/make/Manifest-android-launcher
+++ b/make/Manifest-android-launcher
@@ -12,3 +12,7 @@ Implementation-Vendor-Id: com.jogamp
 Implementation-URL: http://jogamp.org/
 Extension-Name: jogamp.android.launcher
 Trusted-Library: true
+Permissions: all-permissions
+Name: jogamp/android/launcher/
+Sealed: true
+@JAR_CODEBASE_TAG@
diff --git a/make/Manifest-rt b/make/Manifest-rt
index 99c6c7eb..ce6a0a52 100755
--- a/make/Manifest-rt
+++ b/make/Manifest-rt
@@ -12,3 +12,7 @@ Implementation-Vendor-Id: com.jogamp
 Implementation-URL: http://jogamp.org/
 Extension-Name: com.jogamp.common
 Trusted-Library: true
+Permissions: all-permissions
+Name: jogamp/common/
+Sealed: true
+@JAR_CODEBASE_TAG@
diff --git a/make/Manifest-rt-android b/make/Manifest-rt-android
index 54d8c373..5a44f9af 100755
--- a/make/Manifest-rt-android
+++ b/make/Manifest-rt-android
@@ -12,3 +12,7 @@ Implementation-Vendor-Id: com.jogamp
 Implementation-URL: http://jogamp.org/
 Extension-Name: com.jogamp.common
 Trusted-Library: true
+Permissions: all-permissions
+Name: jogamp/common/
+Sealed: true
+@JAR_CODEBASE_TAG@
diff --git a/make/Manifest-rt-natives b/make/Manifest-rt-natives
new file mode 100755
index 00000000..58768aa4
--- /dev/null
+++ b/make/Manifest-rt-natives
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Specification-Title: GlueGen Java Bindings Generator
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: GlueGen Run-Time
+Implementation-Version: @VERSION@
+Implementation-Build: @BUILD_VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-Vendor-Id: com.jogamp
+Implementation-URL: http://jogamp.org/
+Extension-Name: com.jogamp.common
+Trusted-Library: true
+Permissions: all-permissions
+@JAR_CODEBASE_TAG@
diff --git a/make/Manifest-rt.cdc b/make/Manifest-rt.cdc
index 2e808db6..3f4df941 100755
--- a/make/Manifest-rt.cdc
+++ b/make/Manifest-rt.cdc
@@ -12,3 +12,7 @@ Implementation-Vendor-Id: com.jogamp
 Implementation-URL: http://jogamp.org/
 Extension-Name: com.jogamp.common
 Trusted-Library: true
+Permissions: all-permissions
+Name: jogamp/common/
+Sealed: true
+@JAR_CODEBASE_TAG@
diff --git a/make/build.xml b/make/build.xml
index de2f41d3..65b24ef4 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -517,7 +517,7 @@
 
       <antcall target="c.manifest" inheritRefs="true" />
 
-      <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt.temp">
+      <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt-natives.temp">
         <fileset dir="${build}/obj">
           <include name="*gluegen-rt.${native.library.suffix}" />
         </fileset>
@@ -743,6 +743,7 @@
             <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
             <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
             <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+            <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
         </filterset>
     </copy>
 
@@ -770,6 +771,20 @@
             <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
             <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
             <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+            <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+        </filterset>
+    </copy>
+
+    <copy file="Manifest-rt-natives"
+          tofile="${build}/Manifest-rt-natives.temp"
+          overwrite="true">
+        <filterset>
+            <filter token="VERSION" value="${jogamp.version}"/>
+            <filter token="BUILD_VERSION" value="${gluegen.version}"/>
+            <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
+            <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
+            <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+            <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
         </filterset>
     </copy>
 
@@ -830,6 +845,7 @@
             <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
             <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
             <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+            <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
         </filterset>
     </copy>
 
@@ -889,6 +905,7 @@
             <filter token="SCM_BRANCH" value="${gluegen.build.branch}"/>
             <filter token="SCM_COMMIT" value="${gluegen.build.commit}"/>
             <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+            <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
         </filterset>
     </copy>
 
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 7aab7c53..7efc4c12 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -73,7 +73,7 @@
     </fail>
 
     <property name="android.keystore.file" value="/non.existing.user.keystore.file"/> <!-- default - maybe overriden by the gluegen.user.properties.file -->
-    <property name="android.keystore.alias" value="debug"/>
+    <property name="android.keystore.alias" value="debug_alias"/>
     <property name="android.keystore.storepass" value="jogamp"/>
     <property name="android.keystore.keypass" value="jogamp"/>
 
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 015dcc3d..5e6f63ec 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -193,7 +193,7 @@
             <arg value="@{keystore.alias}" />
 
             <arg value="-dname" />
-            <arg value="CN=JogAmp Debug,O=JogAmp,C=DE" />
+            <arg value='CN=JogAmp Debug,O=JogAmp,C=DE' />
 
             <arg value="-keypass" />
             <arg value="@{keystore.keypass}" />
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index b7fcd219..5da12d5b 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -68,6 +68,14 @@
         <format property="version.timestamp" pattern="yyyyMMdd"/>
     </tstamp>
 
+    <condition property="jogamp.jar.codebase" value="${env.JOGAMP_JAR_CODEBASE}">
+        <not>
+         <equals arg1="${env.JOGAMP_JAR_CODEBASE}" arg2="$${env.JOGAMP_JAR_CODEBASE}" casesensitive="true" />
+        </not>
+    </condition>
+    <property name="jogamp.jar.codebase"      value=""/> <!-- A jogamp build uses value "Codebase: *.jogamp.org" -->
+    <echo message="jogamp.jar.codebase        ${jogamp.jar.codebase}"/>
+
     <property name="jogamp.version.major" value="2"/>
     <property name="jogamp.version.minor" value="0"/>
     <property name="jogamp.version.submi" value="2"/>
diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh
index 55fea492..9186ff7c 100755
--- a/make/scripts/make.gluegen.all.android-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -88,6 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml"
 
 which gcc 2>&1 | tee make.gluegen.all.android-armv6-cross.log
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index 4aff8795..e8113398 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -88,6 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv7.xml"
 
 which gcc 2>&1 | tee make.gluegen.all.android-armv7-cross.log
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv7 \
diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh
index 7c1dee4f..f5f5c180 100755
--- a/make/scripts/make.gluegen.all.linux-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6-cross.sh
@@ -37,6 +37,12 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml"
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6 \
     $* 2>&1 | tee make.gluegen.all.linux-armv6-cross.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6.sh b/make/scripts/make.gluegen.all.linux-armv6.sh
index 1fc66562..1399f723 100755
--- a/make/scripts/make.gluegen.all.linux-armv6.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6.sh
@@ -13,6 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml"
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6 \
     $* 2>&1 | tee make.gluegen.all.linux-armv6.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
index 331a97b2..5817b7f0 100755
--- a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
@@ -37,6 +37,11 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml"
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6hf \
     $* 2>&1 | tee make.gluegen.all.linux-armv6hf-cross.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh
index e922c2d0..60f6708c 100755
--- a/make/scripts/make.gluegen.all.linux-armv6hf.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh
@@ -13,6 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml"
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6hf \
     $* 2>&1 | tee make.gluegen.all.linux-armv6hf.log
diff --git a/make/scripts/make.gluegen.all.linux-x86.sh b/make/scripts/make.gluegen.all.linux-x86.sh
index 58685d72..f0eec7ce 100755
--- a/make/scripts/make.gluegen.all.linux-x86.sh
+++ b/make/scripts/make.gluegen.all.linux-x86.sh
@@ -15,6 +15,12 @@ fi
 #    -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml \
 #
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-x86 \
     $* 2>&1 | tee make.gluegen.all.linux-x86.log
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.java7.sh b/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
deleted file mode 100755
index 967a21ef..00000000
--- a/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-SDIR=`dirname $0` 
-
-if [ -e $SDIR/setenv-build-jogl-x86_64.java7.sh ] ; then
-    . $SDIR/setenv-build-jogl-x86_64.java7.sh
-fi
-
-#    -Dc.compiler.debug=true 
-#    -Dgluegen.cpptasks.detected.os=true \
-#    -DisUnix=true \
-#    -DisLinux=true \
-#    -DisLinuxAMD64=true \
-#    -DisX11=true \
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-# BUILD_ARCHIVE=true \
-ant \
-    -Dc.compiler.debug=true  \
-    -Djavacdebuglevel="source,lines,vars" \
-    -Drootrel.build=build-x86_64.java7 \
-    $* 2>&1 | tee make.gluegen.all.linux-x86_64.java7.log
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh
index 0ed640ee..24659113 100755
--- a/make/scripts/make.gluegen.all.linux-x86_64.sh
+++ b/make/scripts/make.gluegen.all.linux-x86_64.sh
@@ -16,12 +16,17 @@ fi
 #    -Dtarget.sourcelevel=1.6 \
 #    -Dtarget.targetlevel=1.6 \
 #    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+#
+#    -Dc.compiler.debug=true  \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
 # BUILD_ARCHIVE=true \
 ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Djavacdebuglevel="source,lines,vars" \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.gluegen.all.linux-x86_64.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh
index f88341b4..73e3d1ce 100755
--- a/make/scripts/make.gluegen.all.macosx-java7.sh
+++ b/make/scripts/make.gluegen.all.macosx-java7.sh
@@ -14,6 +14,8 @@ JAVA_HOME=`/usr/libexec/java_home -version 1.7`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-macosx-java7 \
     $* 2>&1 | tee make.gluegen.all.macosx-java7.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7_target16.sh b/make/scripts/make.gluegen.all.macosx-java7_target16.sh
deleted file mode 100755
index 4e9e04ac..00000000
--- a/make/scripts/make.gluegen.all.macosx-java7_target16.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-if [ -e /opt-share/etc/profile.ant ] ; then
-    . /opt-share/etc/profile.ant
-fi
-
-#    -Dc.compiler.debug=true 
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Drootrel.build=build-macosx-java7_target16 \
-    $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log
diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh
index 94bcd4ea..56e2ebab 100755
--- a/make/scripts/make.gluegen.all.macosx.sh
+++ b/make/scripts/make.gluegen.all.macosx.sh
@@ -10,10 +10,16 @@ fi
 #    -Dtarget.targetlevel=1.6 \
 #    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
 
+JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
 ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Drootrel.build=build-macosx \
-    $* 2>&1 | tee make.gluegen.all.macosx.log
+    -Drootrel.build=build-macosx-java7_target16 \
+    $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log
diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index a1d9216a..750915a5 100755
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"
 
-set J2RE_HOME=c:\jre1.6.0_35_x32
-set JAVA_HOME=c:\jdk1.6.0_35_x32
+set J2RE_HOME=c:\jre1.7.0_25_x32
+set JAVA_HOME=c:\jdk1.7.0_25_x32
 set ANT_PATH=C:\apache-ant-1.8.2
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
@@ -13,5 +13,11 @@ REM    -DuseOpenMAX=true
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.gluegen.all.win32.log 2>&1
 
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 19733fe3..9c6ffc97 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"
 
-set J2RE_HOME=c:\jre1.6.0_35_x64
-set JAVA_HOME=c:\jdk1.6.0_35_x64
+set J2RE_HOME=c:\jre1.7.0_25_x64
+set JAVA_HOME=c:\jdk1.7.0_25_x64
 set ANT_PATH=C:\apache-ant-1.8.2
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
@@ -13,5 +13,11 @@ REM    -DuseOpenMAX=true
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.gluegen.all.win64.log 2>&1
 
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index a049a8f4..97723165 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -75,7 +75,7 @@ function onetest() {
     echo
 }
 #
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
@@ -107,5 +107,5 @@ function onetest() {
 #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
-onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index 5c56da4a..d203c099 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -19,18 +19,42 @@ if [ -z "$ANT_PATH" ] ; then
     exit
 fi
 
-if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then
-    J2RE_HOME=/opt-linux-x86/jre6
-    JAVA_HOME=/opt-linux-x86/j2se6
+if [ -e /opt-linux-x86/jre7 -a -e /opt-linux-x86/j2se7 ] ; then
+    J2RE_HOME=/opt-linux-x86/jre7
+    JAVA_HOME=/opt-linux-x86/j2se7
     PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
     export J2RE_HOME JAVA_HOME
+    FOUND_JAVA=1
 fi 
 
-if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then
-    J2RE_HOME=/opt-solaris-x86/jre6
-    JAVA_HOME=/opt-solaris-x86/j2se6
-    PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
-    export J2RE_HOME JAVA_HOME
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then
+        J2RE_HOME=/opt-linux-x86/jre6
+        JAVA_HOME=/opt-linux-x86/j2se6
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /opt-solaris-x86/jre7 -a -e /opt-solaris-x86/j2se7 ] ; then
+        J2RE_HOME=/opt-solaris-x86/jre7
+        JAVA_HOME=/opt-solaris-x86/j2se7
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi
+fi
+
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then
+        J2RE_HOME=/opt-solaris-x86/jre6
+        JAVA_HOME=/opt-solaris-x86/j2se6
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi
 fi
 
 export PATH
diff --git a/make/scripts/setenv-build-jogl-x86_64.java7.sh b/make/scripts/setenv-build-jogl-x86_64.java7.sh
deleted file mode 100644
index 6d293a02..00000000
--- a/make/scripts/setenv-build-jogl-x86_64.java7.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-echo $0
-
-if [ -e /opt-share/apache-ant ] ; then
-    ANT_PATH=/opt-share/apache-ant
-    PATH=$ANT_PATH/bin:$PATH
-    export ANT_PATH
-fi
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    echo ANT_PATH does not exist, set it
-    exit
-fi
-
-if [ -e /opt-linux-x86_64/jre7 -a -e /opt-linux-x86_64/j2se7 ] ; then
-    J2RE_HOME=/opt-linux-x86_64/jre7
-    JAVA_HOME=/opt-linux-x86_64/j2se7
-    PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
-    export J2RE_HOME JAVA_HOME
-elif [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
-    # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
-    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
-    J2RE_HOME=/usr/java/jre/bin/amd64
-    JAVA_HOME=/usr/java/bin/amd64
-    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
-    export J2RE_HOME JAVA_HOME
-elif [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then
-    # make a symbolic link: /opt-solaris-x86_64/jre6/bin/amd64/bin$ ln -s . bin
-    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
-    J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64
-    JAVA_HOME=/opt-solaris-x86_64/j2se6/bin/amd64
-    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
-    export J2RE_HOME JAVA_HOME
-fi
-
-export PATH
-
-
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh
index 6b2a66e5..7b71378d 100644
--- a/make/scripts/setenv-build-jogl-x86_64.sh
+++ b/make/scripts/setenv-build-jogl-x86_64.sh
@@ -26,25 +26,45 @@ if [ -z "$ANT_PATH" ] ; then
     exit
 fi
 
-if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then
-    J2RE_HOME=/opt-linux-x86_64/jre6
-    JAVA_HOME=/opt-linux-x86_64/j2se6
+if [ -e /opt-linux-x86_64/jre7 -a -e /opt-linux-x86_64/j2se7 ] ; then
+    J2RE_HOME=/opt-linux-x86_64/jre7
+    JAVA_HOME=/opt-linux-x86_64/j2se7
     PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
     export J2RE_HOME JAVA_HOME
-elif [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
-    # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
-    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
-    J2RE_HOME=/usr/java/jre/bin/amd64
-    JAVA_HOME=/usr/java/bin/amd64
-    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
-    export J2RE_HOME JAVA_HOME
-elif [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then
-    # make a symbolic link: /opt-solaris-x86_64/jre6/bin/amd64/bin$ ln -s . bin
-    # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
-    J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64
-    JAVA_HOME=/opt-solaris-x86_64/j2se6/bin/amd64
-    PATH=$J2RE_HOME:$JAVA_HOME:$PATH
-    export J2RE_HOME JAVA_HOME
+    FOUND_JAVA=1
+fi 
+
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then
+        J2RE_HOME=/opt-linux-x86_64/jre6
+        JAVA_HOME=/opt-linux-x86_64/j2se6
+        PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi 
+fi 
+
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then
+        # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin
+        # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
+        J2RE_HOME=/usr/java/jre/bin/amd64
+        JAVA_HOME=/usr/java/bin/amd64
+        PATH=$J2RE_HOME:$JAVA_HOME:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi
+fi
+if [ -z "$FOUND_JAVA" ] ; then
+    if [ -e /opt-solaris-x86_64/jre7 -a -e /opt-solaris-x86_64/j2se7 ] ; then
+        # make a symbolic link: /opt-solaris-x86_64/jre7/bin/amd64/bin$ ln -s . bin
+        # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM
+        J2RE_HOME=/opt-solaris-x86_64/jre7/bin/amd64
+        JAVA_HOME=/opt-solaris-x86_64/j2se7/bin/amd64
+        PATH=$J2RE_HOME:$JAVA_HOME:$PATH
+        export J2RE_HOME JAVA_HOME
+        FOUND_JAVA=1
+    fi
 fi
 
 export PATH