From 30ec390479c9b7eeeaa90f036be02162c29ae918 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Tue, 14 Sep 2021 12:32:24 +0200
Subject: [COMMON] Add and run pre-commit linters via tox

- create a .pre-commit-config.yaml configuration file with
  * gitlint
  * trailing blanks linter
  * tabs removal linter
    - exclude .git folder from it
    - exclude Makefiles since tabs are mandatory by default in them
- create a tox pre-commit profile to run it from tox
  note gitlint is not runnable at this pre-commit stage
- create pre-commit-install and pre-commit-uninstall tox profiles to
  (un)install hooks locally and (un)perform tests at each "git commit"
  call (i.e. without calling manually the pre-commit tox profile)
- precise pre-commit stages/types in the pre-commit configuration file
  so that hooks are installed correctly. This avoids messages about
  skipped tests when they are run at a wrong stage.

Issue-ID: OOM-2643
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie95bb4f6f90be80b05a1398973caffeff7936881
---
 .../properties/ONAPPORTAL/fusion.properties        |   2 +-
 .../deliveries/properties/ONAPPORTAL/logback.xml   | 516 ++++++++++-----------
 .../properties/ONAPPORTAL/system.properties        |  26 +-
 .../components/portal-app/resources/server/web.xml | 234 +++++-----
 .../docker-entrypoint-initdb.d/portal_single.cql   |   4 +-
 .../properties/ONAPPORTALSDK/portal.properties     |   2 +-
 .../properties/ONAPPORTALSDK/system.properties     |   8 +-
 7 files changed, 396 insertions(+), 396 deletions(-)

(limited to 'kubernetes/portal')

diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties
index 3dbf434322..7020a40bb4 100755
--- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties
+++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/fusion.properties
@@ -44,7 +44,7 @@ account_admin_role_id = 999
 restricted_app_role_id = 900
 
 # Home Page index html
-home_page          					= /index.html
+home_page                            = /index.html
 
 authentication_mechanism =DBAUTH
 
diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
index e707e259ca..325da8e9e3 100644
--- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
+++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/logback.xml
@@ -4,7 +4,7 @@
   ONAP Portal
   ===================================================================
   Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright © 2018 Amdocs, Bell Canada 
+  Modifications Copyright © 2018 Amdocs, Bell Canada
   ====================================================================
   Unless otherwise specified, all software contained herein is licensed
   under the Apache License, Version 2.0 (the “License”);
@@ -37,264 +37,264 @@
 <!DOCTYPE xml>
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
 
-	<!-- specify the component name -->
-	<property name="componentName" value="onapportal"></property>
+    <!-- specify the component name -->
+    <property name="componentName" value="onapportal"></property>
 
-	<!--  specify the application name -->
+    <!--  specify the application name -->
     <property name="application_name" value="Portal"></property>
