Merge "Fix console warning about xacml.properties"

diff --git a/ONAP-PDP/logging.properties b/ONAP-PDP/logging.properties
index e88d372..2b9a51d 100644 (file)
--- a/ONAP-PDP/logging.properties
+++ b/ONAP-PDP/logging.properties
@@ -24,6 +24,6 @@ handlers = java.util.logging.ConsoleHandler, java.util.logging.FileHandler
 
 java.util.logging.ConsoleHandler.level = INFO
 java.util.logging.FileHandler.level = INFO
-java.util.logging.FileHandler.pattern=${{POLICY_LOGS}}/policy/pdpx/%h/xacml_log%u.log
+java.util.logging.FileHandler.pattern=${{POLICY_LOGS}}/policy/pdpx/xacml_log%u.log
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter

diff --git a/ONAP-PDP/src/test/resources/logging.properties b/ONAP-PDP/src/test/resources/logging.properties
index 6993696..b1879e7 100644 (file)
--- a/ONAP-PDP/src/test/resources/logging.properties
+++ b/ONAP-PDP/src/test/resources/logging.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP-PDP
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 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.
@@ -28,5 +28,5 @@ java.util.logging.ConsoleHandler.level = FINEST
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 java.util.logging.FileHandler.level = SEVERE
-java.util.logging.FileHandler.pattern=%h/xacml_log%u.log
+java.util.logging.FileHandler.pattern=logs/xacml_log%u.log
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter

diff --git a/ONAP-XACML/src/test/resources/logging.properties b/ONAP-XACML/src/test/resources/logging.properties
index ff9840f..6818148 100644 (file)
--- a/ONAP-XACML/src/test/resources/logging.properties
+++ b/ONAP-XACML/src/test/resources/logging.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # ONAP-XACML
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 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.
@@ -28,5 +28,5 @@ java.util.logging.ConsoleHandler.level = FINEST
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
 java.util.logging.FileHandler.level = SEVERE
-java.util.logging.FileHandler.pattern=%h/xacml_log%u.log
+java.util.logging.FileHandler.pattern=logs/xacml_log%u.log
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter