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

[policy/engine.git] / ONAP-SDK-APP / xacml.admin.properties

diff --git a/ONAP-SDK-APP/xacml.admin.properties b/ONAP-SDK-APP/xacml.admin.properties
index 5628d8d..0a7f388 100644 (file)
--- a/ONAP-SDK-APP/xacml.admin.properties
+++ b/ONAP-SDK-APP/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,7 +81,7 @@ 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
 
@@ -152,6 +152,7 @@ xacml.rest.closedLoopPM=OpenSource.version.1
 xacml.rest.microServices=OpenSource.version.1
 xacml.rest.gocPolicy=OpenSource.version.1
 xacml.rest.firewallPolicy=OpenSource.version.1
+xacml.rest.optimization=OpenSource.version.1
 
 #***Properties for IntegrityMonitor integration defined in XACMLRestProperties.java***
 
@@ -203,4 +204,7 @@ xacml.policy.msOnapName=http://org.onap
 xacml.policy.msPolicyName=http://org.onap.policy
 
 #Size limit (in bytes) for file uploads
-file.size.limit=30000000
\ No newline at end of file
+file.size.limit=30000000
+
+# AES key for password encryption in config files
+#org.onap.policy.encryption.aes.key=12345678901234567890123456789012
\ No newline at end of file