-	<!-- specify the base path of the log directory -->
-	<property name="logDirPrefix" value="/var/log/onap"></property>
-
-	<!-- The directories where logs are written -->
-	<property name="logDirectory" value="${logDirPrefix}/${componentName}" />
-	<!-- Can easily relocate debug logs by modifying this path. -->
-	<property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />
-
-	<!-- log file names -->
-	<property name="generalLogName" value="application" />
-	<property name="errorLogName" value="error" />
-	<property name="metricsLogName" value="metrics" />
-	<property name="auditLogName" value="audit" />
-	<property name="debugLogName" value="debug" />
-	<!-- These loggers are not used in code (yet). <property name="securityLogName"
-		value="security" /> <property name="policyLogName" value="policy" /> <property
-		name="performanceLogName" value="performance" /> <property name="serverLogName"
-		value="server" /> -->
-
-	<!-- ServerFQDN=Server,  -->
-	<property name="auditLoggerPattern"
-		value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
-	<property name="metricsLoggerPattern"
-		value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
-	<property name="errorLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
-
-	<property name="defaultLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
-
-	<!-- use %class so library logging calls yield their class name -->
-  	<property name="applicationLoggerPattern"
-		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
-
-	<!--
-	<property name="defaultPattern"
-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-	<property name="debugLoggerPattern"
-		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-	 -->
-	<!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"
-		/> -->
-	<!-- Example evaluator filter applied against console appender -->
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${applicationLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<!-- ============================================================================ -->
-	<!-- EELF Appenders -->
-	<!-- ============================================================================ -->
-
-	<!-- The EELFAppender is used to record events to the general application
-		log -->
-
-
-	<appender name="EELF"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${generalLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily rollover -->
-			<fileNamePattern>${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${applicationLoggerPattern}</pattern>
-		</encoder>
-		<filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" />
-	</appender>
-
-	<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<!-- Class name is part of caller data -->
-    	<includeCallerData>true</includeCallerData>
-		<appender-ref ref="EELF" />
-	</appender>
-
-	<!-- EELF Security Appender. This appender is used to record security events
-		to the security log file. Security events are separate from other loggers
-		in EELF so that security log records can be captured and managed in a secure
-		way separate from the other logs. This appender is set to never discard any
-		events. -->
-	<!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-		<fileNamePattern>${logDirectory}/${securityLogName}.%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>${defaultPattern}</pattern> </encoder>
-		</appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref
-		ref="EELFSecurity" /> </appender> -->
-
-	<!-- EELF Performance Appender. This appender is used to record performance
-		records. -->
-	<!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-		<fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>
-		<pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"
-		class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>
-		<appender-ref ref="EELFPerformance" /> </appender> -->
-
-	<!-- EELF Server Appender. This appender is used to record Server related
-		logging events. The Server logger and appender are specializations of the
-		EELF application root logger and appender. This can be used to segregate
-		Server events from other components, or it can be eliminated to record these
-		events as part of the application root log. -->
-	<!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-		<fileNamePattern>${logDirectory}/${serverLogName}.%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>${defaultPattern}</pattern> </encoder>
-		</appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
-
-	<!-- EELF Policy Appender. This appender is used to record Policy engine
-		related logging events. The Policy logger and appender are specializations
-		of the EELF application root logger and appender. This can be used to segregate
-		Policy engine events from other components, or it can be eliminated to record
-		these events as part of the application root log. -->
-	<!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-		<fileNamePattern>${logDirectory}/${policyLogName}.%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>${defaultPattern}</pattern> </encoder>
-		</appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
-
-	<!-- EELF Audit Appender. This appender is used to record audit engine related
-		logging events. The audit logger and appender are specializations of the
-		EELF application root logger and appender. This can be used to segregate
-		Policy engine events from other components, or it can be eliminated to record
-		these events as part of the application root log. -->
-
-	<appender name="EELFAudit"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${auditLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${auditLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-	<appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFAudit" />
-	</appender>
-
-	<appender name="EELFMetrics"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${metricsLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${metricsLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-
-	<appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFMetrics" />
-	</appender>
-
-	<appender name="EELFError"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${logDirectory}/${errorLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${errorLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFError" />
-	</appender>
-
-	<appender name="EELFDebug"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${debugLogDirectory}/${debugLogName}.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- daily roll over -->
-			<fileNamePattern>${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip
-			</fileNamePattern>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>${defaultLoggerPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-		<queueSize>256</queueSize>
-		<appender-ref ref="EELFDebug" />
-		<includeCallerData>true</includeCallerData>
-	</appender>
-
-
-	<!-- ============================================================================ -->
-	<!-- EELF loggers -->
-	<!-- ============================================================================ -->
-	<logger name="com.att.eelf" level="info" additivity="false">
-		<appender-ref ref="asyncEELF" />
-	</logger>
-
-	<!-- <logger name="com.att.eelf.security" level="info" additivity="false">
-		<appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"
-		level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"
-		/> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">
-		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"
-		level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
-
-	<logger name="EELFAudit" level="info" additivity="false">
-		<appender-ref ref="asyncEELFAudit" />
-	</logger>
-
-	<logger name="EELFMetrics" level="info" additivity="false">
-		<appender-ref ref="asyncEELFMetrics" />
-	</logger>
-
-	<logger name="EELFError" level="info" additivity="false">
-		<appender-ref ref="asyncEELFError" />
-	</logger>
-
-	<logger name="com.att.eelf.debug" level="debug" additivity="false">
-		<appender-ref ref="asyncEELFDebug" />
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="asyncEELF" />
-		<appender-ref ref="STDOUT" />
-	</root>
+    <!-- specify the base path of the log directory -->
+    <property name="logDirPrefix" value="/var/log/onap"></property>
+
+    <!-- The directories where logs are written -->
+    <property name="logDirectory" value="${logDirPrefix}/${componentName}" />
+    <!-- Can easily relocate debug logs by modifying this path. -->
+    <property name="debugLogDirectory" value="${logDirPrefix}/${componentName}" />
+
+    <!-- log file names -->
+    <property name="generalLogName" value="application" />
+    <property name="errorLogName" value="error" />
+    <property name="metricsLogName" value="metrics" />
+    <property name="auditLogName" value="audit" />
+    <property name="debugLogName" value="debug" />
+    <!-- These loggers are not used in code (yet). <property name="securityLogName"
+        value="security" /> <property name="policyLogName" value="policy" /> <property
+        name="performanceLogName" value="performance" /> <property name="serverLogName"
+        value="server" /> -->
+
+    <!-- ServerFQDN=Server,  -->
+    <property name="auditLoggerPattern"
+        value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
+
+    <property name="metricsLoggerPattern"
+        value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
+
+    <property name="errorLoggerPattern"
+        value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
+
+    <property name="defaultLoggerPattern"
+        value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
+
+    <!-- use %class so library logging calls yield their class name -->
+      <property name="applicationLoggerPattern"
+        value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
+
+    <!--
+    <property name="defaultPattern"
+        value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
+    <property name="debugLoggerPattern"
+        value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
+     -->
+    <!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"
+        /> -->
+    <!-- Example evaluator filter applied against console appender -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${applicationLoggerPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- ============================================================================ -->
+    <!-- EELF Appenders -->
+    <!-- ============================================================================ -->
+
+    <!-- The EELFAppender is used to record events to the general application
+        log -->
+
+
+    <appender name="EELF"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${generalLogName}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>${logDirectory}/${generalLogName}.log.%d{yyyy-MM-dd}.zip
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${applicationLoggerPattern}</pattern>
+        </encoder>
+        <filter class="org.openecomp.portalapp.portal.utils.CustomLoggingFilter" />
+    </appender>
+
+    <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize>
+        <!-- Class name is part of caller data -->
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="EELF" />
+    </appender>
+
+    <!-- EELF Security Appender. This appender is used to record security events
+        to the security log file. Security events are separate from other loggers
+        in EELF so that security log records can be captured and managed in a secure
+        way separate from the other logs. This appender is set to never discard any
+        events. -->
+    <!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+        <fileNamePattern>${logDirectory}/${securityLogName}.%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>${defaultPattern}</pattern> </encoder>
+        </appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref
+        ref="EELFSecurity" /> </appender> -->
+
+    <!-- EELF Performance Appender. This appender is used to record performance
+        records. -->
+    <!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+        <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>
+        <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+        class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+        </triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>
+        <pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"
+        class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>
+        <appender-ref ref="EELFPerformance" /> </appender> -->
+
+    <!-- EELF Server Appender. This appender is used to record Server related
+        logging events. The Server logger and appender are specializations of the
+        EELF application root logger and appender. This can be used to segregate
+        Server events from other components, or it can be eliminated to record these
+        events as part of the application root log. -->
+    <!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+        <fileNamePattern>${logDirectory}/${serverLogName}.%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>${defaultPattern}</pattern> </encoder>
+        </appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
+
+    <!-- EELF Policy Appender. This appender is used to record Policy engine
+        related logging events. The Policy logger and appender are specializations
+        of the EELF application root logger and appender. This can be used to segregate
+        Policy engine events from other components, or it can be eliminated to record
+        these events as part of the application root log. -->
+    <!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+        <fileNamePattern>${logDirectory}/${policyLogName}.%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>${defaultPattern}</pattern> </encoder>
+        </appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
+
+    <!-- EELF Audit Appender. This appender is used to record audit engine related
+        logging events. The audit logger and appender are specializations of the
+        EELF application root logger and appender. This can be used to segregate
+        Policy engine events from other components, or it can be eliminated to record
+        these events as part of the application root log. -->
+
+    <appender name="EELFAudit"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${auditLogName}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily roll over -->
+            <fileNamePattern>${logDirectory}/${auditLogName}.log.%d{yyyy-MM-dd}.zip
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${auditLoggerPattern}</pattern>
+        </encoder>
+    </appender>
+    <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize>
+        <appender-ref ref="EELFAudit" />
+    </appender>
+
+    <appender name="EELFMetrics"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${metricsLogName}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily roll over -->
+            <fileNamePattern>${logDirectory}/${metricsLogName}.log.%d{yyyy-MM-dd}.zip
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${metricsLoggerPattern}</pattern>
+        </encoder>
+    </appender>
+
+
+    <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize>
+        <appender-ref ref="EELFMetrics" />
+    </appender>
+
+    <appender name="EELFError"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${logDirectory}/${errorLogName}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily roll over -->
+            <fileNamePattern>${logDirectory}/${errorLogName}.log.%d{yyyy-MM-dd}.zip
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${errorLoggerPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize>
+        <appender-ref ref="EELFError" />
+    </appender>
+
+    <appender name="EELFDebug"
+        class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${debugLogDirectory}/${debugLogName}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily roll over -->
+            <fileNamePattern>${logDirectory}/${debugLogName}.log.%d{yyyy-MM-dd}.zip
+            </fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${defaultLoggerPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+        <queueSize>256</queueSize>
+        <appender-ref ref="EELFDebug" />
+        <includeCallerData>true</includeCallerData>
+    </appender>
+
+
+    <!-- ============================================================================ -->
+    <!-- EELF loggers -->
+    <!-- ============================================================================ -->
+    <logger name="com.att.eelf" level="info" additivity="false">
+        <appender-ref ref="asyncEELF" />
+    </logger>
+
+    <!-- <logger name="com.att.eelf.security" level="info" additivity="false">
+        <appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"
+        level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"
+        /> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">
+        <appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"
+        level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
+
+    <logger name="EELFAudit" level="info" additivity="false">
+        <appender-ref ref="asyncEELFAudit" />
+    </logger>
+
+    <logger name="EELFMetrics" level="info" additivity="false">
+        <appender-ref ref="asyncEELFMetrics" />
+    </logger>
+
+    <logger name="EELFError" level="info" additivity="false">
+        <appender-ref ref="asyncEELFError" />
+    </logger>
+
+    <logger name="com.att.eelf.debug" level="debug" additivity="false">
+        <appender-ref ref="asyncEELFDebug" />
+    </logger>
+
+    <root level="INFO">
+        <appender-ref ref="asyncEELF" />
+        <appender-ref ref="STDOUT" />
+    </root>
 
 </configuration>
diff --git a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
index d246a6b0b1..34c7f1dee0 100755
--- a/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
+++ b/kubernetes/portal/components/portal-app/resources/config/deliveries/properties/ONAPPORTAL/system.properties
@@ -45,20 +45,20 @@ application_user_id           = 30000
 post_default_role_id          = 1
 
 #Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
+mobile_enable                    = false
 
 cache_config_file_path        = /WEB-INF/conf/cache.ccf
 cache_switch                  = 1
 cache_load_on_startup         = false
 
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
+user_name                     = fullName
+decryption_key                = AGLDdG4D04BKm2IxIWEr8o==
 
 
 #Cron Schedules
 cron_site_name                = one
 log_cron                      = 0 * * * * ? *
-sessiontimeout_feed_cron	  = 0 0/5 * * * ? *
+sessiontimeout_feed_cron      = 0 0/5 * * * ? *
 
 #Front end URL
 frontend_url                  = https://{{.Values.global.portalHostName}}:{{.Values.global.portalFEPort}}/ONAPPORTAL/applicationsHome
@@ -69,22 +69,22 @@ frontend_url                  = https://{{.Values.global.portalHostName}}:{{.Val
 # This value must be generated and updated at the time of
 # the deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
-instance_uuid 				= 90bc9497-10e6-49fe-916b-dcdfaa972383
+instance_uuid                 = 90bc9497-10e6-49fe-916b-dcdfaa972383
 
-elastic_search_url 			= http://
-contact_us_link				= http://
-user_guide_link             = http://
+elastic_search_url            = http://
+contact_us_link               = http://
+user_guide_link               = http://
 
 # Contact Us page properties
-ush_ticket_url				= http://
-feedback_email_address		= portal@lists.onap.org
-portal_info_url				= https://
+ush_ticket_url                = http://
+feedback_email_address        = portal@lists.onap.org
+portal_info_url               = https://
 
 #Online user bar refresh interval, in seconds
-online_user_update_rate                  = 30
+online_user_update_rate       = 30
 
 #Online user bar refresh total duration, in seconds
-online_user_update_duration       = 300
+online_user_update_duration   = 300
 
 #authenticate user server
 authenticate_user_server=http://{{.Values.global.portalHostName}}:8383/openid-connect-server-webapp/allUsers
diff --git a/kubernetes/portal/components/portal-app/resources/server/web.xml b/kubernetes/portal/components/portal-app/resources/server/web.xml
index 8f88e12666..7c4f2a7275 100644
--- a/kubernetes/portal/components/portal-app/resources/server/web.xml
+++ b/kubernetes/portal/components/portal-app/resources/server/web.xml
@@ -5,151 +5,151 @@
   ===================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ===================================================================
- 
+
   Unless otherwise specified, all software contained herein is licensed
   under the Apache License, Version 2.0 (the "License");
   you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
- 
+
               http://www.apache.org/licenses/LICENSE-2.0
- 
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- 
+
   Unless otherwise specified, all documentation contained herein is licensed
   under the Creative Commons License, Attribution 4.0 Intl. (the "License");
   you may not use this documentation except in compliance with the License.
   You may obtain a copy of the License at
- 
+
               https://creativecommons.org/licenses/by/4.0/
- 
+
   Unless required by applicable law or agreed to in writing, documentation
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
- 
+
   ============LICENSE_END============================================
- 
-  
+
+
   -->
 
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-	<display-name>fusion</display-name>
-	
-	<!--  
-	<context-param>
-    	<param-name>log4jConfigLocation</param-name>
-    	<param-value>/WEB-INF/conf/log4j.properties</param-value>
-	</context-param>
-
-	<listener>
-    	<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-	</listener>	
-	 -->
-	 
-	<!-- The Portal app can function on a HA cluster -->
-	<distributable/>
-	
-	<!-- <context-param>
-    	<param-name>contextConfigLocation</param-name>
-   		<param-value>/WEB-INF/oid-context.xml</param-value>
-	</context-param>
-
-	<listener>
-	   <listener-class>
-	        org.springframework.web.context.ContextLoaderListener
-	   </listener-class>
-	</listener>  -->
-
-
-	<listener>
-    	<listener-class>org.onap.portalapp.portal.listener.UserSessionListener</listener-class>
-  	</listener>
-	<!--
-	<filter>
-		<filter-name>springSessionRepositoryFilter</filter-name>
-		<filter-class>org.onap.portalapp.music.filter.MusicSessionRepositoryFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSessionRepositoryFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>ERROR</dispatcher>
-	</filter-mapping>
-	-->
-  	<filter>
-    	<filter-name>CorsFilter</filter-name>
-		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
-		<init-param>
-			<param-name>cors.allowed.origins</param-name>
-			<param-value>http://www.portal.onap.org:9200,http://www.portal.onap.org:9000</param-value>
-		</init-param>
-	    <init-param>
-	    	<param-name>cors.allowed.methods</param-name>
-	        <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
-	    </init-param>
-	    <init-param>
-	        <param-name>cors.allowed.headers</param-name>
-	        <param-value>EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
-	    </init-param> 
-	    <init-param>
-			<param-name>cors.exposed.headers</param-name>
-			<param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
-		</init-param>
-		<init-param>
-			<param-name>cors.support.credentials</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<init-param>
-			<param-name>cors.preflight.maxage</param-name>
-			<param-value>10</param-value>  
-		</init-param>    
-	</filter>
-    
+    <display-name>fusion</display-name>
+
+    <!--
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>/WEB-INF/conf/log4j.properties</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+    </listener>
+     -->
+
+    <!-- The Portal app can function on a HA cluster -->
+    <distributable/>
+
+    <!-- <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>/WEB-INF/oid-context.xml</param-value>
+    </context-param>
+
+    <listener>
+       <listener-class>
+            org.springframework.web.context.ContextLoaderListener
+       </listener-class>
+    </listener>  -->
+
+
+    <listener>
+        <listener-class>org.onap.portalapp.portal.listener.UserSessionListener</listener-class>
+      </listener>
+    <!--
+    <filter>
+        <filter-name>springSessionRepositoryFilter</filter-name>
+        <filter-class>org.onap.portalapp.music.filter.MusicSessionRepositoryFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>springSessionRepositoryFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>ERROR</dispatcher>
+    </filter-mapping>
+    -->
+      <filter>
+        <filter-name>CorsFilter</filter-name>
+        <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+        <init-param>
+            <param-name>cors.allowed.origins</param-name>
+            <param-value>http://www.portal.onap.org:9200,http://www.portal.onap.org:9000</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.allowed.methods</param-name>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.allowed.headers</param-name>
+            <param-value>EPService,JSESSIONID,X-ECOMP-RequestID,X-Widgets-Type,Content-Type,X-Requested-With,accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.exposed.headers</param-name>
+            <param-value>Access-Control-Allow-Origin,Access-Control-Allow-Credentials</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.support.credentials</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.preflight.maxage</param-name>
+            <param-value>10</param-value>
+        </init-param>
+    </filter>
+
     <filter-mapping>
       <filter-name>CorsFilter</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
-    
-   	<filter>
-	    <filter-name>SecurityXssFilter</filter-name>
-	    <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>
-	</filter>
-	
-	<filter-mapping>
-	    <filter-name>SecurityXssFilter</filter-name>
-	    <url-pattern>/*</url-pattern>
-	</filter-mapping>
-<!-- 	<filter> -->
-<!-- 		<filter-name>CadiAuthFilter</filter-name> -->
-<!-- 		<filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class> -->
-<!-- 		<init-param> -->
-<!-- 			<param-name>cadi_prop_files</param-name> -->
+
+       <filter>
+        <filter-name>SecurityXssFilter</filter-name>
+        <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>SecurityXssFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
+<!--     <filter> -->
+<!--         <filter-name>CadiAuthFilter</filter-name> -->
+<!--         <filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class> -->
+<!--         <init-param> -->
+<!--             <param-name>cadi_prop_files</param-name> -->
 <!--         Add Absolute path of cadi.properties -->
-<!-- 			<param-value>{Path}/cadi.properties -->
-<!-- 			</param-value> -->
-<!-- 		</init-param> -->
+<!--             <param-value>{Path}/cadi.properties -->
+<!--             </param-value> -->
+<!--         </init-param> -->
 <!--          Add param values with comma delimited values -->
-<!-- 		<init-param> -->
-<!-- 			<param-name>include_url_endpoints</param-name> -->
-<!-- 			<param-value>/auxapi/*</param-value> -->
-<!-- 		</init-param> -->
-<!-- 		<init-param> -->
-<!-- 			<param-name>exclude_url_endpoints</param-name> -->
-<!-- 			<param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value> -->
-<!-- 		</init-param> -->
-<!-- 	</filter> -->
-<!-- 	<filter-mapping> -->
-<!-- 		<filter-name>CadiAuthFilter</filter-name> -->
-<!-- 		<url-pattern>/auxapi/v3/*</url-pattern> -->
-<!-- 	</filter-mapping> -->
-<!-- 	<filter-mapping> -->
-<!-- 		<filter-name>CadiAuthFilter</filter-name> -->
-<!-- 		<url-pattern>/auxapi/v4/*</url-pattern> -->
-		
-<!-- 	</filter-mapping>   -->
+<!--         <init-param> -->
+<!--             <param-name>include_url_endpoints</param-name> -->
+<!--             <param-value>/auxapi/*</param-value> -->
+<!--         </init-param> -->
+<!--         <init-param> -->
+<!--             <param-name>exclude_url_endpoints</param-name> -->
+<!--             <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value> -->
+<!--         </init-param> -->
+<!--     </filter> -->
+<!--     <filter-mapping> -->
+<!--         <filter-name>CadiAuthFilter</filter-name> -->
+<!--         <url-pattern>/auxapi/v3/*</url-pattern> -->
+<!--     </filter-mapping> -->
+<!--     <filter-mapping> -->
+<!--         <filter-name>CadiAuthFilter</filter-name> -->
+<!--         <url-pattern>/auxapi/v4/*</url-pattern> -->
+
+<!--     </filter-mapping>   -->
 </web-app>
diff --git a/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql
index 7827727ebc..a9771bfa5d 100644
--- a/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql
+++ b/kubernetes/portal/components/portal-cassandra/resources/config/cassandra/docker-entrypoint-initdb.d/portal_single.cql
@@ -19,7 +19,7 @@ CREATE KEYSPACE IF NOT EXISTS admin
         'replication_factor': 1
     }
     AND DURABLE_WRITES = true;
- 
+
 CREATE TABLE IF NOT EXISTS admin.keyspace_master (
     uuid uuid,
     keyspace_name text,
@@ -86,7 +86,7 @@ CREATE TABLE portal.spring_session_attributes (
     AND min_index_interval = 128
     AND read_repair_chance = 0.0
     AND speculative_retry = '99PERCENTILE';
-    
+
 
 
 CREATE KEYSPACE IF NOT EXISTS portalsdk
diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
index 4bb51c1a8a..4d26240be4 100755
--- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
+++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/portal.properties
@@ -59,4 +59,4 @@ ueb_app_mailbox_name = ECOMP-PORTAL-OUTBOX-APP1
 # Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
 ueb_app_consumer_group_name = {UUID}
 
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
+decryption_key              = AGLDdG4D04BKm2IxIWEr8o==
diff --git a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
index aad5044fbf..3873da13a9 100755
--- a/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
+++ b/kubernetes/portal/components/portal-sdk/resources/config/deliveries/properties/ONAPPORTALSDK/system.properties
@@ -26,15 +26,15 @@ post_default_role_id          = 16
 clustered                     = true
 
 #Enable Fusion Mobile capabilities for the application
-mobile_enable			  	  = false
+mobile_enable                 = false
 
 # Cache config file is needed on the classpath
 cache_config_file_path        = /WEB-INF/classes/cache.ccf
 cache_switch                  = 199
 cache_load_on_startup         = false
 
-user_name					  = fullName
-decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
+user_name                     = fullName
+decryption_key                = AGLDdG4D04BKm2IxIWEr8o==
 
 ##########################################################################
 # The following properties MAY require changes by partner applications.
@@ -61,7 +61,7 @@ element_map_icon_path = app/fusionapp/icons/
 #Cron Schedules
 log_cron                      = 0 0/1 * * * ?;
 mylogins_feed_cron            = 0 0/60 * * * ?;
-#sessiontimeout_feed_cron	  = 0 * * * * ? *
+#sessiontimeout_feed_cron      = 0 * * * * ? *
 my_login_feed_output_dir      = /tmp/MyLogins
 
 # Link shown in Help menu
-- 
cgit 1.2.3-korg