From 5cd57949604803a32bd3a19c183eadf11f0ab900 Mon Sep 17 00:00:00 2001
From: "Chou, Joseph (JC2555)" <jc2555@att.com>
Date: Wed, 28 Mar 2018 13:46:11 -0400
Subject: ONAP code change for log files consolidation

Undo the change so this would not block other test activity

Change-Id: I4f7dd2e14f30034eefbf958be3c912af2962e8a2
Issue-ID: POLICY-562
Signed-off-by: Chou, Joseph (JC2555) <jc2555@att.com>
---
 ONAP-PAP-REST/src/main/resources/log4j.properties |  6 +++---
 ONAP-PAP-REST/src/main/resources/logback.xml      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'ONAP-PAP-REST')

diff --git a/ONAP-PAP-REST/src/main/resources/log4j.properties b/ONAP-PAP-REST/src/main/resources/log4j.properties
index 7a1a6bea3..04f3233c1 100644
--- a/ONAP-PAP-REST/src/main/resources/log4j.properties
+++ b/ONAP-PAP-REST/src/main/resources/log4j.properties
@@ -28,7 +28,7 @@ log4j.rootLogger=INFO, FILE
 
 # FILE appender
 log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.FILE.File=${{POLICY_LOGS}}/policy/pap/pap-rest.log
+log4j.appender.FILE.File=${catalina.base}/logs/pap-rest.log
 log4j.appender.FILE.ImmediateFlush=true
 log4j.appender.FILE.Threshold=debug
 log4j.appender.FILE.append=true
@@ -47,7 +47,7 @@ log4j.appender.FILE.layout.ConversionPattern=%d{yyyy-MM-dd'T'HH:mm:ss}{GMT+0}+00
 log4j.logger.xacml.request=INFO, REQUEST_LOG
 
 log4j.appender.REQUEST_LOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.REQUEST_LOG.File=${{POLICY_LOGS}}/policy/pap/pap-rest-reqres.log
+log4j.appender.REQUEST_LOG.File=${catalina.base}/logs/pap-rest-reqres.log
 log4j.appender.REQUEST_LOG.ImmediateFlush=true
 log4j.appender.REQUEST_LOG.Threshold=debug
 log4j.appender.REQUEST_LOG.append=true
@@ -63,7 +63,7 @@ log4j.logger.auditLogger=INFO,AUDIT_LOG
 log4j.additivity.auditLogger=false
 
 log4j.appender.AUDIT_LOG=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.AUDIT_LOG.File=${{POLICY_LOGS}}/policy/pap/audit.log
+log4j.appender.AUDIT_LOG.File=${catalina.base}/logs/audit.log
 log4j.appender.AUDIT_LOG.Append=true
 log4j.appender.AUDIT_LOG.DatePattern='.'yyyy-MM-dd
 log4j.appender.AUDIT_LOG.threshold=INFO
diff --git a/ONAP-PAP-REST/src/main/resources/logback.xml b/ONAP-PAP-REST/src/main/resources/logback.xml
index 51656311e..3595b2432 100644
--- a/ONAP-PAP-REST/src/main/resources/logback.xml
+++ b/ONAP-PAP-REST/src/main/resources/logback.xml
@@ -21,15 +21,15 @@
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
   <!--<jmxConfigurator /> -->
   <!-- directory path for all other type logs -->
-  <property name="logDir" value="${{POLICY_LOGS}}" />
+  <property name="logDir" value="logs" />
   
   <!-- directory path for debugging type logs -->
-  <property name="debugDir" value="${{POLICY_LOGS}}" />
+  <property name="debugDir" value="logs" />
   
   <!--  specify the component name 
     <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
-  <property name="componentName" value="policy"></property>
-  <property name="subComponentName" value="pap"></property>
+  <property name="componentName" value="Policy"></property>
+  <property name="subComponentName" value="ONAP-PAP-REST"></property>
   
   <!--  log file names -->
   <property name="errorLogName" value="error" />
@@ -84,8 +84,8 @@
           <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
 
    -->   
-   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
-   <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
+   <property name="logDirectory" value="${catalina.base}/${logDir}/${componentName}/${subComponentName}" />
+   <property name="debugLogDirectory" value="${catalina.base}/${debugDir}/${componentName}/${subComponentName}" />
    
 
  
-- 
cgit 1.2.3-korg