From: MatthewLi <matthew.lijun@huawei.com>
Date: Tue, 15 Dec 2015 12:35:38 +0000 (+0000)
Subject: Merge "ssh login passwordless script"
X-Git-Tag: brahmaputra.1.0~64
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=25982d8736e103682a5e07b91e85b5be5b801ca0;hp=702d81860af98f99043ecd604969e67d98fd5b00;p=bottlenecks.git

Merge "ssh login passwordless script"
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..27117f79
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+*.pyc
+.vimrc
+.ropeproject
+.settings/
+.eggs/
+*.orig
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*.yml
+*.egg
+*.egg-info
+*.swp
+build
+htmlcov
+.agignore
+.coverage
+Session*.vim
+.tags*
+.coverage.*
+*~
+setuptools*zip
+dist/
+pep8.log
+test.log
diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf b/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
index fe3be7b9..819bfa63 100644
--- a/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
+++ b/rubbos/rubbos_scripts/1-1-1/apache_conf/httpd.conf
@@ -270,8 +270,8 @@ Listen 8000
 #  when the value of (unsigned)Group is above 60000; 
 #  don't use Group #-1 on these systems!
 #
-User nobody
-Group #-1
+User apache
+Group apache
 </IfModule>
 </IfModule>
 
diff --git a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties
index df4134bd..d9c77fe0 100644
--- a/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties
+++ b/rubbos/rubbos_scripts/1-1-1/apache_conf/workers.properties
@@ -73,7 +73,7 @@ worker.list=worker1
 
 
 worker.TOMCAT1.port=8009
-worker.TOMCAT1.host=node8
+worker.TOMCAT1.host=192.168.122.14
 worker.TOMCAT1.type=ajp13
 worker.TOMCAT1.lbfactor=1
 
diff --git a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
index 3c8c0add..42607c62 100644
--- a/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
+++ b/rubbos/rubbos_scripts/1-1-1/rubbos_conf/mysql.properties
@@ -8,11 +8,11 @@
 #
 datasource.name         mysql
 
-datasource.url          jdbc:mysql://node9:3313/rubbos
+datasource.url          jdbc:mysql://192.168.122.13:3306/rubbos
 datasource.classname    com.mysql.jdbc.Driver
   
-datasource.username     elba
-datasource.password     elba
+datasource.username     rubbos
+datasource.password     rubbos
 
 
 #####
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/.CLIENT1_rubbos_install.sh.swp b/rubbos/rubbos_scripts/1-1-1/scripts/.CLIENT1_rubbos_install.sh.swp
deleted file mode 100644
index d5d72329..00000000
Binary files a/rubbos/rubbos_scripts/1-1-1/scripts/.CLIENT1_rubbos_install.sh.swp and /dev/null differ
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/.TOMCAT1_rubbos_uninstall.sh.swp b/rubbos/rubbos_scripts/1-1-1/scripts/.TOMCAT1_rubbos_uninstall.sh.swp
deleted file mode 100644
index b5e7d50d..00000000
Binary files a/rubbos/rubbos_scripts/1-1-1/scripts/.TOMCAT1_rubbos_uninstall.sh.swp and /dev/null differ
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/.run.sh.swp b/rubbos/rubbos_scripts/1-1-1/scripts/.run.sh.swp
deleted file mode 100644
index 0ab43719..00000000
Binary files a/rubbos/rubbos_scripts/1-1-1/scripts/.run.sh.swp and /dev/null differ
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/.stop_all.sh.swp b/rubbos/rubbos_scripts/1-1-1/scripts/.stop_all.sh.swp
deleted file mode 100644
index bde80e05..00000000
Binary files a/rubbos/rubbos_scripts/1-1-1/scripts/.stop_all.sh.swp and /dev/null differ
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
index 7557854d..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_install.sh
@@ -12,4 +12,4 @@ fi
 
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
-echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME" 
+echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
new file mode 100755
index 00000000..f0614585
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for BENCHMARK rubbos install
+if true; then
+ssh $BENCHMARK_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $BENCHMARK_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $BENCHMARK_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $BENCHMARK_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $BENCHMARK_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $BENCHMARK_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $BENCHMARK_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for BENCHMARK install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $BENCHMARK_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for BENCHMARK configure
+if true; then
+ssh $BENCHMARK_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $BENCHMARK_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $BENCHMARK_HOST:$WORK_HOME/rubbos_files
+ssh $BENCHMARK_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $BENCHMARK_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
index 098df714..d78ebd28 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_rubbos_install.sh
@@ -16,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
index 4cec4efa..2a9a115a 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/BENCHMARK_uninstall.sh
@@ -4,4 +4,4 @@ cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
 source set_bottlenecks_rubbos_env.sh
 
 rm -rf $JAVA_HOME
