Merge "Upgrade xacml engine to 3.1.0"

diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh
index 838cfa5..b715c97 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx-pg.sh
@@ -67,6 +67,11 @@ if [ -f "${POLICY_HOME}/etc/mounted/db-pg.sql" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/db-pg.sql "${POLICY_HOME}"/postgress/sql/
 fi
 
+if [ -f "${POLICY_HOME}/etc/mounted/guard.xacml.properties" ]; then
+    echo "overriding guard application xacml.properties"
+    cp -f "${POLICY_HOME}"/etc/mounted/guard.xacml.properties "${POLICY_HOME}"/apps/guard/xacml.properties
+fi
+
 # Create operationshistory table
 "${POLICY_HOME}"/postgres/bin/create-guard-table-pg.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 0c7b98b..537f234 100644 (file)
--- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
+++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh
@@ -67,6 +67,11 @@ if [ -f "${POLICY_HOME}/etc/mounted/db.sql" ]; then
     cp -f "${POLICY_HOME}"/etc/mounted/db.sql "${POLICY_HOME}"/mysql/sql/
 fi
 
+if [ -f "${POLICY_HOME}/etc/mounted/guard.xacml.properties" ]; then
+    echo "overriding guard application xacml.properties"
+    cp -f "${POLICY_HOME}"/etc/mounted/guard.xacml.properties "${POLICY_HOME}"/apps/guard/xacml.properties
+fi
+
 # Create operationshistory table
 "${POLICY_HOME}"/mysql/bin/create-guard-table.sh