Fix promote-latest-builds ; Prep repack/sign/pack

13 files changed, 274 insertions, 383 deletions

diff --git a/deployment/all-deploy-webstarttest.sh b/deployment/all-deploy-webstarttest.sh
deleted file mode 100755
index e947c3f..0000000
--- a/deployment/all-deploy-webstarttest.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-
-if [ ! -e scripts -o ! -e ../make ] ; then
-    echo start this script from JOGL/jogl/make
-	exit 1
-fi
-
-url=$1
-shift
-
-joglbuilddir=$1
-shift 
-
-wsdir=$1
-shift 
-
-if [ -z "$url" -o -z "$joglbuilddir" -o -z "$wsdir" ] ; then
-    echo Usage $0 codebase-url jogl-builddir webstartdir
-    echo Examples
-    echo    sh $0 file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
-    echo    sh $0 http://domain.org/jogl/webstart ../build-win32 ../../webstart
-    exit 1
-fi
-
-if [ ! -e $joglbuilddir ] ; then
-    echo $joglbuilddir does not exist
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-sh scripts/deploy-jars-webstarttest.sh $joglbuilddir $wsdir
-#
-# repack it .. so the signed jars can be pack200'ed
-# sh scripts/deploy-jars-repack200.sh $wsdir
-#
-# sign it
-# sh scripts/deploy-jars-sign.sh $wsdir KEY_STORE_FILE STORE_PASSWORD SOME_ARGUMENT
-#
-# pack200
-# sh scripts/deploy-jars-pack200.sh $wsdir
-#
-sh scripts/deploy-jnlp-webstarttest.sh $url $joglbuilddir $wsdir
-#
-# In case you don't sign it ..
-#
-# sh scripts/deploy-jnlp-webstarttest-filter.sh $wsdir
-#
-# Add to HOME/.java.policy
-#
-# grant codeBase "file:////usr/local/projects/JOGL/webstart/-" {
-#      permission java.security.AllPermission;
-# };
-
diff --git a/deployment/deploy-jar-sign.sh b/deployment/deploy-jar-sign.sh
deleted file mode 100755
index d6291c4..0000000
--- a/deployment/deploy-jar-sign.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-jarfile=$1
-shift 
-
-keystore=$1
-shift 
-
-storepass=$1
-shift 
-
-signarg=$1
-shift 
-
-if [ -z "$jarfile" -o -z "$keystore" -o -z "$storepass" ] ; then
-    echo "usage $0 jarfile pkcs12-keystore storepass [signarg]"
-    exit 1
-fi
-
-if [ ! -e $jarfile ] ; then
-    echo $jarfile does not exist
-    exit 1
-fi
-
-if [ ! -e $keystore ] ; then
-    echo $keystore does not exist
-    exit 1
-fi
-
-THISDIR=`pwd`
-
-echo jarsigner -storetype pkcs12 -keystore $keystore $jarfile \"$signarg\"
-jarsigner -storetype pkcs12 -keystore $THISDIR/$keystore -storepass $storepass $jarfile "$signarg"
-
-cd $THISDIR
-
diff --git a/deployment/deploy-jars-pack200.sh b/deployment/deploy-jars-pack200.sh
deleted file mode 100755
index 471e8ab..0000000
--- a/deployment/deploy-jars-pack200.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-
-wsdir=$1
-shift 
-
-if [ -z "$wsdir" ] ; then
-    echo usage $0 webstartdir
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-THISDIR=`pwd`
-
-cd $wsdir
-
-mkdir -p DLLS
-mv *natives*.jar DLLS/
-
-for i in *.jar ; do
-    echo pack200 -E9 $i.pack.gz $i
-    pack200 -E9 $i.pack.gz $i
-done
-
-mv DLLS/* .
-
-rm -rf DLLS
-
-cd $THISDIR
-
diff --git a/deployment/deploy-jars-repack200.sh b/deployment/deploy-jars-repack200.sh
deleted file mode 100755
index 1169d63..0000000
--- a/deployment/deploy-jars-repack200.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-wsdir=$1
-shift 
-
-if [ -z "$wsdir" ] ; then
-    echo usage $0 webstartdir
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-THISDIR=`pwd`
-
-cd $wsdir
-
-rm -rf orig-jars
-mkdir -p orig-jars
-
-for i in *.jar ; do
-    cp -a $i orig-jars
-    echo pack200 --repack $i
-    pack200 --repack $i
-done
-
-cd $THISDIR
-
diff --git a/deployment/deploy-jars-sign.sh b/deployment/deploy-jars-sign.sh
deleted file mode 100755
index 1a4421a..0000000
--- a/deployment/deploy-jars-sign.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /bin/sh
-
-wsdir=$1
-shift 
-
-keystore=$1
-shift 
-
-storepass=$1
-shift 
-
-signarg=$1
-shift 
-
-if [ -z "$wsdir" -o -z "$keystore" -o -z "$storepass" ] ; then
-    echo "usage $0 webstartdir pkcs12-keystore storepass [signarg]"
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-if [ ! -e $keystore ] ; then
-    echo $keystore does not exist
-    exit 1
-fi
-
-THISDIR=`pwd`
-
-cd $wsdir
-
-rm -rf demo-jars
-mkdir -p demo-jars
-mv jogl.test.jar jogl-demos*jar demo-jars/
-
-for i in *.jar ; do
-    echo jarsigner -storetype pkcs12 -keystore $keystore $i \"$signarg\"
-    jarsigner -storetype pkcs12 -keystore $THISDIR/$keystore -storepass $storepass $i "$signarg"
-done
-
-mv demo-jars/* .
-rm -rf demo-jars
-
-cd $THISDIR
-
diff --git a/deployment/deploy-jars_external-webstarttest.sh b/deployment/deploy-jars_external-webstarttest.sh
deleted file mode 100755
index 3fc1daa..0000000
--- a/deployment/deploy-jars_external-webstarttest.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-
-if [ ! -e scripts -o ! -e ../make ] ; then
-    echo start this script from JOGL/jogl/make
-	exit 1
-fi
-
-SOURCE=$1
-shift
-
-wsdir=$1
-shift 
-
-if [ -z "$SOURCE" -o -z "$wsdir" ] ; then
-    echo usage $0 source webstartdir
-	echo source might be [email protected]:webstart/
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-echo scp -v $SOURCE*natives* $wsdir
-scp -v $SOURCE*natives* $wsdir
diff --git a/deployment/deploy-jnlp-webstarttest-filter.sh b/deployment/deploy-jnlp-webstarttest-filter.sh
deleted file mode 100755
index 77eda44..0000000
--- a/deployment/deploy-jnlp-webstarttest-filter.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-wsdir=$1
-shift 
-
-if [ -z "$wsdir" ] ; then
-    echo usage $0 webstartdir
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-cd $wsdir
-
-rm -rf orig-jnlp
-mkdir orig-jnlp
-
-for i in *.jnlp ; do
-    mv $i orig-jnlp
-    sed -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' orig-jnlp/$i > $i
-done
-
diff --git a/deployment/deploy-jnlp-webstarttest.sh b/deployment/deploy-jnlp-webstarttest.sh
deleted file mode 100755
index 8f3b0d2..0000000
--- a/deployment/deploy-jnlp-webstarttest.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-
-url=$1
-shift
-
-joglbuilddir=$1
-shift 
-
-wsdir=$1
-shift 
-
-if [ -z "$url" -o -z "$joglbuilddir" -o -z "$wsdir" ] ; then
-    echo usage $0 codebase-url jogl-builddir webstartdir
-    echo Examples
-    echo    sh $0 file:////usr/local/projects/JOGL/webstart ../build-x86_64 ../../webstart
-    echo    sh $0 http://domain.org/jogl/webstart ../build-win32 ../../webstart
-    exit 1
-fi
-
-if [ ! -e $joglbuilddir ] ; then
-    echo $joglbuilddir does not exist
-    exit 1
-fi
-
-if [ ! -e $wsdir ] ; then
-    echo $wsdir does not exist
-    exit 1
-fi
-
-builddirbase=`basename $joglbuilddir`
-joglroot=`dirname $joglbuilddir`
-gluegenroot=$joglroot/../gluegen
-demosroot=$joglroot/../jogl-demos
-
-jnlpdir_gluegen=$gluegenroot/jnlp-files
-jnlpdir_jogl=$joglroot/jnlp-files
-jnlpdir_demos=$demosroot/jnlp-files
-
-if [ ! -e $jnlpdir_gluegen ] ; then
-    echo $jnlpdir_gluegen does not exist
-    exit 1
-fi
-
-if [ ! -e $jnlpdir_jogl ] ; then
-    echo $jnlpdir_jogl does not exist
-    exit 1
-fi
-
-if [ ! -e $jnlpdir_demos ] ; then
-    echo $jnlpdir_demos does not exist
-    exit 1
-fi
-
-cp -v $jnlpdir_demos/*.html $wsdir
-
-uri_esc=`echo $url | sed 's/\//\\\\\//g'`
-for j in $jnlpdir_gluegen/*.jnlp ; do
-    jb=`basename $j`
-    echo "processing $j to $wsdir/$jb"
-    sed "s/CODEBASE_TAG/$uri_esc/g" \
-        $j > $wsdir/$jb
-done
-
-for j in $jnlpdir_jogl/*.jnlp ; do
-    jb=`basename $j`
-    echo "processing $j to $wsdir/$jb"
-    sed -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \
-        -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \
-        $j > $wsdir/$jb
-done
-
-for j in $jnlpdir_demos/*.jnlp ; do
-    jb=`basename $j`
-    echo "processing $j to $wsdir/$jb"
-    sed -e "s/DEMO_CODEBASE_TAG/$uri_esc/g" \
-        -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \
-        $j > $wsdir/$jb
-done
-
diff --git a/deployment/funcs_jars_pack_sign.sh b/deployment/funcs_jars_pack_sign.sh
new file mode 100755
index 0000000..fbfd4fa
--- /dev/null
+++ b/deployment/funcs_jars_pack_sign.sh
@@ -0,0 +1,125 @@
+#! /bin/bash
+
+#
+# wsdir_jars_repack  <wsdir>
+# wsdir_jars_pack200 <wsdir>
+# wsdir_jars_sign    <wsdir> <pkcs12-keystore> <storepass> [signarg]
+#
+
+function wsdir_jars_repack() {
+
+wsdir=$1
+shift 
+
+if [ -z "$wsdir" ] ; then
+    echo usage $0 webstartdir
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+THISDIR=`pwd`
+
+cd $wsdir
+
+rm -rf orig-jars
+mkdir -p orig-jars
+
+for i in *.jar ; do
+    cp -a $i orig-jars
+    echo pack200 --repack $i
+    pack200 --repack $i
+done
+
+cd $THISDIR
+
+}
+
+function wsdir_jars_pack200() {
+
+wsdir=$1
+shift 
+
+if [ -z "$wsdir" ] ; then
+    echo usage $0 webstartdir
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+THISDIR=`pwd`
+
+cd $wsdir
+
+mkdir -p DLLS
+mv *natives*.jar DLLS/
+
+for i in *.jar ; do
+    echo pack200 -E9 $i.pack.gz $i
+    pack200 -E9 $i.pack.gz $i
+done
+
+mv DLLS/* .
+
+rm -rf DLLS
+
+cd $THISDIR
+
+}
+
+
+function wsdir_jars_sign() {
+
+wsdir=$1
+shift 
+
+keystore=$1
+shift 
+
+storepass=$1
+shift 
+
+signarg=$1
+shift 
+
+if [ -z "$wsdir" -o -z "$keystore" -o -z "$storepass" ] ; then
+    echo "usage $0 webstartdir pkcs12-keystore storepass [signarg]"
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+if [ ! -e $keystore ] ; then
+    echo $keystore does not exist
+    exit 1
+fi
+
+THISDIR=`pwd`
+
+cd $wsdir
+
+rm -rf demo-jars
+mkdir -p demo-jars
+mv jogl.test.jar jogl-demos*jar jocl-demos.jar demo-jars/
+
+for i in *.jar ; do
+    echo jarsigner -storetype pkcs12 -keystore $keystore $i \"$signarg\"
+    jarsigner -storetype pkcs12 -keystore $THISDIR/$keystore -storepass $storepass $i "$signarg"
+done
+
+mv demo-jars/* .
+rm -rf demo-jars
+
+cd $THISDIR
+
+}
+
diff --git a/deployment/funcs_jnlp_relocate.sh b/deployment/funcs_jnlp_relocate.sh
index e2d08a2..d529639 100755
--- a/deployment/funcs_jnlp_relocate.sh
+++ b/deployment/funcs_jnlp_relocate.sh
@@ -37,6 +37,7 @@ for j in $jnlpdir/*.jnlp ; do
 
     sed -e "s/JOGL_CODEBASE_TAG/$uri_esc/g" \
         -e "s/GLUEGEN_CODEBASE_TAG/$uri_esc/g" \
+        -e "s/JOCL_CODEBASE_TAG/$uri_esc/g" \
         -e "s/DEMO_CODEBASE_TAG/$uri_esc/g" \
         $j > $wsdir/$jb
 done
diff --git a/hudson-builds/promote-latest-builds.sh b/hudson-builds/promote-latest-builds.sh
index 6cd26c3..7ad4638 100755
--- a/hudson-builds/promote-latest-builds.sh
+++ b/hudson-builds/promote-latest-builds.sh
@@ -5,8 +5,21 @@
 # Will end up with an aggregated folder, webstart enabled,
 # but not pack200 compressed and not signed.
 #
+# promote-latest-builds.sh <branch-name> [secure]
+#
 ##
 
+branch=$1
+shift
+if [ ! -z "$1" ] ; then
+    option=$1
+    shift
+fi
+let secure=0
+if [ "$option" == "secure" ] ; then
+    let secure=1
+fi
+
 sdir=`dirname $0`
 
 thisdir=`pwd`
@@ -16,8 +29,8 @@ logfile=$thisdir/`basename $0 .sh`.log
 . $sdir/funcs_promotion.sh
 . $sdir/../deployment/funcs_jnlp_relocate.sh
 
-archivedir=/srv/www/jogamp.org/deployment/archive
-rootdir=/srv/www/jogamp.org/deployment/autobuilds
+archivedir=/srv/www/jogamp.org/deployment/archive/$branch
+rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
 
 os_and_archs_minus_one="linux-i586 macosx-universal windows-amd64 windows-i586"
 masterpick="linux-amd64"
@@ -30,12 +43,15 @@ cd $rootdir
 function promote-latest-builds() {
     echo
     echo "Promotion of latest files"
+    echo
+    echo "  branch: $branch"
+    echo "  option: $option"
+    echo "    secure: $secure"
+    echo
     echo `date`
     echo
     prom_setup $rootdir $dest
 
-    mkdir $dest/javadoc
-
     gluegenslave=`prom_lslatest gluegen-b`
     bgluegenslave=`prom_buildnumber_2 $gluegenslave`
     gluegenmaster=`prom_lslatest gluegen-master-b`
@@ -77,24 +93,28 @@ function promote-latest-builds() {
     unzip -q ../jogl-javadoc.zip
     cd $rootdir
 
+    jogldemosslave=`prom_lslatest jogl-demos-b`
+    bjogldemosslave=`prom_buildnumber_3 $jogldemosslave`
     jogldemosmaster=`prom_lslatest jogl-demos-master-b`
     bjogldemosmaster=`prom_buildnumber_4 $jogldemosmaster`
     echo
     echo JOGL DEMOS
     echo
+    echo slave   build $bjogldemosslave - $jogldemosslave
     echo master  build $bjogldemosmaster - $jogldemosmaster
     echo
-    echo "jogl-demos.build.number=$bjogldemosmaster" >> $dest/aggregated.artifact.properties
+    echo "jogl-demos.build.number=$bjogldemosslave" >> $dest/aggregated.artifact.properties
 
     cp -a $jogldemosmaster/jogl-demos*.zip $dest/
-    cp -a $jogldemosmaster/artifact.properties $dest/jogl-demos.artifact.properties
+    cp -a $jogldemosmaster/artifact.properties $dest/jogl-demos-master.artifact.properties
+    cp -a $jogldemosslave/artifact.properties $dest/jogl-demos.artifact.properties
     cd $dest
 
     fname=`find . -name jogl-demos*.zip`
     bname=`basename $fname .zip`
     echo "INFO: unzip $fname -> $bname"
     unzip -q $bname.zip
-    prom_verify_artifacts jogl-demos jogl-demos.artifact.properties $bname/artifact.properties
+    prom_verify_artifacts jogl-demos jogl-demos-master.artifact.properties $bname/artifact.properties
     cp -a $bname/jar/*.jar .
     cp -a $bname/jnlp-files/* ./jnlp-files/
     cp -a $bname/www/* ./www/
@@ -105,52 +125,61 @@ function promote-latest-builds() {
     ####### FIXME : JOCL, adapt to the new archive structure 
     #########################################################
 
-    joclslave=`prom_lslatest jocl-b`
-    bjoclslave=`prom_buildnumber_2 $joclslave`
-    joclmaster=`prom_lslatest jocl-master-b`
-    bjoclmaster=`prom_buildnumber_3 $joclmaster`
-    echo
-    echo JOCL
-    echo
-    echo slave  build $bjoclslave - $joclslave
-    echo master build $bjoclmaster - $joclmaster
-    echo
-    echo "jocl.build.number=$bjoclslave" >> $dest/aggregated.artifact.properties
-
-    #
-    #prom_promote_files jocl $joglslave $dest jocl
-    #
-
-    cp -a $joclslave/jocl*jar $dest/
-    cp -a $joclslave/artifact.properties $dest/jocl.artifact.properties
-
-    cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties
-    mkdir $dest/javadoc/jocl
-    cp -a $joclmaster/jocl-javadoc.zip $dest/
-    cd $dest/javadoc/jocl
-    echo "INFO: unzip jocl-javadoc zip"
-    unzip -q ../../jocl-javadoc.zip
-    cd $rootdir
-
-    jocldemosslave=`prom_lslatest jocl-demos-b`
-    bjocldemosslave=`prom_buildnumber_3 $jocldemosslave`
-    echo
-    echo JOCL DEMOS
-    echo
-    echo slave  build $bjocldemosslave - $jocldemosslave
-    echo
-    echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties
+##    joclslave=`prom_lslatest jocl-b`
+##    bjoclslave=`prom_buildnumber_2 $joclslave`
+##    joclmaster=`prom_lslatest jocl-master-b`
+##    bjoclmaster=`prom_buildnumber_3 $joclmaster`
+##    echo
+##    echo JOCL
+##    echo
+##    echo slave  build $bjoclslave - $joclslave
+##    echo master build $bjoclmaster - $joclmaster
+##    echo
+##    echo "jocl.build.number=$bjoclslave" >> $dest/aggregated.artifact.properties
+##
+##    #
+##    #prom_promote_files jocl $joglslave $dest jocl
+##    #
+##
+##    cp -a $joclslave/jocl*jar $dest/
+##    cp -a $joclslave/artifact.properties $dest/jocl.artifact.properties
+##
+##    cp -a $joclmaster/artifact.properties $dest/javadoc/jocl-master.artifact.properties
+##    mkdir $dest/javadoc/jocl
+##    cp -a $joclmaster/jocl-javadoc.zip $dest/
+##    cd $dest/javadoc/jocl
+##    echo "INFO: unzip jocl-javadoc zip"
+##    unzip -q ../../jocl-javadoc.zip
+##    cd $rootdir
+##
+##    jocldemosslave=`prom_lslatest jocl-demos-b`
+##    bjocldemosslave=`prom_buildnumber_3 $jocldemosslave`
+##    echo
+##    echo JOCL DEMOS
+##    echo
+##    echo slave  build $bjocldemosslave - $jocldemosslave
+##    echo
+##    echo "jocl-demos.build.number=$bjocldemosslave" >> $dest/aggregated.artifact.properties
+##
+##    cp -a $jocldemosslave/jocl-demos*jar $dest/
+##    cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
+##
 
-    cp -a $jocldemosslave/jocl-demos*jar $dest/
-    cp -a $jocldemosslave/artifact.properties $dest/jocl-demos.artifact.properties
+    #########################################################
+    ## Integrity Check, Cleanup, aggregation.properties
+    #########################################################
 
     prom_integrity_check $dest
 
     prom_cleanup $dest
 
-    uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-    url=http://jogamp.org/deployment/archive/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
-    wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+#    uri=gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+#    url=http://jogamp.org/deployment/archive/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+#    wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave-jocl_$bjoclslave
+
+    uri=gluegen_$bgluegenslave-jogl_$bjoglslave
+    url=http://jogamp.org/deployment/archive/gluegen_$bgluegenslave-jogl_$bjoglslave
+    wsdir=$archivedir/gluegen_$bgluegenslave-jogl_$bjoglslave
 
     rm -rf $wsdir
     mv $dest $wsdir
@@ -160,13 +189,18 @@ function promote-latest-builds() {
     echo
     echo aggregation.properties
     echo
-    cat jocl-demos.artifact.properties jogl-demos.artifact.properties | sort -u > jocl-demos-jogl-demos.artifact.properties.sorted
+    #cat jocl-demos.artifact.properties jogl-demos.artifact.properties | sort -u > jocl-demos-jogl-demos.artifact.properties.sorted
+    #sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
+    #diff -Nurbw aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
+    cat jogl-demos.artifact.properties | sort -u > jogl-demos.artifact.properties.sorted
     sort -u aggregated.artifact.properties > aggregated.artifact.properties.sorted
-    diff -Nurbw aggregated.artifact.properties.sorted jocl-demos-jogl-demos.artifact.properties.sorted
+    diff -Nurbw aggregated.artifact.properties.sorted jogl-demos.artifact.properties.sorted
 
     copy_relocate_jnlps $url $wsdir
 
-    remove_security_tag_jnlps $wsdir
+    if [ $secure -ne 1 ] ; then
+        remove_security_tag_jnlps $wsdir
+    fi
 
     echo
     echo Aggregation folder $wsdir for URL $url
diff --git a/hudson-builds/promote-webstart-jars.sh b/hudson-builds/promote-webstart-jars.sh
new file mode 100755
index 0000000..541192c
--- /dev/null
+++ b/hudson-builds/promote-webstart-jars.sh
@@ -0,0 +1,64 @@
+#! /bin/bash
+
+##
+#
+# Will modify all non jar file in the aggregated webstart folder.
+#   - repack
+#   - sign
+#   - pack200
+#
+# promote-webstart-jars.sh <wsdir> <pkcs12-keystore> <storepass> [signarg]
+#
+##
+
+wsdir=$1
+shift
+
+keystore=$1
+shift
+
+storepass=$1
+shift
+
+signarg=$1
+shift
+
+if [ -z "$wsdir" -o -z "$keystore" -o -z "$storepass" ] ; then
+    echo "usage $0 webstartdir pkcs12-keystore storepass [signarg]"
+    exit 1
+fi
+
+if [ ! -e $wsdir ] ; then
+    echo $wsdir does not exist
+    exit 1
+fi
+
+if [ ! -e $keystore ] ; then
+    echo $keystore does not exist
+    exit 1
+fi
+
+sdir=`dirname $0`
+
+thisdir=`pwd`
+
+logfile=$thisdir/`basename $0 .sh`.log
+
+. $sdir/../deployment/funcs_jars_pack_sign.sh
+
+#
+# repack it .. so the signed jars can be pack200'ed
+#
+wsdir_jars_repack  $wsdir
+
+
+#
+# sign it
+#
+wsdir_jars_sign    $wsdir $keystore $storepass $signarg
+
+#
+# pack200
+#
+wsdir_jars_pack200 $wsdir
+
diff --git a/hudson-builds/promote-webstarte-next.sh b/hudson-builds/promote-webstart-next.sh
index 7b6b2ed..7b6b2ed 100755
--- a/hudson-builds/promote-webstarte-next.sh
+++ b/hudson-builds/promote-webstart-next.sh