-#rm -rf $ELBA_TOP 
+#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
new file mode 100755
index 00000000..2595cc41
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT1 rubbos install
+if true; then
+ssh $CLIENT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT1_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT1_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT1_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT1 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT1_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT1 configure
+if true; then
+ssh $CLIENT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT1_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT1_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
index 2b684164..d78ebd28 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
@@ -13,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
index 00943e3c..96a51df7 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT1_rubbos_uninstall.sh
@@ -7,4 +7,4 @@ cd $SYSSTAT_HOME
 sudo make uninstall
 sudo rm -rf $SYSSTAT_HOME
 rm -rf $RUBBOS_HOME
-rm -rf $ELBA_TOP
+#rm -rf $ELBA_TOP
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
new file mode 100755
index 00000000..8e80316c
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT2 rubbos install
+if true; then
+ssh $CLIENT2_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT2_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT2_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT2_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT2_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT2 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT2_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT2 configure
+if true; then
+ssh $CLIENT2_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT2_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT2_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT2_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT2_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
index 2b684164..d78ebd28 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT2_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
@@ -13,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
index ec47699a..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_install.sh
@@ -5,6 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
new file mode 100755
index 00000000..3bd56940
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT3 rubbos install
+if true; then
+ssh $CLIENT3_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT3_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT3_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT3_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT3_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT3 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT3_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT3 configure
+if true; then
+ssh $CLIENT3_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT3_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT3_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT3_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT3_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
index 2b684164..d78ebd28 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT3_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
@@ -13,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
index 3be98dea..e7571120 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_install.sh
@@ -5,8 +5,11 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS CLIENT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
+mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
+
 tar xzf $SOFTWARE_HOME/$JAVA_TARBALL --directory=$RUBBOS_APP
 
 echo "DONE INSTALLING RUBBOS CLIENT on $HOSTNAME"
-
- 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
new file mode 100755
index 00000000..4d8ae9aa
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for CLIENT4 rubbos install
+if true; then
+ssh $CLIENT4_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $CLIENT4_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $CLIENT4_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+ssh $CLIENT4_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $CLIENT4_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for CLIENT4 install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $CLIENT4_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+fi
+
+# Packages for CLIENT4 configure
+if true; then
+ssh $CLIENT4_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Client $CLIENT4_HOST:$WORK_HOME/rubbos_files
+scp $scp_options -r $WORK_HOME/rubbos_files/bench $CLIENT4_HOST:$WORK_HOME/rubbos_files
+ssh $CLIENT4_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties config.mk Makefile \
+         rubbos-servletsBO.sh rubbos-servletsRW.sh
+do
+    scp $scp_options -r $OUTPUT_HOME/rubbos_conf/$i $CLIENT4_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
index 2b684164..d78ebd28 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/CLIENT4_rubbos_install.sh
@@ -5,7 +5,10 @@ source set_bottlenecks_rubbos_env.sh
 
 echo "INSTALLING RUBBOS/SYSSTAT on $HOSTNAME"
 
+if [ ! -d "$RUBBOS_APP" ]; then
 mkdir -p $RUBBOS_APP
+chmod 755 $RUBBOS_APP
+fi
 
 # install RUBBoS
 tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
@@ -13,12 +16,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
index f2b95f46..971948a1 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_configure.sh
@@ -9,6 +9,8 @@ cp $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOME/conf/
 cp $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOME/conf/
 cp -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOME/htdocs/rubbos
 
