Fix logback.xml location

The logback.xml location was not working, it was not possible to specify
an external logback.xml file. Now it works from application.properties

Issue-ID: CLAMP-179
Change-Id: I87c9be70561fc0897b5c6499a431f7cd788c1867
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

10 files changed, 294 insertions, 231 deletions

diff --git a/pom.xml b/pom.xml
index b7d8fb240..026eb5cb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,6 +225,11 @@
 						<version>${eelf.core.version}</version>
 				</dependency>
 				<dependency>
+						<groupId>org.codehaus.janino</groupId>
+						<artifactId>janino</artifactId>
+						<version>3.0.8</version>
+				</dependency>
+				<dependency>
 						<groupId>org.apache.tomcat.embed</groupId>
 						<artifactId>tomcat-embed-core</artifactId>
 						<version>${tomcat.version}</version>
diff --git a/src/main/java/org/onap/clamp/clds/Application.java b/src/main/java/org/onap/clamp/clds/Application.java
index 0eb480751..749a2f6fa 100644
--- a/src/main/java/org/onap/clamp/clds/Application.java
+++ b/src/main/java/org/onap/clamp/clds/Application.java
@@ -26,10 +26,13 @@ package org.onap.clamp.clds;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
+import java.io.IOException;
+
 import org.apache.catalina.connector.Connector;
 import org.onap.clamp.clds.model.properties.Holmes;
 import org.onap.clamp.clds.model.properties.ModelProperties;
 import org.onap.clamp.clds.util.ClampVersioning;
