Rename packages to org.onap in 1.4.0-SNAPSHOT

19 - remove openecomp
72 - remediate Sonar scan issues
79 - removed unwanted left menu under Report
90 - apply approved license text

Issue: PORTAL-19, PORTAL-72, PORTAL-79, PORTAL-90
Change-Id: I41a0ef5fba623d2242574bd15f2d9fb8029a496c
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

12 files changed, 1835 insertions, 0 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/AuditLog.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/AuditLog.java
new file mode 100644
index 00000000..93075937
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/AuditLog.java
@@ -0,0 +1,50 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AuditLog {
+    String value() default "";
+}
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
new file mode 100644
index 00000000..269d4b9c
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
@@ -0,0 +1,252 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.aspect;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.onap.portalsdk.core.logging.format.AuditLogFormatter;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.service.AppService;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.att.eelf.configuration.Configuration;
+
+@org.springframework.context.annotation.Configuration
+public class EELFLoggerAdvice {
+
+	private static final EELFLoggerDelegate adviceLogger = EELFLoggerDelegate.getLogger(EELFLoggerAdvice.class);
+
+	@Autowired
+	private AppService appService;
+
+	// DateTime Format according to the ECOMP Application Logging Guidelines.
+	private static final SimpleDateFormat ecompLogDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+
+	/**
+	 * Gets the current date and time in expected ECOMP log format.
+	 * 
+	 * @return Current date and time
+	 */
+	public static String getCurrentDateTimeUTC() {
+		String currentDateTime = ecompLogDateFormat.format(new Date());
+		return currentDateTime;
+	}
+
+	/**
+	 * 
+	 * @param securityEventType
+	 * @param args
+	 * @param passOnArgs
+	 * @return One-element array containing an empty String object.
+	 */
+	public Object[] before(SecurityEventTypeEnum securityEventType, Object[] args, Object[] passOnArgs) {
+		try {
+			String className = "";
+			if (passOnArgs[0] != null) {
+				className = passOnArgs[0].toString();
+			}
+
+			String methodName = "";
+			if (passOnArgs[1] != null) {
+				methodName = passOnArgs[1].toString();
+			}
+
+			String appName = appService.getDefaultAppName();
+			if (appName == null || appName == "") {
+				appName = SystemProperties.SDK_NAME;
+			}
+
+			EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+
+			// Initialize Request defaults only for controller methods.
+			MDC.put(className + methodName + SystemProperties.METRICSLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
+			MDC.put(SystemProperties.TARGET_ENTITY, appName + "_BE");
+			MDC.put(SystemProperties.TARGET_SERVICE_NAME, methodName);
+			if (securityEventType != null) {
+				MDC.put(className + methodName + SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
+				HttpServletRequest req = null;
+				if (args[0] != null && args[0] instanceof HttpServletRequest) {
+					req = (HttpServletRequest) args[0];
+					logger.setRequestBasedDefaultsIntoGlobalLoggingContext(req, appName);
+				}
+			}
+			logger.debug(EELFLoggerDelegate.debugLogger, (methodName + " was invoked."));
+		} catch (Exception e) {
+			adviceLogger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in EELFLoggerAdvice.before() method. Details: " + e.getMessage());
+		}
+
+		return new Object[] { "" };
+	}
+
+	/**
+	 * 
+	 * @param securityEventType
+	 * @param result
+	 * @param args
+	 * @param returnArgs
+	 * @param passOnArgs
+	 */
+	public void after(SecurityEventTypeEnum securityEventType, String result, Object[] args, Object[] returnArgs,
+			Object[] passOnArgs) {
+		try {
+			String className = "";
+			if (passOnArgs[0] != null) {
+				className = passOnArgs[0].toString();
+			}
+
+			String methodName = "";
+			if (passOnArgs[1] != null) {
+				methodName = passOnArgs[1].toString();
+			}
+
+			EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+
+			String appName = appService.getDefaultAppName();
+			if (appName == null || appName == "") {
+				appName = SystemProperties.SDK_NAME;
+			}
+
+			if (MDC.get(SystemProperties.TARGET_SERVICE_NAME) == null
+					|| MDC.get(SystemProperties.TARGET_SERVICE_NAME) == "") {
+				MDC.put(SystemProperties.TARGET_SERVICE_NAME, methodName);
+			}
+
+			if (MDC.get(SystemProperties.TARGET_ENTITY) == null || MDC.get(SystemProperties.TARGET_ENTITY) == "") {
+				MDC.put(SystemProperties.TARGET_ENTITY, appName + "_BE");
+			}
+
+			MDC.put(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP,
+					MDC.get(className + methodName + SystemProperties.METRICSLOG_BEGIN_TIMESTAMP));
+			MDC.put(SystemProperties.METRICSLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+			this.calculateDateTimeDifference(MDC.get(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP),
+					MDC.get(SystemProperties.METRICSLOG_END_TIMESTAMP));
+
+			logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is completed.");
+			logger.debug(EELFLoggerDelegate.debugLogger, "Finished executing " + methodName + ".");
+
+			if (securityEventType != null) {
+
+				MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
+						MDC.get(className + methodName + SystemProperties.AUDITLOG_BEGIN_TIMESTAMP));
+				MDC.put(SystemProperties.AUDITLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+				this.calculateDateTimeDifference(MDC.get(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+						MDC.get(SystemProperties.AUDITLOG_END_TIMESTAMP));
+
+				this.logSecurityMessage(logger, securityEventType, result, methodName);
+
+				// clear when finishes audit logging
+				MDC.remove(Configuration.MDC_KEY_REQUEST_ID);
+				MDC.remove(SystemProperties.PARTNER_NAME);
+				MDC.remove(SystemProperties.MDC_LOGIN_ID);
+				MDC.remove(SystemProperties.PROTOCOL);
+				MDC.remove(SystemProperties.FULL_URL);
+				MDC.remove(Configuration.MDC_SERVICE_NAME);
+				MDC.remove(SystemProperties.RESPONSE_CODE);
+				MDC.remove(SystemProperties.STATUS_CODE);
+				MDC.remove(className + methodName + SystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(SystemProperties.AUDITLOG_END_TIMESTAMP);
+			}
+
+			MDC.remove(className + methodName + SystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
+			MDC.remove(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
+			MDC.remove(SystemProperties.METRICSLOG_END_TIMESTAMP);
+			MDC.remove(SystemProperties.MDC_TIMER);
+			MDC.remove(SystemProperties.TARGET_ENTITY);
+			MDC.remove(SystemProperties.TARGET_SERVICE_NAME);
+		} catch (Exception e) {
+			adviceLogger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in EELFLoggerAdvice.after() method. Details: " + e.getMessage());
+		}
+	}
+
+	/**
+	 * 
+	 * @param logger
+	 * @param securityEventType
+	 * @param result
+	 * @param restMethod
+	 */
+	private void logSecurityMessage(EELFLoggerDelegate logger, SecurityEventTypeEnum securityEventType, String result,
+			String restMethod) {
+		StringBuilder additionalInfoAppender = new StringBuilder();
+		String auditMessage = "";
+
+		additionalInfoAppender.append(String.format("%s request was received.", restMethod));
+
+		// Status code
+		MDC.put(SystemProperties.STATUS_CODE, result);
+
+		String fullURL = MDC.get(SystemProperties.FULL_URL);
+		if (fullURL != null && fullURL != "") {
+			additionalInfoAppender.append(" Request-URL:" + MDC.get(SystemProperties.FULL_URL));
+		}
+
+		auditMessage = AuditLogFormatter.getInstance().createMessage(MDC.get(SystemProperties.PROTOCOL),
+				securityEventType.name(), MDC.get(SystemProperties.MDC_LOGIN_ID), additionalInfoAppender.toString());
+
+		logger.info(EELFLoggerDelegate.auditLogger, auditMessage);
+	}
+
+	/**
+	 * 
+	 * @param beginDateTime
+	 * @param endDateTime
+	 */
+	private void calculateDateTimeDifference(String beginDateTime, String endDateTime) {
+		if (beginDateTime != null && endDateTime != null) {
+			try {
+				Date beginDate = ecompLogDateFormat.parse(beginDateTime);
+				Date endDate = ecompLogDateFormat.parse(endDateTime);
+				String timeDifference = String.format("%d ms", endDate.getTime() - beginDate.getTime());
+				MDC.put(SystemProperties.MDC_TIMER, timeDifference);
+			} catch (Exception e) {
+				adviceLogger.error(EELFLoggerDelegate.errorLogger,
+						"Exception occurred in EELFLoggerAdvice.calculateDateTimeDifference() method. Details: "
+								+ e.getMessage());
+			}
+		}
+	}
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java
new file mode 100644
index 00000000..8c958924
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java
@@ -0,0 +1,106 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.aspect;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+@Aspect
+@org.springframework.context.annotation.Configuration
+public class EELFLoggerAspect {
+	
+	@Autowired
+	EELFLoggerAdvice advice;
+			
+	/*
+	 * Point-cut expression to handle all INCOMING_REST_MESSAGES
+	 */
+	@Pointcut("execution(public * org.onap.portalsdk.core.controller.*.*(..))")
+	public void incomingAuditMessages() {}
+	
+	@Around("incomingAuditMessages() && @annotation(auditLog)")
+	public Object logAuditMethodAround(ProceedingJoinPoint joinPoint, AuditLog auditLog) throws Throwable {
+		return this.logAroundMethod(joinPoint, SecurityEventTypeEnum.INCOMING_REST_MESSAGE);
+	}
+
+	@Around("incomingAuditMessages() && @within(auditLog)")
+	public Object logAuditMethodClassAround(ProceedingJoinPoint joinPoint, AuditLog auditLog) throws Throwable {
+		return this.logAroundMethod(joinPoint, SecurityEventTypeEnum.INCOMING_REST_MESSAGE);
+	}
+	
+	/*
+	 * Point cut expression to capture metrics logging
+	 */
+	@Pointcut("execution(public * *(..))")
+    public void publicMethod() {}
+	
+	@Around("publicMethod() && @within(metricsLog)")
+	public Object logMetricsClassAround(ProceedingJoinPoint joinPoint, MetricsLog metricsLog) throws Throwable {
+		return this.logAroundMethod(joinPoint, null);
+	}
+	
+	@Around("publicMethod() && @annotation(metricsLog)")
+	public Object logMetricsMethodAround(ProceedingJoinPoint joinPoint, MetricsLog metricsLog) throws Throwable {
+		return this.logAroundMethod(joinPoint, null);
+	}
+	
+	private Object logAroundMethod(ProceedingJoinPoint joinPoint, SecurityEventTypeEnum securityEventType) throws Throwable {
+		//Before
+		Object[] passOnArgs = new Object[] {joinPoint.getSignature().getDeclaringType().getName(),joinPoint.getSignature().getName()};
+		Object[] returnArgs = advice.before(securityEventType, joinPoint.getArgs(), passOnArgs);
+		
+		//Execute the actual method
+		Object result = null;
+		String restStatus = "COMPLETE";
+		try {
+			result = joinPoint.proceed();
+		} catch(Exception e) {
+			restStatus = "ERROR";
+		}
+		
+		//After
+		advice.after(securityEventType, restStatus, joinPoint.getArgs(), returnArgs, passOnArgs);
+		
+		return result;
+	}
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/MetricsLog.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/MetricsLog.java
new file mode 100644
index 00000000..7d552774
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/MetricsLog.java
@@ -0,0 +1,50 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MetricsLog {
+    String value() default "";
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AlarmSeverityEnum.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AlarmSeverityEnum.java
new file mode 100644
index 00000000..f2481e34
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AlarmSeverityEnum.java
@@ -0,0 +1,46 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+public enum AlarmSeverityEnum {
+	CRITICAL, 
+	MAJOR, 
+	MINOR, 
+	INFORMATIONAL, 
+	NONE,
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AppMessagesEnum.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AppMessagesEnum.java
new file mode 100644
index 00000000..84790f6b
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AppMessagesEnum.java
@@ -0,0 +1,267 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+public enum AppMessagesEnum {
+	/*
+	100-199 Security/Permission Related 
+										- Authentication problems (from external client, to external server)
+										- Certification errors
+										- 
+											
+	200-299 Availability/Timeout Related
+										- connectivity error
+										- connection timeout
+										
+	300-399 Data Access/Integrity Related
+										- Data in graph in invalid(E.g. no creator is found for service) 
+										- Artifact is missing in ES, but exists in graph.
+										 
+	400-499 Schema Interface Type/Validation
+										- received Pay-load checksum is invalid
+										- received JSON is not valid
+							  
+	500-599 Business/Flow Processing Related  
+										-  check out to service is not allowed
+										-  Roll-back is done
+										-  failed to generate heat file
+										  
+
+	600-899 Reserved - do not use
+
+	900-999 Unknown Errors 
+										- Unexpected exception
+										*/
+	
+	BeUebAuthenticationError(ErrorCodesEnum.BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR100E", "An Authentication failure occurred during access to UEB server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+	
+	BeRestApiAuthenticationError(ErrorCodesEnum.BERESTAPIAUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR101E", "Rejected an incoming REST API request due to invalid credentials", "", "Please check application credentials defined in Database or properties files."),
+	
+	InternalAuthenticationInfo(ErrorCodesEnum.INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR199I", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationWarning(ErrorCodesEnum.INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+								"ERR199W", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationError(ErrorCodesEnum.INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR199E", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationFatal(ErrorCodesEnum.INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+								"ERR199F", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	BeHealthCheckError(ErrorCodesEnum.BeHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR200E", "ECOMP-PORTAL Back-end probably lost connectivity to either one of the following components: MySQL DB, UEB Cluster", "", "Please check the logs for more information."),
+
+	BeHealthCheckMySqlError(ErrorCodesEnum.BEHEALTHCHECKMYSQLERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR201E", "ECOMP-PORTAL Back-end probably lost connectivity to MySQL DB", "", "Check connectivity to MYSQL is configured correctly under system.properties file."),
+
+	BeHealthCheckUebClusterError(ErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR203E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "", "Check connectivity to UEB cluster which is configured under portal.properties file."),
+	
+	FeHealthCheckError(ErrorCodesEnum.FEHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR204E", "Unable to connect to a valid ECOMP-PORTAL Back-end Server.", "", "Please check connectivity from this FE instance towards BE or BE Load Balancer."),
+	
+	BeHealthCheckRecovery(ErrorCodesEnum.BEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR205I", "ECOMP-PORTAL Back-end Recovery to either one of the following components: MySQL DB, UEB Cluster", "", "Please check logs for more specific information about the problem."),
+	
+	BeHealthCheckMySqlRecovery(ErrorCodesEnum.BEHEALTHCHECKMYSQLRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR206I", "ECOMP-PORTAL Back-end connection recovery to MySQL DB", "", "Please check logs for more specific information about the problem."),
+	
+	BeHealthCheckUebClusterRecovery(ErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR208I", "ECOMP-PORTAL Back-end connection recovery to UEB Cluster", "", "Please check logs for more specific information about the problem."),
+	
+	FeHealthCheckRecovery(ErrorCodesEnum.FEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR209I", "Connectivity to ECOMP-PORTAL Front-end Server is recovered", "", "Please check logs for more specific information about the problem."),
+    
+	BeUebConnectionError(ErrorCodesEnum.BEUEBCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR210E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+    
+    BeUebUnkownHostError(ErrorCodesEnum.BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR211E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Cannot reach host: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+	
+    BeUebRegisterOnboardingAppError(ErrorCodesEnum.BEUEBREGISTERONBOARDINGAPPERROR, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR212E", "Failed to register the On-boarding application with UEB Communication server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+    
+    BeHttpConnectionError(ErrorCodesEnum.BEHTTPCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR213E", "It could be that communication to an external application might resulted an exception or failed to reach the external application", 
+								"Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionInfo(ErrorCodesEnum.INTERNALCONNECTIONINFO_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR299I", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+	InternalConnectionWarning(ErrorCodesEnum.INTERNALCONNECTIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+								"ERR299W", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionError(ErrorCodesEnum.INTERNALCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR299E", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionFatal(ErrorCodesEnum.INTERNALCONNECTIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+    							"ERR299F", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    BeUebObjectNotFoundError(ErrorCodesEnum.BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR303E", "Error occurred during access to U-EB Server.", "Data not found: {0}.", "An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic."),
+    
+    BeUserMissingError(ErrorCodesEnum.BEUSERMISSINGERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR310E", "User is not found", "", "User {0} must be added to the corresponding application with proper user roles."),
+    
+    BeUserInactiveWarning(ErrorCodesEnum.BEUSERINACTIVEWARNING_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR313W", "User is found but in-active", "", "User {0} must be added to the corresponding application with proper user roles."),
+    
+    BeUserAdminPrivilegesInfo(ErrorCodesEnum.BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR314W", "User is found but don't have administrative privileges", "", "User {0} should be given administrator role for the corresponding application to perform the necessary actions."),
+    
+    BeInvalidJsonInput(ErrorCodesEnum.BEINVALIDJSONINPUT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR405E", "Failed to convert JSON input to object", "", "Please check logs for more information."),
+    
+    BeIncorrectHttpStatusError(ErrorCodesEnum.BEINCORRECTHTTPSTATUSERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR407E", "Communication to an external application is resulted in with Incorrect Http response code", "", "Please check logs for more information."),
+    
+    BeInitializationError(ErrorCodesEnum.BEINITIALIZATIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR500E", "ECOMP-PORTAL Back-end was not initialized properly", "", "Please check logs for more information."),
+    
+    BeUebSystemError(ErrorCodesEnum.BEUEBSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR502E", "Error occurred during access to U-EB Server", "Details: {0}.", "An error occurred in {1} distribution mechanism. Please check the logs for more information."),
+    
+    BeDaoSystemError(ErrorCodesEnum.BEDAOSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR505E", "Performing DDL or DML operations on database might have failed", "", "Please check MySQL DB health or look at the logs for more details."),
+    
+    BeSystemError(ErrorCodesEnum.BESYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR506E", "Unexpected error during operation", "", "Please check logs for more information."),
+    
+    BeExecuteRollbackError(ErrorCodesEnum.BEEXECUTEROLLBACKERROR, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR507E", "Roll-back operation towards database has failed", "", "Please check MYSQL DB health or look at the logs for more details."),
+    
+    FeHttpLoggingError(ErrorCodesEnum.FEHTTPLOGGINGERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.ERROR,
+    							"ERR517E", "Error when logging FE HTTP request/response", "", "Please check MYSQL DB health or look at the logs for more details."),
+    
+	FePortalServletError(ErrorCodesEnum.FEPORTALSERVLETERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR518E", "Error when trying to access FE Portal page.", "", "Please check logs for more information."),
+	
+    BeDaoCloseSessionError(ErrorCodesEnum.BEDAOCLOSESESSIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR519E", "Close local session operation with database failed", "", "Please check MYSQL DB health or look at the logs form more details."),
+    
+    BeRestApiGeneralError(ErrorCodesEnum.BERESTAPIGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR900E", "Unexpected error during ECOMP-PORTAL Back-end REST API execution", "", "Please check error log for more information."),
+    
+    FeHealthCheckGeneralError(ErrorCodesEnum.FEHEALTHCHECKGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR901E", "General error during FE Health Check", "", "Please check error log for more information."),
+    
+    InternalUnexpectedInfo(ErrorCodesEnum.INTERNALUNEXPECTEDINFO_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+    							"ERR999I", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedWarning(ErrorCodesEnum.INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR999W", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedError(ErrorCodesEnum.INTERNALUNEXPECTEDERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR999E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedFatal(ErrorCodesEnum.INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+    							"ERR999F", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+	
+	;
+	
+	ErrorTypeEnum eType;
+	AlarmSeverityEnum alarmSeverity;
+	ErrorCodesEnum messageCode;
+	ErrorSeverityEnum errorSeverity;
+	String errorCode;
+	String errorDescription;
+	String details;
+	String resolution;
+	
+	AppMessagesEnum(ErrorCodesEnum messageCode, ErrorTypeEnum eType, AlarmSeverityEnum alarmSeverity, ErrorSeverityEnum errorSeverity, String errorCode, String errorDescription, 
+						String details, String resolution) {
+		this.messageCode = messageCode;
+		this.eType = eType;
+		this.alarmSeverity = alarmSeverity;
+		this.errorSeverity = errorSeverity;
+		this.errorCode = errorCode;
+		this.errorDescription = errorDescription;
+		this.details = details;
+		this.resolution = resolution;
+	}
+	
+	public String getDetails() {
+		return this.details;
+	}
+	
+	public String getResolution() {
+		return this.resolution;
+	}
+	public String getErrorCode() {
+		return this.errorCode;
+	}
+	
+	public String getErrorDescription() {
+		return this.errorDescription;
+	}
+	
+	public ErrorSeverityEnum getErrorSeverity() {
+		return this.errorSeverity;
+	}
+	
+	public void setErrorSeverity(ErrorSeverityEnum errorSeverity) {
+		this.errorSeverity = errorSeverity;
+	}
+	
+	public ErrorCodesEnum getMessageCode() {
+		return messageCode;
+	}
+
+	public void setMessageCode(ErrorCodesEnum messageCode) {
+		this.messageCode = messageCode;
+	}
+	
+	public AlarmSeverityEnum getAlarmSeverity() {
+		return alarmSeverity;
+	}
+
+	public void setAlarmSeverity(AlarmSeverityEnum alarmSeverity) {
+		this.alarmSeverity = alarmSeverity;
+	}
+	
+	public ErrorTypeEnum getErrorType() {
+		return eType;
+	}
+
+	public void setErrorType(ErrorTypeEnum eType) {
+		this.eType = eType;
+	}
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ApplicationCodes.properties b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ApplicationCodes.properties
new file mode 100644
index 00000000..220c4a0d
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ApplicationCodes.properties
@@ -0,0 +1,239 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal SDK
+# ===================================================================
+# Copyright © 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============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+###
+########################################################################
+#Resource key=Error Code|Message text|Resolution text |Description text
+#######
+#Newlines can be utilized to add some clarity ensuring continuing line
+#has atleast one leading space
+#ResourceKey=\
+#             ERR0000E\
+#             Sample error msg txt\
+#             Sample resolution msg\
+#             Sample description txt
+#
+######
+#Error code classification category
+#100	Permission errors
+#200	Availability errors/Timeouts
+#300	Data errors
+#400	Schema Interface type/validation errors
+#500	Business process errors
+#900	Unknown errors
+#
+########################################################################
+
+#Health check
+BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT=\
+										ERR100E|\
+										Authentication problem towards U-EB server. Reason: {0}.|\
+										An Authentication failure occurred during access to UEB server. Please check that UEB keys are configured correctly under fusion.properties file.|
+
+BERESTAPIAUTHENTICATIONERROR =\
+										ERR101E|\
+										Rejected an incoming REST API request to {0} from {1} due to invalid credentials.|\
+										Please check application credentials defined in Database or portal.properties file.|
+										
+INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT=\
+										ERR199I|\
+										Internal authentication problem. Description: {0}.|
+										
+INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT=\
+										ERR199W|\
+										Internal authentication problem. Description: {0}.|
+
+INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT=\
+										ERR199E|\
+										Internal authentication problem. Description: {0}.|
+
+INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT=\
+										ERR199F|\
+										Internal authentication problem. Description: {0}.|
+
+BEHEALTHCHECKERROR=\
+										ERR200E|\
+										{0} probably lost connectivity to either one of the following components: MySQL DB, UEB Cluster. Please check the logs for more information.|
+
+BEHEALTHCHECKMYSQLERROR=\
+										ERR201E|\
+										{0} probably lost connectivity to MySQL DB. Please check the logs for more information.|\
+										Check connectivity to MYSQL is configured correctly under system.properties file.|
+
+BEHEALTHCHECKUEBCLUSTERERROR=\
+										ERR203E|\
+										{0} probably lost connectivity to UEB Cluster. Please check the logs for more information.|\
+										Check connectivity to UEB cluster which is configured under portal.properties file.|
+
+BEHEALTHCHECKRECOVERY=\
+										ERR205I|\
+										{0} Recovery to either one of the following components: MySQL DB, UEB Cluster.|
+
+BEHEALTHCHECKMYSQLRECOVERY=\
+										ERR206I|\
+										{0} connection recovery to MySQL DB.|
+
+BEHEALTHCHECKUEBCLUSTERRECOVERY=\
+										ERR208I|\
+										{0} connection recovery to UEB Cluster.|
+
+FEHEALTHCHECKRECOVERY=\
+										ERR209I|\
+										Connectivity to {0} Server is recovered.|
+
+#UEB communication
+BEUEBCONNECTIONERROR_ONE_ARGUMENT=\
+										ERR210E|\
+										Connection problem towards U-EB server. Reason: {0}.|\
+										Please check that that parameter uebServers in portal.properties points to a valid UEB Cluster.|
+										
+BEUEBSYSTEMERROR=\
+										ERR502E|\
+										Error occurred during access to U-EB Server. Operation: {0}.|\
+										An error occurred in {1} distribution mechanism. Please check the logs for more information.|
+
+BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT=\
+										ERR211E|\
+										Connection problem towards U-EB server. Cannot reach host {0}.|\
+										Please check that that parameter uebServers in portal.properties points to a valid UEB Cluster.|
+
+#Onboarding apps
+BEUEBREGISTERONBOARDINGAPPERROR=\
+										ERR212E|\
+										Unable to register the On-boarding application with the U-EB server. Reason: {0}.|\
+										Please check that that parameter uebServers in system.properties points to a valid UEB Cluster.|
+
+#HTTP communication
+BEHTTPCONNECTIONERROR_ONE_ARGUMENT=\
+										ERR213E|\
+										HTTP connection to an external application is failed. Reason: {0}.|\
+										Please check the logs for more information.|
+
+INTERNALCONNECTIONINFO_ONE_ARGUMENT=\
+										ERR299I|\
+										Internal Connection problem. Description: {0}.|
+
+INTERNALCONNECTIONWARNING_ONE_ARGUMENT=\
+										ERR299W|\
+										Internal Connection problem. Description: {0}.|
+
+INTERNALCONNECTIONERROR_ONE_ARGUMENT=\
+										ERR299E|\
+										Internal Connection problem. Description: {0}.|
+
+INTERNALCONNECTIONFATAL_ONE_ARGUMENT=\
+										ERR299F|\
+										Internal Connection problem. Description: {0}.|
+
+BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT=\
+										ERR303E|\
+										Error occurred during access to U-EB Server. Data not found: {0}.|\
+										An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic.|
+
+#Login error codes
+BEUSERMISSINGERROR_ONE_ARGUMENT=\
+										ERR310E|\
+										User {0} requested is not found.|
+										
+BEUSERINACTIVEWARNING_ONE_ARGUMENT=\
+										ERR313W|\
+										User {0} is found but inactive.|
+										
+BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT=\
+										ERR314W|\
+										User {0} is found but don't have administrative privileges.|
+										
+BEINVALIDJSONINPUT=\
+										ERR405E|\
+										Failed to convert JSON input to object.|\
+										Please check error logs for more information.|
+
+BEINCORRECTHTTPSTATUSERROR=\
+										ERR407E|\
+										Incorrect HttpResponse Received.|\
+										Please check error & metrics logs for more information.|
+
+BEINITIALIZATIONERROR=\
+										ERR500E|\
+										BE was not initialized properly.|
+
+BEDAOSYSTEMERROR=\
+										ERR505E|\
+										Operation towards database failed.|\
+										Please check MySQL DB health or look at the logs for more details.|
+
+BESYSTEMERROR=\
+										ERR506E|\
+										Unexpected error during operation.|
+
+BEEXECUTEROLLBACKERROR=\
+										ERR507E|\
+										Roll-back operation towards database failed.|\
+										Please check MYSQL DB health or look at the logs for more details.|
+
+FEHTTPLOGGINGERROR=\
+										ERR517E|\
+										Error when logging FE HTTP request/response.|
+										
+BEDAOCLOSESESSIONERROR=\
+										ERR519E|\
+										Close local session operation with database failed.|\
+										Please check MYSQL DB health or look at the logs form more details.|
+
+BERESTAPIGENERALERROR=\
+										ERR900E|\
+										Unexpected error during BE REST API execution.|\
+										Please check error log for more information.|
+
+FEHEALTHCHECKGENERALERROR=\
+										ERR901E|\
+										General error during FE Health Check.|
+
+INTERNALUNEXPECTEDINFO_ONE_ARGUMENT=\
+										ERR999I|\
+										Unexpected error. Description: {0}.|
+
+INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT=\
+										ERR999W|\
+										Unexpected error. Description: {0}.|
+
+INTERNALUNEXPECTEDERROR_ONE_ARGUMENT=\
+										ERR999E|\
+										Unexpected error. Description: {0}.|
+
+INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT=\
+										ERR999F|\
+										Unexpected error. Description: {0}.|
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AuditLogFormatter.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AuditLogFormatter.java
new file mode 100644
index 00000000..4ea932a3
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/AuditLogFormatter.java
@@ -0,0 +1,124 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+import java.text.MessageFormat;
+import java.util.Map;
+
+import org.onap.portalsdk.core.util.SystemProperties;
+
+public class AuditLogFormatter {
+	//Singleton
+	private static AuditLogFormatter instance = new AuditLogFormatter();
+	
+	public static AuditLogFormatter getInstance() {
+		
+		return instance;
+	}
+	
+	public String createMessage(String protocol,String set, 
+			String loginId, String message) {
+	
+	Object[] securityMessageArgs = prepareFormatArgs(
+			protocol,
+			set,
+			loginId,
+			message );
+	
+		return MessageFormat.format(SystemProperties.SECURITY_LOG_TEMPLATE, securityMessageArgs);
+	}
+	
+	/**
+	 * A method for normalizing the security log field - returns 
+	 * the @Param defaultValue in case the entry is null or empty.
+	 * If the @param entry is not empty, a single quotation is added to it.
+	 * 
+	 * @param entry the entry
+	 * @param defaultValue The default value in case the entry is empty
+	 * @return String (formatted)
+	 */
+	private String formatEntry(Object entry, String defaultValue) {
+		return  (entry!=null && !entry.toString().isEmpty()) ? addSingleQuotes(entry.toString()): defaultValue;		
+
+	}
+	
+	private String addSingleQuotes(String s) {
+		if (null!=s && !s.isEmpty()) {
+			s =  SystemProperties.SINGLE_QUOTE+s+SystemProperties.SINGLE_QUOTE;
+		}
+		return s;
+	}
+	
+	
+	/**
+	 * This method prepares an Object array of arguments that would be passed
+	 * to the MessageFormat.format() method, to format the security log.
+	 * 
+	 * @param protocol
+	 * @param set
+	 * @param loginId
+	 * @param accessingClient
+	 * @param isSuccess
+	 * @param message
+	 * @return
+	 */
+	private Object[] prepareFormatArgs(String protocol,String set, 
+			String loginId, String message) {
+		
+		Object[] messageFormatArgs = {
+				formatEntry(protocol, SystemProperties.NA),
+				formatEntry(set, SystemProperties.NA),
+				formatEntry(loginId, SystemProperties.UNKNOWN),
+				message
+				};
+		return messageFormatArgs;
+	}
+
+
+	public String createMessage(Map<String, String> logArgsMap) {
+				
+		Object[] securityMessageArgs = prepareFormatArgs(
+				logArgsMap.get(SystemProperties.PROTOCOL),
+				logArgsMap.get(SystemProperties.SECURIRY_EVENT_TYPE),
+				logArgsMap.get(SystemProperties.LOGIN_ID),
+				logArgsMap.get(SystemProperties.ADDITIONAL_INFO) 
+			);
+		
+		return MessageFormat.format(SystemProperties.SECURITY_LOG_TEMPLATE, securityMessageArgs);
+	}
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorCodesEnum.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorCodesEnum.java
new file mode 100644
index 00000000..6dc7e99d
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorCodesEnum.java
@@ -0,0 +1,107 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+import com.att.eelf.i18n.EELFResolvableErrorEnum;
+//import com.att.eelf.i18n.EELFResourceManager;
+
+public enum ErrorCodesEnum implements EELFResolvableErrorEnum {
+	BERESTAPIAUTHENTICATIONERROR,
+	BEHTTPCONNECTIONERROR_ONE_ARGUMENT,
+	BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT,
+	
+	INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT,
+	
+	BEHEALTHCHECKRECOVERY,
+	BEHEALTHCHECKMYSQLRECOVERY,
+	BEHEALTHCHECKUEBCLUSTERRECOVERY,
+	FEHEALTHCHECKRECOVERY,
+	BeHEALTHCHECKERROR,
+	
+	BEHEALTHCHECKMYSQLERROR,
+	BEHEALTHCHECKUEBCLUSTERERROR,
+	FEHEALTHCHECKERROR,
+	BEUEBCONNECTIONERROR_ONE_ARGUMENT,
+	BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT,
+	BEUEBREGISTERONBOARDINGAPPERROR,
+	
+	INTERNALCONNECTIONINFO_ONE_ARGUMENT,
+	INTERNALCONNECTIONWARNING_ONE_ARGUMENT,
+	INTERNALCONNECTIONERROR_ONE_ARGUMENT,
+	INTERNALCONNECTIONFATAL_ONE_ARGUMENT,
+	
+	BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT,
+	BEUSERMISSINGERROR_ONE_ARGUMENT,
+	
+	BEUSERINACTIVEWARNING_ONE_ARGUMENT,
+	BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT,
+	
+	BEINVALIDJSONINPUT,
+	BEINCORRECTHTTPSTATUSERROR,
+		
+	BEINITIALIZATIONERROR,
+	BEUEBSYSTEMERROR,
+	BEDAOSYSTEMERROR,
+	BESYSTEMERROR,
+	BEEXECUTEROLLBACKERROR,
+	
+	FEHTTPLOGGINGERROR,
+	FEPORTALSERVLETERROR,
+	BEDAOCLOSESESSIONERROR,
+	
+	BERESTAPIGENERALERROR,
+	FEHEALTHCHECKGENERALERROR,
+	
+	INTERNALUNEXPECTEDINFO_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDERROR_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT,
+	
+	;
+	
+	/**
+     * Static initializer to ensure the resource bundles for this class are loaded...
+     * Here this application loads messages from three bundles
+     */
+    //static {
+    //    EELFResourceManager.loadMessageBundle("com/att/fusion/core/logging/format/ApplicationCodes");
+    //}
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorSeverityEnum.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorSeverityEnum.java
new file mode 100644
index 00000000..468a2b9a
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorSeverityEnum.java
@@ -0,0 +1,45 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+public enum ErrorSeverityEnum {
+	INFO, 
+	WARN, 
+	ERROR, 
+	FATAL,
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorTypeEnum.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorTypeEnum.java
new file mode 100644
index 00000000..77477ca1
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/format/ErrorTypeEnum.java
@@ -0,0 +1,47 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.format;
+
+public enum ErrorTypeEnum {
+	RECOVERY, 
+	CONFIG_ERROR, 
+	SYSTEM_ERROR, 
+	DATA_ERROR, 
+	CONNECTION_PROBLEM, 
+	AUTHENTICATION_PROBLEM
+}
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java
new file mode 100644
index 00000000..2eef3793
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java
@@ -0,0 +1,502 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.portalsdk.core.logging.logic;
+
+import static com.att.eelf.configuration.Configuration.MDC_ALERT_SEVERITY;
+import static com.att.eelf.configuration.Configuration.MDC_INSTANCE_UUID;
+import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
+import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
+import static com.att.eelf.configuration.Configuration.MDC_SERVER_IP_ADDRESS;
+import static com.att.eelf.configuration.Configuration.MDC_SERVICE_INSTANCE_ID;
+import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME;
+
+import java.net.InetAddress;
+import java.text.MessageFormat;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.logging.aspect.EELFLoggerAdvice;
+import org.onap.portalsdk.core.logging.format.AlarmSeverityEnum;
+import org.onap.portalsdk.core.logging.format.AppMessagesEnum;
+import org.onap.portalsdk.core.logging.format.ErrorSeverityEnum;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.portalsdk.core.web.support.UserUtils;
+import org.slf4j.MDC;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import com.att.eelf.configuration.SLF4jWrapper;
+
+public class EELFLoggerDelegate extends SLF4jWrapper implements EELFLogger {
+
+	public static EELFLogger errorLogger = EELFManager.getInstance().getErrorLogger();
+	public static EELFLogger applicationLogger = EELFManager.getInstance().getApplicationLogger();
+	public static EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
+	public static EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
+	public static EELFLogger debugLogger = EELFManager.getInstance().getDebugLogger();
+	private String className;
+	private static ConcurrentMap<String, EELFLoggerDelegate> classMap = new ConcurrentHashMap<String, EELFLoggerDelegate>();
+
+	public EELFLoggerDelegate(String _className) {
+		super(_className);
+		className = _className;
+	}
+
+	/**
+	 * Convenience method that gets a logger for the specified class.
+	 * 
+	 * @see #getLogger(String)
+	 * 
+	 * @param clazz
+	 * @return Instance of EELFLoggerDelegate
+	 */
+	public static EELFLoggerDelegate getLogger(Class<?> clazz) {
+		return getLogger(clazz.getName());
+	}
+
+	/**
+	 * Gets a logger for the specified class name. If the logger does not
+	 * already exist in the map, this creates a new logger.
+	 * 
+	 * @param className
+	 *            If null or empty, uses EELFLoggerDelegate as the class name.
+	 * @return Instance of EELFLoggerDelegate
+	 */
+	public static EELFLoggerDelegate getLogger(String className) {
+		if (className == null || className == "")
+			className = EELFLoggerDelegate.class.getName();
+		EELFLoggerDelegate delegate = classMap.get(className);
+		if (delegate == null) {
+			delegate = new EELFLoggerDelegate(className);
+			classMap.put(className, delegate);
+		}
+		return delegate;
+	}
+
+	/**
+	 * Logs a message at the lowest level: trace.
+	 * 
+	 * @param logger
+	 * @param msg
+	 */
+	public void trace(EELFLogger logger, String msg) {
+		if (logger.isTraceEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.trace(msg);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message with parameters at the lowest level: trace.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param arguments
+	 */
+	public void trace(EELFLogger logger, String msg, Object... arguments) {
+		if (logger.isTraceEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.trace(msg, arguments);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message and throwable at the lowest level: trace.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param th
+	 */
+	public void trace(EELFLogger logger, String msg, Throwable th) {
+		if (logger.isTraceEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.trace(msg, th);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message at the second-lowest level: debug.
+	 * 
+	 * @param logger
+	 * @param msg
+	 */
+	public void debug(EELFLogger logger, String msg) {
+		if (logger.isDebugEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.debug(msg);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message with parameters at the second-lowest level: debug.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param arguments
+	 */
+	public void debug(EELFLogger logger, String msg, Object... arguments) {
+		if (logger.isDebugEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.debug(msg, arguments);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message and throwable at the second-lowest level: debug.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param th
+	 */
+	public void debug(EELFLogger logger, String msg, Throwable th) {
+		if (logger.isDebugEnabled()) {
+			MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+			logger.debug(msg, th);
+			MDC.remove(SystemProperties.MDC_CLASS_NAME);
+		}
+	}
+
+	/**
+	 * Logs a message at info level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 */
+	public void info(EELFLogger logger, String msg) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.info(msg);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message with parameters at info level.
+	 *
+	 * @param logger
+	 * @param msg
+	 * @param arguments
+	 */
+	public void info(EELFLogger logger, String msg, Object... arguments) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.info(msg, arguments);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message and throwable at info level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param th
+	 */
+	public void info(EELFLogger logger, String msg, Throwable th) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.info(msg, th);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message at warn level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 */
+	public void warn(EELFLogger logger, String msg) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.warn(msg);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message with parameters at warn level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param arguments
+	 */
+	public void warn(EELFLogger logger, String msg, Object... arguments) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.warn(msg, arguments);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message and throwable at warn level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param th
+	 */
+	public void warn(EELFLogger logger, String msg, Throwable th) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.warn(msg, th);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message at error level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 */
+	public void error(EELFLogger logger, String msg) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.error(msg);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message with parameters at error level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param arguments
+	 */
+	public void error(EELFLogger logger, String msg, Object... arguments) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.warn(msg, arguments);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message and throwable at error level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param th
+	 */
+	public void error(EELFLogger logger, String msg, Throwable th) {
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.warn(msg, th);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Logs a message with the associated alarm severity at error level.
+	 * 
+	 * @param logger
+	 * @param msg
+	 * @param severtiy
+	 */
+	public void error(EELFLogger logger, String msg, AlarmSeverityEnum severtiy) {
+		MDC.put(MDC_ALERT_SEVERITY, severtiy.name());
+		MDC.put(SystemProperties.MDC_CLASS_NAME, className);
+		logger.error(msg);
+		MDC.remove(MDC_ALERT_SEVERITY);
+		MDC.remove(SystemProperties.MDC_CLASS_NAME);
+	}
+
+	/**
+	 * Initializes the logger context.
+	 */
+	public void init() {
+		setGlobalLoggingContext();
+		final String msg = "############################ Logging is started. ############################";
+		// These loggers emit the current date-time without being told.
+		info(applicationLogger, msg);
+		error(errorLogger, msg);
+		debug(debugLogger, msg);
+		// Audit and metrics logger must be told start AND stop times
+		final String currentDateTime = EELFLoggerAdvice.getCurrentDateTimeUTC();
+		// Set the MDC with audit properties
+		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, currentDateTime);
+		MDC.put(SystemProperties.AUDITLOG_END_TIMESTAMP, currentDateTime);
+		info(auditLogger, msg);
+		MDC.remove(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+		MDC.remove(SystemProperties.AUDITLOG_END_TIMESTAMP);
+		// Set the MDC with metrics properties
+		MDC.put(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP, currentDateTime);
+		MDC.put(SystemProperties.METRICSLOG_END_TIMESTAMP, currentDateTime);
+		info(metricsLogger, msg);
+		MDC.remove(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
+		MDC.remove(SystemProperties.METRICSLOG_END_TIMESTAMP);
+	}
+
+	/**
+	 * Logs a standard message identified by the specified enum, using the
+	 * specified parameters, at error level. Alarm and error severity are taken
+	 * from the specified enum argument.
+	 * 
+	 * @param epMessageEnum
+	 * @param param
+	 */
+	public void logEcompError(AppMessagesEnum epMessageEnum, String... param) {
+		try {
+			AlarmSeverityEnum alarmSeverityEnum = epMessageEnum.getAlarmSeverity();
+			ErrorSeverityEnum errorSeverityEnum = epMessageEnum.getErrorSeverity();
+
+			MDC.put(MDC_ALERT_SEVERITY, alarmSeverityEnum.name());
+			MDC.put("ErrorCode", epMessageEnum.getErrorCode());
+			MDC.put("ErrorDescription", epMessageEnum.getErrorDescription());
+
+			String resolution = this.formatMessage(epMessageEnum.getDetails() + " " + epMessageEnum.getResolution(),
+					(Object[]) param);
+			if (errorSeverityEnum == ErrorSeverityEnum.WARN) {
+				errorLogger.warn(resolution);
+			} else if (errorSeverityEnum == ErrorSeverityEnum.INFO) {
+				errorLogger.info(resolution);
+			} else {
+				errorLogger.error(resolution);
+			}
+		} catch (Exception e) {
+			errorLogger.error("Failed to log the error code. Details: " + UserUtils.getStackTrace(e));
+		} finally {
+			MDC.remove("ErrorCode");
+			MDC.remove("ErrorDescription");
+			MDC.remove(MDC_ALERT_SEVERITY);
+		}
+	}
+
+	/**
+	 * Builds a message using a template string and the arguments.
+	 * 
+	 * @param message
+	 * @param args
+	 * @return
+	 */
+	private String formatMessage(String message, Object... args) {
+		StringBuilder sbFormattedMessage = new StringBuilder();
+		if (args != null && args.length > 0 && message != null && message != "") {
+			MessageFormat mf = new MessageFormat(message);
+			sbFormattedMessage.append(mf.format(args));
+		} else {
+			sbFormattedMessage.append(message);
+		}
+
+		return sbFormattedMessage.toString();
+	}
+
+	/**
+	 * Loads all the default logging fields into the MDC context.
+	 */
+	private void setGlobalLoggingContext() {
+		MDC.put(MDC_SERVICE_INSTANCE_ID, "");
+		MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.toString());
+		try {
+			MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
+			MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());
+			MDC.put(MDC_INSTANCE_UUID, SystemProperties.getProperty(SystemProperties.INSTANCE_UUID));
+		} catch (Exception e) {
+		}
+	}
+
+	public static void mdcPut(String key, String value) {
+		MDC.put(key, value);
+	}
+
+	public static String mdcGet(String key) {
+		return MDC.get(key);
+	}
+
+	public static void mdcRemove(String key) {
+		MDC.remove(key);
+	}
+
+	/**
+	 * Loads the RequestId/TransactionId into the MDC which it should be
+	 * receiving with an each incoming REST API request. Also, configures few
+	 * other request based logging fields into the MDC context.
+	 * 
+	 * @param req
+	 * @param appName
+	 */
+	public void setRequestBasedDefaultsIntoGlobalLoggingContext(HttpServletRequest req, String appName) {
+		// Load the default fields
+		setGlobalLoggingContext();
+
+		// Load the request based fields
+		if (req != null) {
+			// Load the Request into MDC context.
+			String requestId = UserUtils.getRequestId(req);
+			MDC.put(MDC_KEY_REQUEST_ID, requestId);
+
+			// Load user agent into MDC context, if available.
+			String accessingClient = "Unknown";
+			accessingClient = req.getHeader(SystemProperties.USERAGENT_NAME);
+			if (accessingClient != null && accessingClient != "" && (accessingClient.contains("Mozilla")
+					|| accessingClient.contains("Chrome") || accessingClient.contains("Safari"))) {
+				accessingClient = appName + "_FE";
+			}
+			MDC.put(SystemProperties.PARTNER_NAME, accessingClient);
+
+			// Protocol, Rest URL & Rest Path
+			String restURL = "";
+			MDC.put(SystemProperties.FULL_URL, SystemProperties.UNKNOWN);
+			MDC.put(SystemProperties.PROTOCOL, SystemProperties.HTTP);
+			restURL = UserUtils.getFullURL(req);
+			if (restURL != null && restURL != "") {
+				MDC.put(SystemProperties.FULL_URL, restURL);
+				if (restURL.toLowerCase().contains("https")) {
+					MDC.put(SystemProperties.PROTOCOL, SystemProperties.HTTPS);
+				}
+			}
+
+			// Rest Path
+			MDC.put(MDC_SERVICE_NAME, req.getServletPath());
+
+			// Client IPAddress i.e. IPAddress of the remote host who is making
+			// this request.
+			String clientIPAddress = "";
+			clientIPAddress = req.getHeader("X-FORWARDED-FOR");
+			if (clientIPAddress == null) {
+				clientIPAddress = req.getRemoteAddr();
+			}
+			MDC.put(SystemProperties.CLIENT_IP_ADDRESS, clientIPAddress);
+
+			// Load loginId into MDC context.
+			MDC.put(SystemProperties.MDC_LOGIN_ID, "Unknown");
+			
+			String loginId = "";
+				User user = UserUtils.getUserSession(req);
+				if (user != null) {
+					loginId = user.getLoginId();
+				}
+
+			if (loginId != null && loginId != "") {
+				MDC.put(SystemProperties.MDC_LOGIN_ID, loginId);
+			}
+		}
+	}
+}