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

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 59f4314..a54059b 100644
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -10,70 +10,39 @@ if [ -z "$CONFIG_HOME" ]; then
 fi
 
 if [ -z "$KEY_STORE_PASSWORD" ]; then
-        echo "KEY_STORE_PASSWORD must be set in order to start up process"
-        exit 1
+	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
+	## 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
 
-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
-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
 
-# Add any routes configured at deploy time to the data layer service
-if [ -n "$DYNAMIC_ROUTES" ]; then
-        echo "Adding the following dynamic routes to the deployment: "
-        mkdir -p /tmp/data-router/v1/routes
-        for f in `ls $DYNAMIC_ROUTES`
-        do
-                cp $DYNAMIC_ROUTES/$f /tmp/data-router/v1/routes
-                echo "Adding dynamic route $DYNAMIC_ROUTES/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
-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
 
-# Add any spring bean configuration files to the data layer deployment
-if [ -n "$SERVICE_BEANS" ]; then
-        echo "Adding the following dynamic service beans to the deployment: "
-        mkdir -p /tmp/data-router/v1/conf
-        for f in `ls $SERVICE_BEANS`
-        do
-                cp $SERVICE_BEANS/$f /tmp/data-router/v1/conf
-                echo "Adding dynamic service bean $SERVICE_BEANS/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
-fi
-
-# Add any dynamic component configuration files to the data layer deployment
-if [ -n "$COMPLIB" ]; then
-        echo "Adding the following dynamic libraries to the deployment: "
-        mkdir -p /tmp/data-router/v1/lib
-        for f in `ls $COMPLIB`
-        do
-                cp $COMPLIB/$f /tmp/data-router/v1/lib
-                echo "Adding dynamic library $COMPLIB/$f"
-        done
-        jar uf /opt/app/data-router/services/data-router_v1.zip* -C /tmp/ data-router
-        rm -rf /tmp/data-router
-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=$AJSC_CONF_HOME"
-PROPS="$PROPS -Dlogback.configurationFile=$BASEDIR/bundleconfig/etc/logback.xml"
+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
 
-java -Xms1024m -Xmx4096m -XX:PermSize=2024m $PROPS -classpath $CLASSPATH com.att.ajsc.runner.Runner context=// sslport=9502
+cd ${MICRO_HOME}
+jar uf0 $MICRO_HOME/data-router.jar BOOT-INF/lib/*
+
+exec java -Xmx${JVM_MAX_HEAP}m $PROPS -jar ${MICRO_HOME}/data-router.jar
\ No newline at end of file