+import org.onap.clamp.clds.util.ResourceFileUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -64,7 +67,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 public class Application extends SpringBootServletInitializer {
 
-    protected static final EELFLogger EELF_LOGGER = EELFManager.getInstance().getLogger(Application.class);
+    protected static final EELFLogger eelfLogger = EELFManager.getInstance().getLogger(Application.class);
     // This settings is an additional one to Spring config,
     // only if we want to have an additional port automatically redirected to
     // HTTPS
@@ -85,7 +88,6 @@ public class Application extends SpringBootServletInitializer {
     }
 
     public static void main(String[] args) {
-        EELF_LOGGER.info("Starting ::  CLAMP  ::     (v"+ ClampVersioning.getCldsVersionFromProps()+")");
         // This is to initialize some Onap Clamp components
         initializeComponents();
         // Start the Spring application
@@ -100,9 +102,11 @@ public class Application extends SpringBootServletInitializer {
      * This method is used to declare the camel servlet.
      *
      * @return A servlet bean
+     * @throws IOException
      */
     @Bean
-    public ServletRegistrationBean camelServletRegistrationBean() {
+    public ServletRegistrationBean camelServletRegistrationBean() throws IOException {
+        eelfLogger.info(ResourceFileUtil.getResourceAsString("boot-message.txt")+"(v"+ ClampVersioning.getCldsVersionFromProps()+")"+System.getProperty("line.separator"));
         ServletRegistrationBean registration = new ServletRegistrationBean(new ClampServlet(),
             "/restservices/clds/v1/*");
         registration.setName("CamelServlet");
@@ -130,7 +134,7 @@ public class Application extends SpringBootServletInitializer {
 
     private Connector createRedirectConnector(int redirectSecuredPort) {
         if (redirectSecuredPort <= 0) {
-            EELF_LOGGER.warn(
+            eelfLogger.warn(
                 "HTTP port redirection to HTTPS is disabled because the HTTPS port is 0 (random port) or -1 (Connector disabled)");
             return null;
         }
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index c1a32b7f0..db817a0ea 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -100,6 +100,10 @@ async.core.pool.size=10
 async.max.pool.size=20
 async.queue.capacity=500
 
+#For EELF logback file
+#com.att.eelf.logging.path=
+com.att.eelf.logging.file=logback-default.xml
+#The log folder that will be used in logback.xml file
 clamp.config.log.path=/var/log/onap
 clamp.config.files.systemProperties=classpath:/system.properties
 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8694cd8da..24ecc4f98 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -113,6 +113,10 @@ async.core.pool.size=10
 async.max.pool.size=20
 async.queue.capacity=500
 
+#For EELF logback file
+#com.att.eelf.logging.path=
+com.att.eelf.logging.file=logback-default.xml
+#The log folder that will be used in logback.xml file
 clamp.config.log.path=/var/log/onap
 clamp.config.files.systemProperties=classpath:/system.properties
 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
diff --git a/src/main/resources/boot-message.txt b/src/main/resources/boot-message.txt
new file mode 100644
index 000000000..734af3c67
--- /dev/null
+++ b/src/main/resources/boot-message.txt
@@ -0,0 +1,7 @@
+
+   ___     _       ___   __  __     ___ 
+  / __|   | |     /   \ |  \/  |   | _ \
+ | (__    | |__   | - | | |\/| |   |  _/
+  \___|   |____|  |_|_| |_|__|_|  _|_|_ 
+_|"""""|_|"""""|_|"""""|_|"""""|_| """ |
+"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'
diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml
new file mode 100644
index 000000000..801e4e471
--- /dev/null
+++ b/src/main/resources/logback-default.xml
@@ -0,0 +1,237 @@
+<included>
+	<jmxConfigurator />
+	<!-- Example evaluator filter applied against console appender -->
+	<appender name="STDOUT"
+		class="ch.qos.logback.core.ConsoleAppender">
+		<!-- filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> 
+			<onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter -->
+		<!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="ERROR"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+		<file>${logDirectory}/clamp/error.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX",
+				UTC}|%X{RequestId}|%.20thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/clamp/error.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+
+	<appender name="DEBUG"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/clamp/debug.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX",UTC}|%X{RequestId}|%.20thread|%.-5level|%logger{36}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${logDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>10MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<maxHistory>5</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<appender name="AUDIT"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/clamp/audit.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/clamp/audit.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFAudit"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="AUDIT" />
+	</appender>
+
+	<appender name="METRIC"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/clamp/metric.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|
+				%msg%n</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/clamp/metric.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFMetrics"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="METRIC" />
+	</appender>
+
+	<!-- SECURITY related loggers -->
+	<appender name="SECURITY"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/clamp/security.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<maxIndex>10</maxIndex>
+			<FileNamePattern>${logDirectory}/clamp/security.%i.log.zip
+			</FileNamePattern>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
+	<appender name="asyncEELFSecurity"
+		class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize>
+		<appender-ref ref="SECURITY" />
+	</appender>
+	<!-- AAF related loggers -->
+	<logger name="org.onap.aaf" level="INFO" additivity="true">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<logger name="org.apache.catalina.core" level="INFO"
+		additivity="true">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<!-- CLDS related loggers -->
+	<logger name="org.onap.clamp.clds" level="INFO"
+		additivity="true">
+		<appender-ref ref="ERROR" />
+	</logger>
+
+	<!-- CLDS related loggers -->
+	<logger name="com.att.eelf.error" level="OFF" additivity="true">
+		<appender-ref ref="ERROR" />
+	</logger>
+	<!-- EELF related loggers -->
+	<logger name="com.att.eelf.audit" level="INFO"
+		additivity="false">
+		<appender-ref ref="asyncEELFAudit" />
+	</logger>
+	<logger name="com.att.eelf.metrics" level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFMetrics" />
+	</logger>
+	<logger name="com.att.eelf.security" level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFSecurity" />
+	</logger>
+
+	<!-- Spring related loggers -->
+	<logger name="org.springframework" level="DEBUG" />
+
+	<!-- Other Loggers that may help troubleshoot -->
+	<logger name="org.apache" level="DEBUG" />
+
+	<!-- logback internals logging -->
+	<logger name="ch.qos.logback.classic" level="INFO" />
+	<logger name="ch.qos.logback.core" level="INFO" />
+
+	<!-- logback jms appenders & loggers definition starts here -->
+	<!-- logback jms appenders & loggers definition starts here -->
+	<appender name="auditLogs"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+		</filter>
+		<file>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>9</maxIndex>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+		</encoder>
+	</appender>
+	<appender name="perfLogs"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+		</filter>
+		<file>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>9</maxIndex>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
+		</encoder>
+	</appender>
+	<logger name="AuditRecord" level="INFO" additivity="FALSE">
+		<appender-ref ref="auditLogs" />
+	</logger>
+	<logger name="AuditRecord_DirectCall" level="INFO"
+		additivity="FALSE">
+		<appender-ref ref="auditLogs" />
+	</logger>
+	<logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
+		<appender-ref ref="perfLogs" />
+	</logger>
+	<!-- logback jms appenders & loggers definition ends here -->
+
+	<root level="DEBUG">
+		<appender-ref ref="DEBUG" />
+		<appender-ref ref="STDOUT" />
+	</root>
+</included>
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 1b5542504..dae39d3ac 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,224 +1,22 @@
-<configuration scan="true" scanPeriod="10 seconds" debug="false">
-		<jmxConfigurator />
-		<property resource="application.properties" />
-		<property name="logDirectory" value="${clamp.config.log.path}" />
-		<!-- Example evaluator filter applied against console appender -->
-		<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-				<!-- filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>ERROR</level> 
-						<onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter -->
-				<!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-						<level>INFO</level>
-				</filter>
-				<encoder>
-						<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-						</pattern>
-				</encoder>
-		</appender>
-
-		<appender name="ERROR"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-						<level>INFO</level>
-				</filter>
-				<file>${logDirectory}/clamp/error.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX", UTC}|%X{RequestId}|%.20thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%.-5level|%X{ErrorCode}|%X{ErrorDescription}|%msg%n</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/clamp/error.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-
-		<appender name="DEBUG"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/clamp/debug.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%date{"yyyy-MM-dd'T'HH:mm:ss,SSSXXX",UTC}|%X{RequestId}|%.20thread|%.-5level|%logger{36}|%msg%n</pattern>
-				</encoder>
-				<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-					<fileNamePattern>${logDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-					<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-						<maxFileSize>10MB</maxFileSize>
-					</timeBasedFileNamingAndTriggeringPolicy>
-					<maxHistory>5</maxHistory>
-				</rollingPolicy>
-		</appender>
-
-		<appender name="AUDIT"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/clamp/audit.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
-						</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/clamp/audit.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="AUDIT" />
-		</appender>
-
-		<appender name="METRIC"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/clamp/metric.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVirtualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|
-								%msg%n</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/clamp/metric.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="METRIC" />
-		</appender>
-
-		<!-- SECURITY related loggers -->
-		<appender name="SECURITY"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/clamp/security.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%.20thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|%msg%n
-						</pattern>
-				</encoder>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<maxIndex>10</maxIndex>
-						<FileNamePattern>${logDirectory}/clamp/security.%i.log.zip
-						</FileNamePattern>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
-		<appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
-				<queueSize>256</queueSize>
-				<appender-ref ref="SECURITY" />
-		</appender>
-		<!-- AAF related loggers -->
-		<logger name="org.onap.aaf" level="INFO" additivity="true">
-				<appender-ref ref="DEBUG" />
-		</logger>
-		<logger name="org.apache.catalina.core" level="INFO" additivity="true">
-				<appender-ref ref="DEBUG" />
-		</logger>
-		<!-- CLDS related loggers -->
-		<logger name="org.onap.clamp.clds" level="INFO" additivity="true">
-				<appender-ref ref="ERROR" />
-		</logger>
+<configuration scan="true" scanPeriod="60 seconds"
+	debug="true">
+	<springProperty name="logbackFilePath"
+		source="com.att.eelf.logging.path" />
+	<springProperty name="logbackFileName"
+		source="com.att.eelf.logging.file" />
+	<springProperty name="logDirectory"
+		source="clamp.config.log.path" />
 		
-		<!-- CLDS related loggers -->
-		<logger name="com.att.eelf.error" level="OFF" additivity="true">
-				<appender-ref ref="ERROR" />
-		</logger>
-		<!-- EELF related loggers -->
-		<logger name="com.att.eelf.audit" level="INFO" additivity="false">
-				<appender-ref ref="asyncEELFAudit" />
-		</logger>
-		<logger name="com.att.eelf.metrics" level="DEBUG" additivity="false">
-				<appender-ref ref="asyncEELFMetrics" />
-		</logger>
-		<logger name="com.att.eelf.security" level="DEBUG" additivity="false">
-				<appender-ref ref="asyncEELFSecurity" />
-		</logger>
-
-		<!-- Spring related loggers -->
-		<logger name="org.springframework" level="DEBUG" />
-		
-		<!-- Other Loggers that may help troubleshoot -->
-		<logger name="org.apache" level="DEBUG" />
-
-		<!-- logback internals logging -->
-		<logger name="ch.qos.logback.classic" level="INFO" />
-		<logger name="ch.qos.logback.core" level="INFO" />
-
-		<!-- logback jms appenders & loggers definition starts here -->
-		<!-- logback jms appenders & loggers definition starts here -->
-		<appender name="auditLogs"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-				</filter>
-				<file>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<fileNamePattern>${logDirectory}/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-						</fileNamePattern>
-						<minIndex>1</minIndex>
-						<maxIndex>9</maxIndex>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>5MB</maxFileSize>
-				</triggeringPolicy>
-				<encoder>
-						<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-				</encoder>
-		</appender>
-		<appender name="perfLogs"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-				</filter>
-				<file>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.log</file>
-				<rollingPolicy
-						class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-						<fileNamePattern>${logDirectory}/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip
-						</fileNamePattern>
-						<minIndex>1</minIndex>
-						<maxIndex>9</maxIndex>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>5MB</maxFileSize>
-				</triggeringPolicy>
-				<encoder>
-						<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
-				</encoder>
-		</appender>
-		<logger name="AuditRecord" level="INFO" additivity="FALSE">
-				<appender-ref ref="auditLogs" />
-		</logger>
-		<logger name="AuditRecord_DirectCall" level="INFO" additivity="FALSE">
-				<appender-ref ref="auditLogs" />
-		</logger>
-		<logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
-				<appender-ref ref="perfLogs" />
-		</logger>
-		<!-- logback jms appenders & loggers definition ends here -->
+	<if condition='isNull("logbackFilePath")'>
+		<then>
+			<!-- Classpath case -->
+			<include resource="${logbackFileName}" />
+		</then>
+		<else>
+			<!-- File system case -->
+			<include file="${logbackFilePath}/${logbackFileName}" />
+		</else>
+	</if>
 
-		<root level="DEBUG">
-				<appender-ref ref="DEBUG" />
-				<appender-ref ref="STDOUT" />
-		</root>
 
 </configuration>
\ No newline at end of file
diff --git a/src/main/resources/system.properties b/src/main/resources/system.properties
index 0ecba955c..a24b6202e 100644
--- a/src/main/resources/system.properties
+++ b/src/main/resources/system.properties
@@ -20,12 +20,6 @@
 # ===================================================================
 # 
 ###
-
-com.att.eelf.logging.file=classpath:/logback.xml
-
-# change as per logback.xml path
-com.att.eelf.logging.path=./
-logging.config=classpath:/logback.xml
 #
 # JVM SSL/TLS properties
 jdk.tls.client.protocols=TLSv1.1,TLSv1.2 
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index d9d0f0eed..acf64521b 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -62,7 +62,7 @@ server.port=8080
 

 server.servlet.context-path=/

 #Modified engine-rest applicationpath

-spring.profiles.active=clamp-default,clamp-spring-authentication,clamp-sdc-controller

+spring.profiles.active=clamp-default,clamp-default-user,clamp-sdc-controller

 

 #The max number of active threads in this pool

 server.tomcat.max-threads=200

@@ -108,6 +108,10 @@ async.core.pool.size=10
 async.max.pool.size=20

 async.queue.capacity=500

 

+#For EELF logback file

+#com.att.eelf.logging.path=

+com.att.eelf.logging.file=logback-default.xml

+#The log folder that will be used in logback.xml file

 clamp.config.log.path=log

 clamp.config.files.systemProperties=classpath:/system.properties

 clamp.config.files.cldsUsers=classpath:/clds/clds-users.json

diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
index 853466e1a..e15ea6edc 100644
--- a/src/test/resources/https/https-test.properties
+++ b/src/test/resources/https/https-test.properties
@@ -87,3 +87,9 @@ camel.defaultthreadpool.rejectpolicy=CallerRuns
 camel.springboot.xmlRoutes=classpath:/clds/camel/routes/*.xml
 camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml
 #camel.springboot.typeConversion = false
+
+#For EELF logback file
+#com.att.eelf.logging.path=
+com.att.eelf.logging.file=logback-default.xml
+#The log folder that will be used in logback.xml file
+clamp.config.log.path=log
\ No newline at end of file