aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-core/distribution
diff options
context:
space:
mode:
authorhuangjian <huang.jian12@zte.com.cn>2016-10-24 14:44:17 +0800
committerhuangjian <huang.jian12@zte.com.cn>2016-10-24 14:44:17 +0800
commit5a0fa8ba78bf1de745b279e2cc7f09d158bbec80 (patch)
tree843935a41077bf0f0b6ce83228616889485a7bc5 /catalog-core/distribution
parente366e9da3eec5de359ef6d3450438f2d5c9fd97b (diff)
Update tomcat version to '8.5.6'
Change-Id: I4bebc635354375d77906b0c5103499aed22cdc3a Issue-id: TOSCA-139 Signed-off-by: huangjian <huang.jian12@zte.com.cn>
Diffstat (limited to 'catalog-core/distribution')
-rw-r--r--catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh2
-rw-r--r--catalog-core/distribution/catalog-all/src/main/assembly/startup.sh2
2 files changed, 4 insertions, 0 deletions
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
index 8679327d..d6bca27f 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
@@ -26,5 +26,7 @@ cd $RUNHOME
echo "\n\n### Starting catalog-http server"
cd ./tomcat
+export CATALINA_HOME=$RUNHOME/tomcat
+export CATALINA_BASE=$RUNHOME/tomcat
$RUNHOME/tomcat/bin/shutdown.sh &
echo "### Starting catalog end...";
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
index d2db0773..f3b3e5fb 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
@@ -30,6 +30,8 @@ cd ./tomcat
if [ ! -d "$RUNHOME/tomcat/logs" ]; then
mkdir $RUNHOME/tomcat/logs
fi
+export CATALINA_HOME=$RUNHOME/tomcat
+export CATALINA_BASE=$RUNHOME/tomcat
$RUNHOME/tomcat/bin/startup.sh &
echo "### Starting catalog end...";