+apache > /dev/null 2>&1
+
 echo "APACHE CONFIGURED SUCCESSFULLY on $HOSTNAME"
 
 
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
new file mode 100755
index 00000000..c09860a1
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_pkg_prepare.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for HTTPD install
+if true; then
+ssh $HTTPD_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $HTTPD_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $HTTPD_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$HTTPD_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$HTTPD_TARBALL
+
+ssh $HTTPD_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+scp $scp_options $SOFTWARE_HOME/$MOD_JK_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$MOD_JK_TARBALL
+scp $scp_options $SOFTWARE_HOME/$JAVA_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$JAVA_TARBALL
+
+fi
+
+# Packages for HTTPD rubbos install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $HTTPD_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $HTTPD_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $HTTPD_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for HTTPD configure
+if true; then
+ssh $HTTPD_HOST "mkdir -p $OUTPUT_HOME/apache_conf"
+scp $scp_options $OUTPUT_HOME/apache_conf/httpd.conf $HTTPD_HOST:$OUTPUT_HOME/apache_conf/httpd.conf
+scp $scp_options $OUTPUT_HOME/apache_conf/workers.properties $HTTPD_HOST:$OUTPUT_HOME/apache_conf/workers.properties
+ssh $HTTPD_HOST "mkdir -p $WORK_HOME/apache_files"
+scp $scp_options -r $WORK_HOME/apache_files/rubbos_html $HTTPD_HOST:$WORK_HOME/apache_files/rubbos_html
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
index 74030691..48dc2310 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/HTTPD_rubbos_install.sh
@@ -12,11 +12,11 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
index 5b5362ab..01a718d9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_configure.sh
@@ -6,8 +6,10 @@ source set_bottlenecks_rubbos_env.sh
 echo "CONFIGURING MYSQL on $HOSTNAME"
 
 cd $MYSQL_HOME
+chown -R mysql:mysql ./
 cp support-files/my-medium.cnf /etc/my.cnf
-bin/mysqld_safe --user=$BOTTLENECKS_USER &
+#bin/mysqld_safe --user=$BOTTLENECKS_USER &
+bin/mysqld_safe&
 sleep 10
 #bin/mysqladmin -u root password 'new-password'
 cp support-files/mysql.server /etc/init.d/mysql.server
@@ -19,4 +21,22 @@ fi
 
 ln -s $MYSQL_HOME/bin/mysql /usr/local/bin/mysql
 
+sleep 20
+
+cat << EOF | mysql -uroot
+
+CREATE DATABASE rubbos;
+
+GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'%' \
+    IDENTIFIED BY 'rubbos';
+    flush privileges;
+GRANT ALL PRIVILEGES ON rubbos.* TO 'rubbos'@'localhost' \
+    IDENTIFIED BY 'rubbos';
+    flush privileges;
+EOF
+
+tar xzf /tmp/$RUBBOS_DATA_TARBALL
+mysql -uroot rubbos < $RUBBOS_DATA_SQL
+rm $RUBBOS_DATA_SQL
+
 echo "DONE CONFIGURING MYSQL on $HOSTNAME"
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
new file mode 100755
index 00000000..17b5e745
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_pkg_prepare.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for MYSQL1 install
+if true; then
+ssh $MYSQL1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $MYSQL1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $MYSQL1_HOST "mkdir -p $SOFTWARE_HOME"
+scp $scp_options $SOFTWARE_HOME/$MYSQL_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$MYSQL_TARBALL
+
+ssh $MYSQL1_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        libaio1 \
+        libaio-dev \
+        make
+"
+
+fi
+
+# Packages for MYSQL1 rubbos install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $MYSQL1_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $MYSQL1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $MYSQL1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $MYSQL1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for MYSQL1 configure
+if true; then
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL $MYSQL1_HOST:/tmp
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
index dd2bd46e..42a75676 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/MYSQL1_rubbos_install.sh
@@ -12,15 +12,12 @@ tar xzf $SOFTWARE_HOME/$RUBBOS_TARBALL --directory=$RUBBOS_APP
 #tar xzf $SOFTWARE_HOME/rubbos_html.tar.gz --directory=$RUBBOS_HOME/Servlet_HTML/
 cp $SOFTWARE_HOME/flush_cache $RUBBOS_HOME/bench/.
 
-cp $SOFTWARE_HOME/$RUBBOS_DATA_TARBALL $RUBBOS_APP/
-
 # install sysstat
-tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
-
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
new file mode 100755
index 00000000..9e0783c5
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+. ../set_bottlenecks_rubbos_env.sh
+
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+# Packages for TOMCAT1 install
+if true; then
+ssh $TOMCAT1_HOST "mkdir -p /bottlenecks/rubbos/rubbos_scripts/1-1-1"
+scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rubbos/rubbos_scripts/1-1-1
+
+ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
+
+ssh $TOMCAT1_HOST "
+    apt-get update
+    apt-get install -y \
+        gcc \
+        g++ \
+        make
+"
+
+for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL
+do
+    scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i
+done
+
+fi
+
+# Packages for TOMCAT1 rubbos install
+if true; then
+scp $scp_options $SOFTWARE_HOME/$RUBBOS_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$RUBBOS_TARBALL
+scp $scp_options $SOFTWARE_HOME/flush_cache $TOMCAT1_HOST:$SOFTWARE_HOME/flush_cache
+scp $scp_options $SOFTWARE_HOME/$SYSSTAT_TARBALL $TOMCAT1_HOST:$SOFTWARE_HOME/$SYSSTAT_TARBALL
+ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+scp $scp_options $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/cpu_mem.sh
+fi
+
+# Packages for TOMCAT1 configure
+if true; then
+ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/tomcat_conf"
+scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml-$HOSTNAME
+fi
+
+# Packages for TOMCAT1 rubbosSL configure
+if true; then
+ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+for i in build.properties mysql.properties build.xml Config.java web.xml
+do
+    scp $scp_options $OUTPUT_HOME/rubbos_conf/$i $TOMCAT1_HOST:$OUTPUT_HOME/rubbos_conf/$i
+done
+
+ssh $TOMCAT1_HOST "mkdir -p $WORK_HOME/rubbos_files"
+scp $scp_options -r $WORK_HOME/rubbos_files/Servlets $TOMCAT1_HOST:$WORK_HOME/rubbos_files/Servlets
+fi
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
index 1027cc71..26c0ae2c 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_rubbos_install.sh
@@ -15,10 +15,10 @@ mkdir -p $SYSSTAT_HOME
 # install sysstat
 tar xzf $SOFTWARE_HOME/$SYSSTAT_TARBALL --directory=$RUBBOS_APP
 
