X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fbuscontroller.git;a=blobdiff_plain;f=dmaap-bc%2Fsrc%2Fmain%2Fresources%2Fmisc%2Fdmaapbc;fp=dmaap-bc%2Fmisc%2Fdmaapbc;h=963d2d11575d6d3a239d13ac55dd8194c5d61b5b;hp=15f2fd27ad30ffd294e380fed117eb8ad90dd5b8;hb=71d3d0925874247de5e657821638b1c08360f571;hpb=20221353bdb213a1f143a132d819d4e0810e3794

diff --git a/dmaap-bc/misc/dmaapbc b/dmaap-bc/src/main/resources/misc/dmaapbc
similarity index 62%
rename from dmaap-bc/misc/dmaapbc
rename to dmaap-bc/src/main/resources/misc/dmaapbc
index 15f2fd2..963d2d1 100644
--- a/dmaap-bc/misc/dmaapbc
+++ b/dmaap-bc/src/main/resources/misc/dmaapbc
@@ -4,6 +4,7 @@
 # org.onap.dmaap
 # ===================================================================
 # Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Modifications copyright (C) 2021 Nordix Foundation.
 # ===================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,24 +20,23 @@
 # ============LICENSE_END============================================
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-#
 
 umask 0022
 TZ=GMT0
 COMPONENT=dmaapbc
 APP_ROOT=/opt/app/$COMPONENT
-USER=dbc
+USER=onap
 GROUP=onap
 export TZ
-PATH=/usr/local/openjdk-11/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH=/opt/java/openjdk/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 export PATH
-CLASSPATH=`echo $APP_ROOT/etc $APP_ROOT/lib/*.jar | tr ' ' ':'` 
+CLASSPATH=`echo $APP_ROOT/etc $APP_ROOT/lib/*.jar | tr ' ' ':'`
 export CLASSPATH
 CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config}
 CONFIGMAP_PROPS=${CONFIGMAP_PROPS:-$CONFIGMAP_ROOT/conf/dmaapbc.properties}
 CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/buscontroller.env
-MAIN=org.onap.dmaap.dbcapi.server.Main 
+MAIN=org.onap.dmaap.dbcapi.server.Main
 
 authcheck() {
 	set -x
@@ -75,8 +75,8 @@ config() {
 	then
 		echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect"
 		find $CONTAINER_ROOT -type f
-	else 
-	    . $CONTAINER_CONFIG
+	else
+	  . $CONTAINER_CONFIG
 	fi
 
 	if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
@@ -85,27 +85,8 @@ config() {
 		> $APP_ROOT/ok_to_exit
 	else
 		echo "Not creating $APP_ROOT/ok_to_exit"
-	fi	
-	
-	#. misc/havecert.tmpl > etc/havecert
-	#chmod +x etc/havecert
-	echo Check for certificate
-	TZ=GMT0
-	cd /opt/app/dmaapbc;
-	KEYSTORE=${DMAAPBC_KSTOREFILE:-etc/keystore}
-	echo "KEYSTORE=$KEYSTORE"
-	d=`dirname $KEYSTORE`
-	ls -l $d
-	if [ -f ${KEYSTORE} ]
-	then
-		echo "Goodness: Found ${KEYSTORE}"
-	else
-		EMSG="`date '+%F %T,000'` WARN Certificate file $KEYSTORE is missing"
-		echo $EMSG
-		echo $EMSG >>${DMAAPBC_LOGS:-logs}/dmaapbc.log
 	fi
 
-
 	# These files might be better provided in kubernetes configmaps
 	# so if they are there, use them
 	if [ -f $CONFIGMAP_PROPS ]
@@ -117,7 +98,7 @@ config() {
 	fi
 	if [ ! -f config/PolicyEngineApi.properties ]
 	then
-    		. misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
+	  . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
 	fi
 	set +x
 }
@@ -129,13 +110,6 @@ start() {
 	cd $APP_ROOT
 	pwd
 
-	if [ -f "$KEYSTORE" ]
-	then
-		echo >/dev/null
-	else
-		echo No certificate file available.  Cannot start
-		exit 0
-	fi
 	PIDS=`pids`
 	if [ "$PIDS" != "" ]
 	then
@@ -144,11 +118,11 @@ start() {
 	fi
 	rm -f $APP_ROOT/etc/SHUTDOWN
 
+  java -classpath $CLASSPATH  $MAIN
+  dmaapjar="$APP_ROOT/lib/dmaap-bc.jar"
 	# JVM flags
-#old line from Dockerfile...keep for reference only
-	FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -DConfigFile=$PROPS  -Dlogback.configurationFile=etc/logback.xml -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-	#nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
-	nohup java $FLAGS $MAIN </dev/null  &
+	FLAGS="-cp etc:lib/* -DConfigFile=$PROPS  -Dlogback.configurationFile=etc/logback.xml -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+	nohup java $FLAGS -jar $dmaapjar </dev/null  &
 	sleep 5
 	PIDS=`pids`
 	set +x
@@ -181,46 +155,11 @@ status() {
 	fi
 }
 
-init() {
-	echo "ENTER init"
-	if [ ! -d $CONFIGMAP_ROOT ]
-	then
-		echo $CONFIGMAP_ROOT does not exist
-		return
-	fi
-
-	#loop on get /dmaap until we get a good response to indicate other provisioning can continue
-	rc=999
-	while [ $rc != "200" ]
-	do
-		sleep 10
-		rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap`
-		echo "get dmaap response=${rc}"
-	done
-
-	cd $CONFIGMAP_ROOT
-	pwd
-	# order is important in this next list
-	for uri in dmaap dcaeLocations mr_clusters topics feeds
-	do
-		if [ -d ${uri} ]
-		then
-			for j in `ls ${uri}/*.json`
-			do
-				echo "POST $j to $uri"
-				rc=`curl -v -X POST -w "%{http_code}" -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}`
-				echo "response=$rc"
-			done
-		fi
-	done
-}
-
 set -x
 case "$1" in
 'deploy')
 	config
 	start
-	#init
 	wait
 	;;
 'start')
@@ -244,11 +183,11 @@ case "$1" in
 esac
 		ls -l $APP_ROOT/logs/ONAP
 		echo "------------ tail -100 error.log ---------------"
-		tail -100  $APP_ROOT/logs/ONAP/error.log
+		tail -n 1000  $APP_ROOT/logs/ONAP/error.log
 		echo "------------ tail -100 server.log ---------------"
-		tail -100  $APP_ROOT/logs/ONAP/server.log
+		tail -n 1000  $APP_ROOT/logs/ONAP/server.log
 		echo "------------ tail -100 application.log ---------------"
-		tail -100 $APP_ROOT/logs/ONAP/application.log
+		tail -n 1000 $APP_ROOT/logs/ONAP/application.log
 
 		echo "Check $APP_ROOT/ok_to_exit"
 		while [ ! -f $APP_ROOT/ok_to_exit ]