X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fbin%2Fstart.sh;h=120f960ab4705ec55ab2ffa194e5e4abd805aaaf;hb=7ea1df80bf0c87800ff737a6b3e29af689bb003f;hp=a54059bda06200f3a8564c7436ef2e1c3c42d05d;hpb=677dbc87455c77e9d3184519ddbd550c74cc41e8;p=aai%2Fdata-router.git

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index a54059b..120f960 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-BASEDIR="/opt/app/data-router/"
-AJSC_HOME="$BASEDIR"
-AJSC_CONF_HOME="$AJSC_HOME/bundleconfig/"
+MICRO_HOME="/opt/app/data-router"
+
+
 
 if [ -z "$CONFIG_HOME" ]; then
         echo "CONFIG_HOME must be set in order to start up process"
@@ -12,37 +12,25 @@ fi
 if [ -z "$KEY_STORE_PASSWORD" ]; then
 	echo "KEY_STORE_PASSWORD must be set in order to start up process"
 	exit 1
-else
-	## Extract java jar to DEOBFUSCATE the password.
-	CURR_D=`pwd`
-	cd $BASEDIR
-	jar xf data-router.jar
-	sudo java -cp ./BOOT-INF/lib/jetty-util-9.4.8.v20171121.jar org.eclipse.jetty.util.security.Password $KEY_STORE_PASSWORD > pass.txt 2>> pass.txt
-	PASS=`sed "2q;d" pass.txt`
-	sudo rm pass.txt
-	cd $CURR_D
 fi
 
-## tomcat_keystore to p12
-keytool -importkeystore -noprompt -deststorepass $PASS -destkeypass $PASS -srckeystore $BASEDIR/config/auth/tomcat_keystore -destkeystore $BASEDIR/config/auth/onap.p12 -deststoretype PKCS12 -srcstorepass $PASS
+PROPS="-DAJSC_HOME=${MICRO_HOME}"
+PROPS="$PROPS -Dlogging.config=${MICRO_HOME}/bundleconfig/etc/logback.xml"
+PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
+PROPS="$PROPS -DKEY_STORE_PASSWORD=$KEY_STORE_PASSWORD"
+
+if [ ! -z "$TRUST_STORE_PASSWORD" ]; then
+   PROPS="$PROPS -DTRUST_STORE_PASSWORD=${TRUST_STORE_PASSWORD}"
+fi
 
-## import into cacerts
-sudo keytool -importkeystore -noprompt -deststorepass changeit -destkeypass changeit -destkeystore /$JAVA_HOME/jre/lib/security/cacerts -srckeystore $BASEDIR/config/auth/onap.p12 -srcstoretype PKCS12 -srcstorepass $PASS -alias tomcat
+if [ ! -z "$TRUST_STORE_LOCATION" ]; then
+   PROPS="$PROPS -DTRUST_STORE_LOCATION=${TRUST_STORE_LOCATION}"
+fi
 
 
-PROPS="-DAJSC_HOME=$AJSC_HOME"
-PROPS="$PROPS -DAJSC_CONF_HOME=$AJSC_CONF_HOME"
-PROPS="$PROPS -Dlogging.config=$BASEDIR/bundleconfig/etc/logback.xml"
-PROPS="$PROPS -DAJSC_SHARED_CONFIG=$AJSC_CONF_HOME"
-PROPS="$PROPS -DAJSC_SERVICE_NAMESPACE=data-router"
-PROPS="$PROPS -DAJSC_SERVICE_VERSION=v1"
-PROPS="$PROPS -Dserver.port=9502"
-PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
 JVM_MAX_HEAP=${MAX_HEAP:-1024}
 
-echo $CLASSPATH
-
 cd ${MICRO_HOME}
-jar uf0 $MICRO_HOME/data-router.jar BOOT-INF/lib/*
+jar uf0 ${MICRO_HOME}/data-router.jar BOOT-INF/lib/* > /dev/null 2>&1
 
 exec java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${MICRO_HOME}/data-router.jar
\ No newline at end of file