Update startup.sh to use JAVA_OPTS and SPRING_OPTS

Issue-ID: MUSIC-561
Signed-off-by: Thomas Nelson <tn1381@att.com>
Change-Id: I92a342a22df684ddc7ae91832b1e32daab9c5b19

Signed-off-by: Thomas Nelson <tn1381@att.com>
Change-Id: Ia57db43d217ead0f6d145e775cc9d6264d040274

diff --git a/music-rest/distribution/music/startup.sh b/music-rest/distribution/music/startup.sh
index 2e1165d..98b3ae0 100644 (file)
--- a/music-rest/distribution/music/startup.sh
+++ b/music-rest/distribution/music/startup.sh
@@ -57,10 +57,10 @@ fi
 if [ -f $PROPS ]; then
   # Run with different Property file
   #echo "java ${DEBUG_PROP} -jar MUSIC.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}"
-  java ${DEBUG_PROP} -jar MUSIC-SB.jar --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}
+  java ${DEBUG_PROP} ${JAVA_OPTS} -jar MUSIC-SB.jar ${SPRING_OPTS} --spring.config.location=file:${PROPS} ${LOGGING} 2>&1 | tee ${LOGFILE}
 else
   #echo "java ${DEBUG_PROP} -jar MUSIC.jar --server.ssl.key-store-password=${PASSWORD} ${LOGGING} 2>&1 | tee ${LOGFILE}"
-  java ${DEBUG_PROP} -jar MUSIC-SB.jar --server.ssl.key-store-password="${PASSWORD}" ${LOGGING} 2>&1 | tee ${LOGFILE}
+  java ${DEBUG_PROP} ${JAVA_OPTS} -jar MUSIC-SB.jar ${SPRING_OPTS} --server.ssl.key-store-password="${PASSWORD}" ${LOGGING} 2>&1 | tee ${LOGFILE}
 fi