-cd $SYSSTAT_HOME
-./configure --prefix=$SYSSTAT_HOME
-make
-sudo make install
+#cd $SYSSTAT_HOME
+#./configure --prefix=$SYSSTAT_HOME
+#make
+#sudo make install
 
 # install a script to collect statistics data
 cp $OUTPUT_HOME/rubbos_conf/cpu_mem.sh $RUBBOS_APP/.
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak b/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak
deleted file mode 100755
index c7be8c73..00000000
--- a/rubbos/rubbos_scripts/1-1-1/scripts/bakrun.sh.bak
+++ /dev/null
@@ -1,194 +0,0 @@
-
-cd /root/rui/rubbos/rubbosMulini6/1-1-1
-source set_elba_env.sh
-cd /root/rui/rubbos/rubbosMulini6/1-1-1/scripts
-# Transfer all sub scripts to target hosts
-echo "*** scp scripts *************************************************"
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_checkScp_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_emulabConf_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_rubbos_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_install.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_install.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_configure.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_uninstall.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_uninstall.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_install.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_install.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_configure.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_uninstall.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_uninstall.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_install.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_install.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_configure.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_uninstall.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_uninstall.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_install.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_install.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_configure.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_uninstall.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_uninstall.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_install.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_install.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_configure.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_uninstall.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_uninstall.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_install.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_install.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_configure.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_ignition.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_stop.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_uninstall.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_uninstall.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_install.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_install.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_configure.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbosSL_configure.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_ignition.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_stop.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_uninstall.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_uninstall.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_install.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_install.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_configure.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_reset.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_ignition.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_stop.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_uninstall.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_uninstall.sh  $MYSQL1_HOST:/tmp
-
-
-# Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
-echo "*** install scripts & configure & execute ***********************"
-
-ssh $CONTROL_HOST /tmp/CONTROL_checkScp_exec.sh 
-ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh 
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh 
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh 
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_install.sh 
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh 
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh 
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh 
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh 
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh 
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh 
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh 
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh 
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh 
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh 
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_install.sh 
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_install.sh 
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh 
-
-
-ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh  &
-sleep 60
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh 
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_configure.sh 
-
-
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh 
-
-
-ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh 
-
-
-ssh $CLIENT2_HOST /tmp/CLIENT2_configure.sh 
-
-
-ssh $CLIENT3_HOST /tmp/CLIENT3_configure.sh 
-
-
-ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh 
-
-
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh 
-
-
-#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh 
-
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh b/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
new file mode 100755
index 00000000..e2ea68e7
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/check_service_status.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
+source set_bottlenecks_rubbos_env.sh
+
+#ssh_options=""
+
+ssh root@$TOMCAT1_HOST service tomcat status
+ssh root@$HTTPD_HOST service apache2 status
+ssh root@$MYSQL1_HOST service mysql status
+
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh b/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
old mode 100644
new mode 100755
diff --git a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index 559d159b..95dc08b9 100755
--- a/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@ -4,193 +4,132 @@ cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
 # Transfer all sub scripts to target hosts
 echo "*** scp scripts *************************************************"
 
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_checkScp_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_emulabConf_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CONTROL_rubbos_exec.sh  $CONTROL_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_install.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_install.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_configure.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_uninstall.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes BENCHMARK_rubbos_uninstall.sh  $BENCHMARK_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_install.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_install.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_configure.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_uninstall.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT1_rubbos_uninstall.sh  $CLIENT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_install.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_install.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_configure.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_uninstall.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT2_rubbos_uninstall.sh  $CLIENT2_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_install.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_install.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_configure.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_uninstall.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT3_rubbos_uninstall.sh  $CLIENT3_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_install.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_install.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_configure.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_uninstall.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes CLIENT4_rubbos_uninstall.sh  $CLIENT4_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_install.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_install.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_configure.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_ignition.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_stop.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_rubbos_uninstall.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes HTTPD_uninstall.sh  $HTTPD_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_install.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_install.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_configure.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbosSL_configure.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_ignition.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_stop.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_rubbos_uninstall.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes TOMCAT1_uninstall.sh  $TOMCAT1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_install.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_install.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_configure.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_reset.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_ignition.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_stop.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_rubbos_uninstall.sh  $MYSQL1_HOST:/tmp
-
-scp -o StrictHostKeyChecking=no -o BatchMode=yes MYSQL1_uninstall.sh  $MYSQL1_HOST:/tmp
-
+scp_options="-o StrictHostKeyChecking=no -o BatchMode=yes"
+
+if true; then
+for script in BENCHMARK_rubbos_install.sh BENCHMARK_install.sh \
+              BENCHMARK_configure.sh BENCHMARK_uninstall.sh \
+              BENCHMARK_rubbos_uninstall.sh
+do
+    scp $scp_options $script $BENCHMARK_HOST:/tmp
+done
+fi
+
+if true; then
+for i in {1..4}
+do
+    for script in CLIENT${i}_rubbos_install.sh CLIENT${i}_install.sh \
+                  CLIENT${i}_configure.sh CLIENT${i}_uninstall.sh \
+                  CLIENT${i}_rubbos_uninstall.sh
+    do
+        CLIENT_HOST=`printenv CLIENT${i}_HOST`
+        scp $scp_options $script $CLIENT_HOST:/tmp
+    done
+done
+fi
+
+if true; then
+for script in HTTPD_install.sh HTTPD_rubbos_install.sh \
+              HTTPD_configure.sh HTTPD_ignition.sh \
+              HTTPD_stop.sh HTTPD_rubbos_uninstall.sh \
+              HTTPD_uninstall.sh
+do
+    scp $scp_options $script $HTTPD_HOST:/tmp
+done
+fi
+
+if true; then
+for script in TOMCAT1_install.sh TOMCAT1_rubbos_install.sh \
+              TOMCAT1_configure.sh TOMCAT1_rubbosSL_configure.sh \
+              TOMCAT1_ignition.sh TOMCAT1_stop.sh \
+              TOMCAT1_rubbos_uninstall.sh TOMCAT1_uninstall.sh
+do
+    scp $scp_options $script $TOMCAT1_HOST:/tmp
+done
+fi
+
+if true; then
+for script in MYSQL1_install.sh MYSQL1_rubbos_install.sh \
+              MYSQL1_configure.sh MYSQL1_reset.sh \
+              MYSQL1_ignition.sh MYSQL1_stop.sh \
+              MYSQL1_rubbos_uninstall.sh \
+              MYSQL1_uninstall.sh
+do
+    scp $scp_options $script $MYSQL1_HOST:/tmp
+done
+fi
+
+# Prepare software packages
+echo "*** prepare software packages ***"
+./MYSQL1_pkg_prepare.sh
+./TOMCAT1_pkg_prepare.sh
+./HTTPD_pkg_prepare.sh
+./BENCHMARK_pkg_prepare.sh
+for i in {1..4}
+do
+    ./CLIENT${i}_pkg_prepare.sh
+done
 
 # Install and Configure and run Apache, Tomcat, CJDBC, and MySQL
 echo "*** install scripts & configure & execute ***********************"
 
