X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fbin%2Fstart.sh;h=87ec099750e44fc8f96d6932b8b6052bbc267f14;hb=995c51941dbc80a69bdc01ea56c86219d3c73eaf;hp=843e4c521f5ac62fec514659a05716bb925038d1;hpb=bfb506c057c62cc6e76a3696608182c202e01698;p=aai%2Fgizmo.git

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 843e4c5..87ec099 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,55 +1,36 @@
-#!/bin/sh
+#!/bin/bash
 
-BASEDIR="/opt/app/crud-api/"
-AJSC_HOME="$BASEDIR"
-AJSC_CONF_HOME="$AJSC_HOME/bundleconfig/"
+APP_HOME="/opt/app/crud-api"
 
 if [ -z "$CONFIG_HOME" ]; then
 	echo "CONFIG_HOME must be set in order to start up process"
 	exit 1
 fi
 
+if [ -z "$SERVICE_BEANS" ]; then
+	echo "SERVICE_BEANS must be set in order to start up process"
+	exit 1
+fi
+
 if [ -z "$KEY_STORE_PASSWORD" ]; then
 	echo "KEY_STORE_PASSWORD must be set in order to start up process"
 	exit 1
-else
-	echo "KEY_STORE_PASSWORD=$KEY_STORE_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
 fi
 
-if [ -z "$KEY_MANAGER_PASSWORD" ]; then
-	echo "KEY_MANAGER_PASSWORD must be set in order to start up process"
-	exit 1
-else
-	echo "KEY_MANAGER_PASSWORD=$KEY_MANAGER_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
+PROPS="-DAPP_HOME=$APP_HOME"
+PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
+PROPS="$PROPS -Dlogging.config=$APP_HOME/bundleconfig/etc/logback.xml"
+PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
+
+if [ ! -z "$TRUST_STORE_PASSWORD" ]; then
+   PROPS="$PROPS -DTRUST_STORE_PASSWORD=${TRUST_STORE_PASSWORD}"
 fi
 
-# Add any spring bean configuration files to the Gizmo deployment
-if [ -n "$SERVICE_BEANS" ]; then
-        echo "Adding the following dynamic service beans to the deployment: "
-        mkdir -p /tmp/crud-api/v1/conf
-        for f in `ls $SERVICE_BEANS`
-        do
-                cp $SERVICE_BEANS/$f /tmp/crud-api/v1/conf
-                echo "Adding dynamic service bean $SERVICE_BEANS/$f"
-        done
-        jar uf /opt/app/crud-api/services/crud-api_v1.zip* -C /tmp/ crud-api
-        rm -rf /tmp/crud-api
+if [ ! -z "$TRUST_STORE_LOCATION" ]; then
+   PROPS="$PROPS -DTRUST_STORE_LOCATION=${TRUST_STORE_LOCATION}"
 fi
 
-CLASSPATH="$AJSC_HOME/lib/*"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/extJars/"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/etc/"
-
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -DAJSC_CONF_HOME=$BASEDIR/bundleconfig/"
-PROPS="$PROPS -Dlogback.configurationFile=$BASEDIR/bundleconfig/etc/logback.xml"
-PROPS="$PROPS -DAJSC_SHARED_CONFIG=$AJSC_CONF_HOME"
-PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=crud-api"
-PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1"
-PROPS="$PROPS -Dserver.port=9520"
-PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
-echo $CLASSPATH
-
-exec java -Xmx${JVM_MAX_HEAP}m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9520
+set -x
+exec java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${APP_HOME}/gizmo.jar