Move REQUIRE_CLIENT_AUTH code to start script

[aai/babel.git] / src / main / bin / start.sh

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 3aba251..8c4cdf5 100644 (file)
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 # ============LICENSE_START=======================================================
 # org.onap.aai
 # ================================================================================
-# Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2017-2018 European Software Marketing Ltd.
+# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2019 European Software Marketing Ltd.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,47 +19,26 @@
 # limitations under the License.
 # ============LICENSE_END=========================================================
 
-AJSC_HOME="${AJSC_HOME-/opt/app/babel/}"
-AJSC_CONF_HOME="$AJSC_HOME/bundleconfig"
+APP_HOME="${APP_HOME:-/opt/app/babel}"
 
-if [ -z "$CONFIG_HOME" ]; then
-    echo "CONFIG_HOME must be set in order to start up the process"
-    exit 1
+if [ -z "${CONFIG_HOME}" ]; then
+       echo "CONFIG_HOME must be set in order to start the process"
+       exit 1
 fi
 
-# List of ajsc properties which are exposed for modification at deploy time
-declare -a MODIFY_PROP_LIST=("KEY_STORE_PASSWORD"
-                             "KEY_MANAGER_PASSWORD"
-                             "AJSC_JETTY_ThreadCount_MIN" 
-                             "AJSC_JETTY_ThreadCount_MAX"
-                             "AJSC_JETTY_BLOCKING_QUEUE_SIZE")
-PROP_LIST_LENGTH=${#MODIFY_PROP_LIST[@]}  
-
-for (( i=1; i<${PROP_LIST_LENGTH}+1; i++ ));
-do
-   PROP_NAME=${MODIFY_PROP_LIST[$i-1]}
-   PROP_VALUE=${!PROP_NAME}
-   if [ ! -z "$PROP_VALUE" ]; then
-      sed -i "s/$PROP_NAME=.*$/$PROP_NAME=$PROP_VALUE/g" $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
-   fi
-done
+if [ -z "${KEY_STORE_PASSWORD}" ]; then
+       echo "KEY_STORE_PASSWORD must be set in order to start the process"
+       exit 1
+fi
 
-# Change the CLASSPATH separator to ; if your O/S is Windows
-CLASSPATH="$AJSC_HOME/lib/*"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/extJars/"
-CLASSPATH="$CLASSPATH:$AJSC_HOME/etc/"
+PROPS="-DAPP_HOME=${APP_HOME}"
+PROPS="${PROPS} -DCONFIG_HOME=${CONFIG_HOME}"
+PROPS="${PROPS} -Dtosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json"
+PROPS="${PROPS} -DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}"
+if [ ! -z "$REQUIRE_CLIENT_AUTH" ]; then
+   PROPS="$PROPS -Dserver.ssl.client-auth=${REQUIRE_CLIENT_AUTH}"
+fi
 
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
-PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
-PROPS="$PROPS -Dlogback.configurationFile=$AJSC_CONF_HOME/bundleconfig/etc/logback.xml"
-PROPS="$PROPS -DAJSC_SHARED_CONFIG=$AJSC_CONF_HOME"
-PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=babel"
-PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1"
-PROPS="$PROPS -Dserver.port=9516"
-PROPS="$PROPS -Dartifactgenerator.config=$CONFIG_HOME/artifact-generator.properties"
 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=9516
+exec java -Xmx${JVM_MAX_HEAP}m ${PROPS} -jar ${APP_HOME}/babel.jar