-#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_checkScp_exe.sh  
-#ssh $CONTROL_HOST /tmp/CONTROL_checkScp_exec.sh
-#ssh root@$CONTROL_HOST chmod 777 /tmp/CONTROL_emulabConf_exec.sh
-#ssh $CONTROL_HOST /tmp/CONTROL_emulabConf_exec.sh 
-
-ssh root@$MYSQL1_HOST chmod 777 /tmp/MYSQL1_install.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh 
-
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_install.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh 
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_install.sh 
-
-ssh root@$MYSQL1_HOST chmod 777 /tmp/MYSQL1_rubbos_install.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh 
-
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_rubbos_install.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh 
-
-
-ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh 
-
-ssh root@$BENCHMARK_HOST chmod 777 /tmp/BENCHMARK_rubbos_install.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh 
-
-ssh root@$CLIENT1_HOST chmod 777 /tmp/CLIENT1_rubbos_install.sh 
-ssh $CLIENT1_HOST /tmp/CLIENT1_rubbos_install.sh 
-
-ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_rubbos_install.sh
-ssh $CLIENT2_HOST /tmp/CLIENT2_rubbos_install.sh
-
-ssh root@$CLIENT3_HOST chmod 777 /tmp/CLIENT3_rubbos_install.sh
-ssh $CLIENT3_HOST /tmp/CLIENT3_rubbos_install.sh 
-
-ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_rubbos_install.sh
-ssh $CLIENT4_HOST /tmp/CLIENT4_rubbos_install.sh 
-
-ssh root@$BENCHMARK_HOST chmod 777 /tmp/BENCHMARK_install.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh 
-
-ssh root@$CLIENT1_HOST chmod 777 /tmp/CLIENT1_install.sh
-ssh $CLIENT1_HOST /tmp/CLIENT1_install.sh 
+ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_install.sh
+ssh $MYSQL1_HOST /tmp/MYSQL1_install.sh
 
-#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_install.sh
-#ssh $CLIENT2_HOST /tmp/CLIENT2_install.sh 
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_install.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_install.sh
 
-#ssh root@$CLIENT3_HOST chmod 777 /tmp/CLIENT3_install.sh
-#ssh $CLIENT3_HOST /tmp/CLIENT3_install.sh 
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_install.sh
+ssh $HTTPD_HOST /tmp/HTTPD_install.sh
 
-#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_install.sh
-#ssh $CLIENT4_HOST /tmp/CLIENT4_install.sh 
+ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_rubbos_install.sh
+ssh $MYSQL1_HOST /tmp/MYSQL1_rubbos_install.sh
 
-ssh root@$MYSQL1_HOST chmod 777 /tmp/MYSQL1_configure.sh
-ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh  &
-sleep 60
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbos_install.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbos_install.sh
 
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh 
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_rubbos_install.sh
+ssh $HTTPD_HOST /tmp/HTTPD_rubbos_install.sh
 
+ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_rubbos_install.sh
+ssh $BENCHMARK_HOST /tmp/BENCHMARK_rubbos_install.sh
 
-ssh $HTTPD_HOST /tmp/HTTPD_configure.sh 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_rubbos_install.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_rubbos_install.sh
+done
 
-ssh root@$BENCHMARK_HOST chmod 777 /tmp/BENCHMARK_configure.sh
-ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh 
+ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_install.sh
+ssh $BENCHMARK_HOST /tmp/BENCHMARK_install.sh
 
