From a0cc5811862052694918a16fdd8ebfd47ce8ec7b Mon Sep 17 00:00:00 2001
From: "a.sreekumar" <ajith.sreekumar@est.tech>
Date: Wed, 3 Jul 2019 15:55:17 +0000
Subject: Remove topic.properties and incorporate into overall config file

Changes in the scripts to accomodate the removal of topic.properties.

Change-Id: I0be390a6124248a4e9d3bf38437290b89cf36170
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
---
 packages/policy-pap-docker/src/main/docker/policy-pap.sh | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'packages/policy-pap-docker/src/main/docker/policy-pap.sh')

diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
index c313d6dd..c0f3b2da 100644
--- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh
+++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
@@ -33,23 +33,11 @@ else
     CONFIG_FILE=${CONFIG_FILE}
 fi
 
-if [ "$#" -ge 2 ]; then
-    PROP_FILE=$2
-else
-    PROP_FILE=${PROP_FILE}
-fi
-
 if [ -z "$CONFIG_FILE" ]
   then
     CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json"
 fi
 
-if [ -z "$PROP_FILE" ]
-  then
-    PROP_FILE="${POLICY_HOME}/etc/topic.properties"
-fi
-
 echo "Policy pap config file: $CONFIG_FILE"
-echo "Policy pap property file: $PROP_FILE"
 
-$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
+$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE
-- 
cgit 1.2.3-korg