Consolidate PolicyRestAdapter setup

[policy/engine.git] / POLICY-SDK-APP / src / test / resources / xacml.admin.properties

diff --git a/POLICY-SDK-APP/src/test/resources/xacml.admin.properties b/POLICY-SDK-APP/src/test/resources/xacml.admin.properties
index 0f285b6..1147ce6 100644 (file)
--- a/POLICY-SDK-APP/src/test/resources/xacml.admin.properties
+++ b/POLICY-SDK-APP/src/test/resources/xacml.admin.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP Policy Engine
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -81,14 +81,14 @@ xacml.testEnvironment.loginId =
 
 #Log DB properties 
 xacml.log.db.driver=org.mariadb.jdbc.Driver
-xacml.log.db.url=jdbc:mariadb://localhost:3306/log?failOverReadOnly=false&autoReconnect=true
+xacml.log.db.url=jdbc:mariadb://localhost:3306/log?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30
 xacml.log.db.user=policy_user
 xacml.log.db.password=policy_user
 
 xacml.att.log.timeframe=150
 
-javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk
+javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
+javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/onap_sdk
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
@@ -111,9 +111,9 @@ xacml.max.priority.count=10
 #
 # You can test authorization within the Admin Console by changing the user id.
 # There are 3 supported user ids:
-#      guest - Read only access
-#      editor - Read/Write access
-#      admin - Read/Write/Admin access
+#    guest - Read only access
+#    editor - Read/Write access
+#    admin - Read/Write/Admin access
 #
 # An empty or null value for xacml.rest.admin.user.id results in no access to the application at all.
 #
@@ -200,4 +200,4 @@ policyAdapter.impl.className = org.onap.policy.admin.PolicyAdapter
 
 #Micro Service Model Properties
 xacml.policy.msOnapName=http://org.onap
-xacml.policy.msPolicyName=http://org.onap.policy
\ No newline at end of file
+xacml.policy.msPolicyName=http://org.onap.policy