summaryrefslogtreecommitdiffstats
path: root/packages/policy-xacmlpdp-docker/src
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@est.tech>2019-07-04 14:14:39 +0000
committera.sreekumar <ajith.sreekumar@est.tech>2019-07-04 14:14:39 +0000
commitaba606406dded6ea6d9bf140ea2cbbf11fe90238 (patch)
treed4c92ddff7843439708cbcd1bf874cc0b5ae0a17 /packages/policy-xacmlpdp-docker/src
parentdc6afa16a2b9fbd19373a1e2ca5859df2782dcb6 (diff)
Remove topic.properties and incorporate into overall config file for xacml
Change-Id: I3be6248db65041f5d9b7acfcf0fcd2f49d9d70f8 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'packages/policy-xacmlpdp-docker/src')
-rw-r--r--packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
index 5ffe202a..4c58294e 100644
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
@@ -32,22 +32,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
-
if [[ -f ${POLICY_HOME}/etc/mounted/xacml.properties ]]; then
cp -f "${POLICY_HOME}"/etc/mounted/xacml.properties "${POLICY_HOME}"/apps/guard/
fi
@@ -56,6 +45,5 @@ fi
${POLICY_HOME}/mysql/bin/create-guard-table.sh
echo "Policy Xacml PDP config file: $CONFIG_FILE"
-echo "Policy Xacml PDP topic properties 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.pdpx.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE \ No newline at end of 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.pdpx.main.startstop.Main -c $CONFIG_FILE \ No newline at end of file