aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ONAP-PDP/logging.properties2
-rw-r--r--ONAP-PDP/src/test/resources/logging.properties4
-rw-r--r--ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java2
-rw-r--r--ONAP-XACML/src/test/resources/logging.properties4
4 files changed, 7 insertions, 5 deletions
diff --git a/ONAP-PDP/logging.properties b/ONAP-PDP/logging.properties
index e88d3726f..2b9a51d43 100644
--- 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 699369639..b1879e7e1 100644
--- 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/java/org/onap/policy/xacml/test/util/AAFEngineTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java
index 684f48c17..f60645fef 100644
--- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/util/AAFEngineTest.java
@@ -30,12 +30,14 @@ import com.att.research.xacml.api.pip.PIPRequest;
import com.att.research.xacml.api.pip.PIPResponse;
import com.att.research.xacml.std.pip.StdPIPFinderFactory;
import com.att.research.xacml.std.pip.StdPIPRequest;
+import com.att.research.xacml.util.XACMLProperties;
import com.att.research.xacml.api.XACML3;
public class AAFEngineTest {
@Test
public void aafEngineTest(){
String testId = "testId";
+ System.setProperty(XACMLProperties.XACML_PROPERTIES_NAME, "xacml.properties");
AAFEngine aafEngine = new AAFEngine();
assertTrue(AAFEngine.DEFAULT_DESCRIPTION.equals("PIP for authenticating aaf attributes using the AAF REST interface"));
assertTrue(AAFEngine.DEFAULT_ISSUER.equals("aaf"));
diff --git a/ONAP-XACML/src/test/resources/logging.properties b/ONAP-XACML/src/test/resources/logging.properties
index ff9840ff7..6818148c9 100644
--- 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