Merge "Unit/SONAR/Checkstyle in ONAP-REST"

[policy/engine.git] / ONAP-PAP-REST / xacml.pap.properties

diff --git a/ONAP-PAP-REST/xacml.pap.properties b/ONAP-PAP-REST/xacml.pap.properties
index b0fa954..b066142 100644 (file)
--- a/ONAP-PAP-REST/xacml.pap.properties
+++ b/ONAP-PAP-REST/xacml.pap.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP-PAP-REST
 # ================================================================================
-# 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.
@@ -29,8 +29,7 @@ dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandl
 savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler
 pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler
 deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler
-#AutoPush Policy 
-xacml.rest.pap.autopush.file=autopush.properties
+
 #=====================================================================================#
 #===============The Below Properties will be changed based on Environment=============#
 #=====================================================================================#
@@ -89,8 +88,8 @@ xacml.rest.pdp.idfile=test.properties
 
 #Properties for db access
 #properties for MySql xacml database:  PLEASE DO NOT REMOVE... NEEDED FOR APIs
-javax.persistence.jdbc.driver=com.mysql.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mysql://localhost:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true
+javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
+javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30
 javax.persistence.jdbc.user=policy_user
 javax.persistence.jdbc.password=policy_user
 
@@ -109,9 +108,6 @@ xacml.rest.pap.notify.timeoutms=10000
 #the number of times an incoming policy update notification will be tried to be processed (or until it succeeds)
 xacml.rest.pap.incomingnotification.tries=4
 
-#AutoPush Policy Flag
-xacml.rest.pap.autopush.flag=false
-
 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java***
 
 #The name of the PAP.  Must be unique across the system
@@ -156,10 +152,14 @@ ENVIRONMENT=DEVL
 #
 #Turn safetyChecker on/off
 xacml.rest.pap.safetychecker=on
-PDP_URL1 = http://localhost:8082/pdp/, testpdp, alpha456
+PDP_URL1 = http://localhost:8082/pdp/, testpdp, alpha123
 CLIENT_ID=
 CLIENT_KEY=
 
 #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
+
+
+# AES key for password encryption in config files
+#org.onap.policy.encryption.aes.key=12345678901234567890123456789012