Merge "Update package prepare scripts"

diff --combined rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
index bdbb999,4fd7e9b..b2aacea
--- 1/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
--- 2/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/TOMCAT1_pkg_prepare.sh
@@@ -11,15 -11,6 +11,6 @@@ scp $scp_options ../set_bottlenecks_rub
  
  ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
  
- ssh $TOMCAT1_HOST "
-     apt-get update
-     apt-get install -y \
-         gcc \
-         gettext \
-         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
@@@ -39,7 -30,7 +30,7 @@@ f
  # 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
 +scp $scp_options $OUTPUT_HOME/tomcat_conf/server.xml $TOMCAT1_HOST:$OUTPUT_HOME/tomcat_conf/server.xml
  fi
  
  # Packages for TOMCAT1 rubbosSL configure

diff --combined rubbos/rubbos_scripts/1-1-1/scripts/run.sh
index 9e523c3,ea9ab36..b9014f0
--- 1/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
--- 2/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
+++ b/rubbos/rubbos_scripts/1-1-1/scripts/run.sh
@@@ -1,6 -1,3 +1,6 @@@
 +#!/bin/bash
 +set -x
 +
  cd /bottlenecks/rubbos/rubbos_scripts/1-1-1
  source set_bottlenecks_rubbos_env.sh
  cd /bottlenecks/rubbos/rubbos_scripts/1-1-1/scripts
@@@ -117,7 -114,8 +117,8 @@@ d
  done
  
  ssh root@$MYSQL1_HOST chmod 770 /tmp/MYSQL1_configure.sh
- ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh
+ ssh $MYSQL1_HOST /tmp/MYSQL1_configure.sh &
+ sleep 60
  
  ssh root@$TOMCAT1_HOST chmod 770 /tmp/TOMCAT1_configure.sh
  ssh $TOMCAT1_HOST /tmp/TOMCAT1_configure.sh
@@@ -140,4 -138,3 +141,4 @@@ ssh $TOMCAT1_HOST /tmp/TOMCAT1_rubbosSL
  
  ssh $CONTROL_HOST /tmp/CONTROL_rubbos_exec.sh
  
 +set +x