-ssh root@$CLIENT1_HOST chmod 777 /tmp/CLIENT1_configure.sh
-ssh $CLIENT1_HOST /tmp/CLIENT1_configure.sh 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_install.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_install.sh
+done
 
-#ssh root@$CLIENT2_HOST chmod 777 /tmp/CLIENT2_configure.sh
-#ssh $CLIENT2_HOST /tmp/CLIENT2_configure.sh 
+ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh
+ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh
 
-#ssh root@$CLIENT3_HOST chmod 777 /tmp/CLIENT3_configure.sh
-#ssh $CLIENT3_HOST /tmp/CLIENT3_configure.sh 
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_configure.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
 
-#ssh root@$CLIENT4_HOST chmod 777 /tmp/CLIENT4_configure.sh
-#ssh $CLIENT4_HOST /tmp/CLIENT4_configure.sh 
+ssh root@$HTTPD_HOST chmod 770 /tmp/HTTPD_configure.sh
+ssh $HTTPD_HOST /tmp/HTTPD_configure.sh
 
-ssh root@$TOMCAT1_HOST chmod 777 /tmp/TOMCAT1_rubbosSL_configure.sh
-ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh 
+ssh root@$BENCHMARK_HOST chmod 770 /tmp/BENCHMARK_configure.sh
+ssh $BENCHMARK_HOST /tmp/BENCHMARK_configure.sh
 
+for i in {1..4}
+do
+    CLIENT_HOST=`printenv CLIENT${i}_HOST`
+    ssh root@$CLIENT_HOST chmod 770 /tmp/CLIENT${i}_configure.sh
+    ssh $CLIENT_HOST /tmp/CLIENT${i}_configure.sh
+done
 
-#ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh 
+ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_rubbosSL_configure.sh
+ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL_configure.sh
 
diff --git a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
index b1cef518..79fcb0e9 100755
--- a/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
+++ b/rubbos/rubbos_scripts/1-1-1/set_bottlenecks_rubbos_env.sh
@@ -3,15 +3,15 @@
 set -o allexport
 
 # HOSTS
-CONTROL_HOST=192.168.50.60
-BENCHMARK_HOST=192.168.50.60
-CLIENT1_HOST=192.168.50.60
-CLIENT2_HOST=192.168.50.60
-CLIENT3_HOST=192.168.50.60
-CLIENT4_HOST=192.168.50.60
-HTTPD_HOST=192.168.50.58
-TOMCAT1_HOST=192.168.50.18
-MYSQL1_HOST=192.168.50.19
+CONTROL_HOST=192.168.122.11
+BHTTPD_HOST=192.168.122.12
+MYSQL1_HOST=192.168.122.13
+TOMCAT1_HOST=192.168.122.14
+CLIENT1_HOST=192.168.122.15
+CLIENT2_HOST=192.168.122.16
+CLIENT3_HOST=192.168.122.17
+CLIENT4_HOST=192.168.122.18
+ENCHMARK_HOST=192.168.122.19
 
 # Experiment name on OPNFV
 BOTTLNECKS_NAME=bottlenecks
@@ -22,7 +22,7 @@ OUTPUT_HOME=/bottlenecks/rubbos/rubbos_scripts/1-1-1
 SOFTWARE_HOME=/bottlenecks/rubbos/app_tools
 
 # Output directory for results of RUBBoS benchmark
-RUBBOS_RESULTS_HOST=192.168.50.58
+RUBBOS_RESULTS_HOST=${CONTROL_HOST}
 RUBBOS_RESULTS_DIR_BASE=/bottlenecks/rubbos/rubbos_results
 RUBBOS_RESULTS_DIR_NAME=2015-01-20T081237-0700
 
@@ -62,7 +62,8 @@ TOMCAT_TARBALL=apache-tomcat-5.5.17.tar.gz
 CJDBC_TARBALL=
 MYSQL_TARBALL=mysql-5.5.46-linux2.6-x86_64.tar.gz
 RUBBOS_TARBALL=RUBBoS-servlets.tar.gz
-RUBBOS_DATA_TARBALL=rubbos_data.tar.gz
+RUBBOS_DATA_TARBALL=rubbos_data.sql.tar.gz
+RUBBOS_DATA_SQL=rubbos_data.sql
 RUBBOS_DATA_TEXTFILES_TARBALL=smallDB-rubbos-modified.tgz
 
 # for MySQL