From 24e3448b4673674e2fbd4e55603b1b67ac052182 Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Wed, 21 Mar 2018 08:28:10 -0400
Subject: [PATCH] Modify for k8s deployment compatibility

There was a problem with signature using shade.
Also simplified start script for k8s

Change-Id: I8c3cda5d20a0db9840301168baea3c4b6606c9c4
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-117
---
 README.md                    |  2 +-
 misc/dmaapbc                 | 27 +++++++++++----------------
 misc/dmaapbc.properties.tmpl |  6 +++---
 pom.xml                      | 20 +++++++++++++++++---
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index bd4cfd3..3bc4fb4 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Note the Dockerfile follows ONAP convention of running app as root.
 
 <assuming DOCKER_HOST is set appropriately for your environment>
 
-$ mvn docker:build
+$ mvn -P docker docker:build
 ```
 
 
diff --git a/misc/dmaapbc b/misc/dmaapbc
index 19bb3f7..6b337db 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -15,9 +15,9 @@ MAIN=org.onap.dmaap.dbcapi.server.Main
 
 
 pids() {
-	#set -x
+	set -x
 	ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
-	#set +x
+	set +x
 }
 
 config() {
@@ -81,22 +81,10 @@ start() {
 	# JVM flags
 #old line from Dockerfile...keep for reference only
 	FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties  -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 >/dev/null 2>&1 &
+	nohup java $FLAGS $MAIN </dev/null  &
 	sleep 5
 	PIDS=`pids`
-	if [ "$PIDS" = "" ]
-	then
-		echo $COMPONENT startup failed
-		ls -l $APP_ROOT/logs/EELF
-		echo "------------ error.log ---------------"
-		cat $APP_ROOT/logs/EELF/error.log
-		echo "------------ server.log ---------------"
-		cat $APP_ROOT/logs/EELF/server.log
-		echo "------------ tail -100 application.log ---------------"
-		tail -100 $APP_ROOT/logs/EELF/application.log
-	else
-		echo $COMPONENT started
-	fi
 	set +x
 }
 
@@ -162,4 +150,11 @@ case "$1" in
 	exit 1
 	;;
 esac
+		ls -l $APP_ROOT/logs/EELF
+		echo "------------ tail -100 error.log ---------------"
+		tail -100  $APP_ROOT/logs/EELF/error.log
+		echo "------------ tail -100 server.log ---------------"
+		tail -100  $APP_ROOT/logs/EELF/server.log
+		echo "------------ tail -100 application.log ---------------"
+		tail -100 $APP_ROOT/logs/EELF/application.log
 exit 0
diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl
index 5b7ee28..e288518 100644
--- a/misc/dmaapbc.properties.tmpl
+++ b/misc/dmaapbc.properties.tmpl
@@ -20,7 +20,7 @@ IntHttpPort:	${DMAAPBC_INT_HTTP_PORT:-8080}
 #	The port number for https as seen within the server
 #   Set to 0 if no certificate is available yet...
 #
-IntHttpsPort:	${DMAAPBC_INT_HTTPS_PORT:-8443}
+IntHttpsPort:	${DMAAPBC_INT_HTTPS_PORT:-0}
 #
 #	The external port number for https taking port mapping into account
 #
@@ -60,7 +60,7 @@ QuiesceFile:	etc/SHUTDOWN
 #
 #	Enable postgress
 #
-UsePGSQL:	${DMAAPBC_PG_ENABLED:-true}
+UsePGSQL:	${DMAAPBC_PG_ENABLED:-false}
 #
 #	The host for postgres access
 #
@@ -89,7 +89,7 @@ Feed.deleteHandling: ${DMAAPBC_FEED_DELETE:-DeleteOnDR}
 #   Value of the CNAME DNS entry which resolves to the primary central MR cluster (when there are more than one central clusters).
 #   if there is only one MR cluster in an environment, set this to the DNS name for that cluster
 #
-MR.CentralCname:  ${DMAAPBC_MR_CNAME:-notSet.onap.org}
+MR.CentralCname:  ${DMAAPBC_MR_CNAME:-dmaap.onap}
 #
 #   MR Client Delete Level thoroughness:
 #   0 = don't delete
diff --git a/pom.xml b/pom.xml
index 2eae015..25adb7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>buscontroller</artifactId>
-  <version>1.0.1</version>
+  <version>${artifact.version}</version>
   <name>dmaap-buscontroller</name>
   <parent>
     <groupId>org.onap.oparent</groupId>
@@ -53,6 +53,20 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+							<!-- this filter section is needed to avoid runtime error:
+								java.lang.SecurityException: Invalid signature file digest for Manifest main attributes
+								suggestion found at: https://stackoverflow.com/q/999489 
+							-->
+							<filters>
+								<filter>
+									<artifact>*:*</artifact>
+									<excludes>
+										<exclude>META-INF/*.SF</exclude>
+										<exclude>META-INF/*.DSA</exclude>
+										<exclude>META-INF/*.RSA</exclude>
+									</excludes>
+								</filter>
+							</filters>
                             <transformers>
                                 <!-- NOTE: Need the following transformer else gets "Could not resolve type id 'https' into a subtype" error
                                 Solution found from here:
@@ -256,7 +270,7 @@
 	<dependency>
 		<groupId>org.onap.dmaap.dbcapi</groupId>
 		<artifactId>dbcapi</artifactId>
-		<version>1.0.1-SNAPSHOT</version>
+		<version>1.0.2-SNAPSHOT</version>
 	</dependency>
   </dependencies>
   <reporting>
@@ -291,7 +305,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jettyVersion>9.3.7.v20160115</jettyVersion>
     <eelf.version>0.0.1</eelf.version>
-    <artifact.version>1.0.1</artifact.version>
+    <artifact.version>1.0.2</artifact.version>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-- 
2.16.6