Remove POLICY_PDPX_HOME in policy-pdpx.sh and Dockerfile

[policy/xacml-pdp.git] / packages / policy-xacmlpdp-docker / src / main / docker / policy-pdpx.sh

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 45ba314..5ffe202 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
@@ -2,6 +2,7 @@
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+#  Modifications Copyright (C) 2019 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,7 +20,6 @@
 # ============LICENSE_END=========================================================
 #
 JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/
-POLICY_PDPX_HOME=/opt/app/policy/pdpx
 KEYSTORE="${POLICY_HOME}/etc/ssl/policy-keystore"
 KEYSTORE_PASSWD="Pol1cy_0nap"
 TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore"
@@ -33,21 +33,29 @@ else
 fi
 
 if [ "$#" -ge 2 ]; then
-       PROP_FILE=$2
+    PROP_FILE=$2
 else
-       PROP_FILE=${PROP_FILE}
+    PROP_FILE=${PROP_FILE}
+fi
 
 if [ -z "$CONFIG_FILE" ]
   then
-    CONFIG_FILE="$POLICY_PDPX_HOME/etc/defaultConfig.json"
+    CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json"
 fi
 
 if [ -z "$PROP_FILE" ]
   then
-    PROP_FILE="$POLICY_PDPX_HOME/etc/topic.properties"
+    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
 
+# Create operationshistory table
+${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_PDPX_HOME/etc:$POLICY_PDPX_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
+$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