summaryrefslogtreecommitdiffstats
path: root/packages/policy-pap-docker
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-03-12 11:53:22 -0400
committerJim Hahn <jrh3@att.com>2019-03-13 16:26:27 -0400
commit4a3cfdff6285a516f1e05d4cebd748ea623177e5 (patch)
tree326e5d97e6e731d93ef355cc441295a9cf67ba16 /packages/policy-pap-docker
parentd8e7fa11c3bab410f41a4161f9f736eab5b2e3ec (diff)
Add PDP Group Deploy and Delete REST API stubs
Note: this will not build until the models-pap code has been added. Added PDP group Delete methods, with and without version. Added checks for OK status codes. Added topic configuration. Still does not have the "simplified" PDP Group deploy/undeploy. Still won't build without "Move PDP Group classes to concepts subdirectory". Will add junit tests for code changes in another review. Updated comments about unlocking after updates. Made ServiceManager final. Included topic start/stop actions. Fixed parameter comment. Removed unneeded parameters from json files. Fixed argument test in shell script. Updated licenses. Change-Id: I6176d51918ae758e04fb68562dc9ca70534137d4 Issue-ID: POLICY-1542 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages/policy-pap-docker')
-rw-r--r--packages/policy-pap-docker/src/main/docker/policy-pap.sh17
1 files changed, 15 insertions, 2 deletions
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 6bd53780..f72a5b50 100644
--- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh
+++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
@@ -2,6 +2,7 @@
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
+# Modifications Copyright (C) 2019 AT&T Intellectual Property.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -27,17 +28,29 @@ TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore"
TRUSTSTORE_PASSWD="Pol1cy_0nap"
-if [ "$#" -eq 1 ]; then
+if [ "$#" -ge 1 ]; then
CONFIG_FILE=$1
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_PAP_HOME/etc/defaultConfig.json"
fi
+if [ -z "$PROP_FILE" ]
+ then
+ PROP_FILE="$POLICY_PAP_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_PAP_HOME/etc:$POLICY_PAP_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
+$JAVA_HOME/bin/java -cp "$POLICY_PAP_HOME/etc:$POLICY_PAP_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