Code Review
/
bottlenecks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add result handler & fix test run hanging bug
[bottlenecks.git]
/
rubbos
/
rubbos_scripts
/
1-1-1
/
scripts
/
TOMCAT1_pkg_prepare.sh
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
index
ac5231e
..
d50a6da
100755
(executable)
--- a/
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
@@
scp $scp_options ../set_bottlenecks_rubbos_env.sh $TOMCAT1_HOST:/bottlenecks/rub
ssh $TOMCAT1_HOST "mkdir -p $SOFTWARE_HOME"
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
for i in $TOMCAT_TARBALL $JAVA_TARBALL $J2EE_TARBALL $ANT_TARBALL
do
scp $scp_options $SOFTWARE_HOME/$i $TOMCAT1_HOST:$SOFTWARE_HOME/$i
@@
-39,16
+30,20
@@
fi
# Packages for TOMCAT1 configure
if true; then
ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/tomcat_conf"
# 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
if true; then
ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
fi
# Packages for TOMCAT1 rubbosSL configure
if true; then
ssh $TOMCAT1_HOST "mkdir -p $OUTPUT_HOME/rubbos_conf"
+sed -e "s#REPLACE_MYSQL1_HOST#$MYSQL1_HOST#g" \
+ $OUTPUT_HOME/rubbos_conf/mysql.properties_template \
+ > $OUTPUT_HOME/rubbos_conf/mysql.properties
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
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
+rm -rf $OUTPUT_HOME/rubbos_conf/mysql.properties
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
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