UserRolesController methods up

UserRolesController methods up and all needed services

Issue-ID: PORTAL-710
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
Change-Id: Id9dc0b7c52ab50d9e5914195c352026b5bc5971d

20 files changed, 2028 insertions, 492 deletions

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/UserRolesController.java b/portal-BE/src/main/java/org/onap/portal/controller/UserRolesController.java
index 2298e4d3..120b8bc5 100644
--- a/portal-BE/src/main/java/org/onap/portal/controller/UserRolesController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/UserRolesController.java
@@ -66,6 +66,7 @@ import org.onap.portal.logging.aop.EPEELFLoggerAdvice;
 import org.onap.portal.logging.logic.EPLogUtil;
 import org.onap.portal.service.AdminRolesService;
 import org.onap.portal.service.ApplicationsRestClientService;
+import org.onap.portal.service.SearchService;
 import org.onap.portal.service.userRole.FnUserRoleService;
 import org.onap.portal.service.user.FnUserService;
 import org.onap.portal.utils.EPCommonSystemProperties;
@@ -79,6 +80,7 @@ import org.onap.portalsdk.core.util.SystemProperties;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -90,481 +92,488 @@ import org.springframework.web.bind.annotation.RestController;
 @Configuration
 public class UserRolesController {
 
-  private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserRolesController.class);
-
-  private final FnUserService fnUserService;
-  private final FnUserRoleService fnUserRoleService;
-  private final AdminRolesService adminRolesService;
-  private final ApplicationsRestClientService applicationsRestClientService;
-  private final AuditServiceImpl auditService = new AuditServiceImpl();
-
-  private static final String FAILURE = "failure";
-
-  @Autowired
-  public UserRolesController(final FnUserService fnUserService,
-      FnUserRoleService fnUserRoleService,
-      final AdminRolesService adminRolesService,
-      ApplicationsRestClientService applicationsRestClientService) {
-    this.fnUserService = fnUserService;
-    this.fnUserRoleService = fnUserRoleService;
-    this.adminRolesService = adminRolesService;
-    this.applicationsRestClientService = applicationsRestClientService;
-  }
-
-
-  /*
-         @RequestMapping(value = {"/portalApi/queryUsers"}, method = RequestMethod.GET, produces = "application/json")
-         @PreAuthorize("hasRole('System_Administrator') and hasRole('Account_Administrator')")
-         public String getPhoneBookSearchResult(Principal principal, @RequestParam("search") String searchString,
-                 HttpServletResponse response) {
-                FnUser user = fnUserService.loadUserByUsername(principal.getName());
-
-                String searchResult = null;
-                if (!adminRolesService.isSuperAdmin(user) && !adminRolesService.isAccountAdmin(user)
-                        && !adminRolesService.isRoleAdmin(user)) {
-                       EcompPortalUtils.setBadPermissions(user, response, "getPhoneBookSearchResult");
-                } else {
-                       searchString = searchString.trim();
-                       if (searchString.length() > 2) {
-                              searchResult = searchService.searchUsersInPhoneBook(searchString);
-                       } else {
-                              logger.info(EELFLoggerDelegate.errorLogger,
-                                      "getPhoneBookSearchResult - too short search string: " + searchString);
-                       }
-                }
-                EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/queryUsers", "result =", searchResult);
-
-                return searchResult;
-         }
-
-
-         @RequestMapping(value = {"/portalApi/adminAppsRoles"}, method = {
-                 RequestMethod.GET}, produces = "application/json")
-         public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(Principal principal,
-                 @RequestParam("user") String orgUserId, HttpServletResponse response) {
-
-                FnUser user = fnUserService.loadUserByUsername(principal.getName());
-
-                AppsListWithAdminRole result = null;
-                if (!adminRolesService.isSuperAdmin(user)) {
-                       EcompPortalUtils.setBadPermissions(user, response, "getAppsWithAdminRoleStateForUser");
-                } else {
-                       if (EcompPortalUtils.legitimateUserId(orgUserId)) {
-                              result = adminRolesService.getAppsWithAdminRoleStateForUser(orgUserId);
-                       } else {
-                              logger.info(EELFLoggerDelegate.errorLogger,
-                                      "getAppsWithAdminRoleStateForUser - parms error, no Organization User ID");
-                              response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-                       }
-                }
+    private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserRolesController.class);
+
+    private final SearchService searchService;
+    private final FnUserService fnUserService;
+    private final FnUserRoleService fnUserRoleService;
+    private final AdminRolesService adminRolesService;
+    private final ApplicationsRestClientService applicationsRestClientService;
+    private final AuditServiceImpl auditService = new AuditServiceImpl();
+
+    private static final String FAILURE = "failure";
+
+    @Autowired
+    public UserRolesController(SearchService searchService, final FnUserService fnUserService,
+        FnUserRoleService fnUserRoleService,
+        final AdminRolesService adminRolesService,
+        ApplicationsRestClientService applicationsRestClientService) {
+        this.searchService = searchService;
+        this.fnUserService = fnUserService;
+        this.fnUserRoleService = fnUserRoleService;
+        this.adminRolesService = adminRolesService;
+        this.applicationsRestClientService = applicationsRestClientService;
+    }
 
-                StringBuilder adminAppRoles = new StringBuilder();
-                if (result != null) {
-                       if (!result.appsRoles.isEmpty()) {
-                              adminAppRoles.append("User '" + result.orgUserId + "' has admin role to the apps = {");
-                              for (AppNameIdIsAdmin adminAppRole : result.appsRoles) {
-                                     if (adminAppRole.isAdmin) {
-                                            adminAppRoles.append(adminAppRole.appName + ", ");
-                                     }
-                              }
-                              adminAppRoles.append("}.");
-                       } else {
-                              adminAppRoles.append("User '" + result.orgUserId + "' has no Apps with Admin Role.");
-                       }
-                } else {
-                       logger.error(EELFLoggerDelegate.errorLogger,
-                               "putAppWithUserRoleStateForUser: getAppsWithAdminRoleStateForUser result is null");
-                }
 
-                logger.info(EELFLoggerDelegate.errorLogger, adminAppRoles.toString());
-
-                EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "get result =", result);
-
-                return result;
-         }
-*/
-  @RequestMapping(value = {"/portalApi/adminAppsRoles"}, method = {
-      RequestMethod.PUT}, produces = "application/json")
-  public FieldsValidator putAppsWithAdminRoleStateForUser(Principal principal,
-      @RequestBody AppsListWithAdminRole newAppsListWithAdminRoles, HttpServletResponse response) {
-    // newAppsListWithAdminRoles.appsRoles
-    FieldsValidator fieldsValidator = new FieldsValidator();
-    StringBuilder newAppRoles = new StringBuilder();
-    if (newAppsListWithAdminRoles != null) {
-      if (!newAppsListWithAdminRoles.getAppsRoles().isEmpty()) {
-        newAppRoles.append("User '").append(newAppsListWithAdminRoles.getOrgUserId())
-            .append("' has admin role to the apps = { ");
-        for (AppNameIdIsAdmin adminAppRole : newAppsListWithAdminRoles.getAppsRoles()) {
-          if (adminAppRole.getIsAdmin()) {
-            newAppRoles.append(adminAppRole.getAppName()).append(" ,");
-          }
+    @RequestMapping(value = {"/portalApi/queryUsers"}, method = RequestMethod.GET, produces = "application/json")
+    @PreAuthorize("hasRole('System_Administrator') and hasRole('Account_Administrator')")
+    public String getPhoneBookSearchResult(Principal principal, @RequestParam("search") String searchString,
+        HttpServletResponse response) {
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+
+        String searchResult = null;
+        if (!adminRolesService.isSuperAdmin(user.getLoginId()) && !adminRolesService
+            .isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps())
+            && !adminRolesService.isRoleAdmin(user.getId())) {
+            EcompPortalUtils.setBadPermissions(user, response, "getPhoneBookSearchResult");
+        } else {
+            searchString = searchString.trim();
+            if (searchString.length() > 2) {
+                searchResult = searchService.searchUsersInPhoneBook(searchString);
+            } else {
+                logger.info(EELFLoggerDelegate.errorLogger,
+                    "getPhoneBookSearchResult - too short search string: " + searchString);
+            }
         }
-        newAppRoles.deleteCharAt(newAppRoles.length() - 1);
-        newAppRoles.append("}.");
-      } else {
-        newAppRoles.append("User '").append(newAppsListWithAdminRoles.getOrgUserId())
-            .append("' has no Apps with Admin Role.");
-      }
-    } else {
-      logger.error(EELFLoggerDelegate.errorLogger,
-          "putAppWithUserRoleStateForUser: putAppsWithAdminRoleStateForUser result is null");
-      fieldsValidator.setHttpStatusCode((long) HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-    }
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/queryUsers", "result =", searchResult);
 
-    logger.info(EELFLoggerDelegate.errorLogger, newAppRoles.toString());
-
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
-
-    boolean changesApplied = false;
-
-    if (!adminRolesService.isSuperAdmin(user.getLoginId())) {
-      EcompPortalUtils.setBadPermissions(user, response, "putAppsWithAdminRoleStateForUser");
-    } else {
-      changesApplied = adminRolesService.setAppsWithAdminRoleStateForUser(newAppsListWithAdminRoles);
-      AuditLog auditLog = new AuditLog();
-      auditLog.setUserId(user.getId());
-      auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN);
-      if (newAppsListWithAdminRoles != null) {
-        auditLog.setAffectedRecordId(newAppsListWithAdminRoles.getOrgUserId());
-      }
-      auditLog.setComments(
-          EcompPortalUtils
-              .truncateString(newAppRoles.toString(), PortalConstants.AUDIT_LOG_COMMENT_SIZE));
-      auditService.logActivity(auditLog, null);
-
-      MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
-          EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-      MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,
-          EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-      EcompPortalUtils.calculateDateTimeDifferenceForLog(
-          MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-          MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-      if (newAppsListWithAdminRoles != null) {
-        logger.info(EELFLoggerDelegate.auditLogger,
-            EPLogUtil.formatAuditLogMessage(
-                "UserRolesController.putAppsWithAdminRoleStateForUser",
-                EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN, user.getOrgUserId(),
-                newAppsListWithAdminRoles.getOrgUserId(), newAppRoles.toString()));
-      }
-      MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-      MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-      MDC.remove(SystemProperties.MDC_TIMER);
+        return searchResult;
     }
-    EcompPortalUtils
-        .logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "put result =", changesApplied);
-
-    return fieldsValidator;
-  }
-
-  @RequestMapping(value = {"/portalApi/userAppRoles"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public List<RoleInAppForUser> getAppRolesForUser(Principal principal,
-      @RequestParam("user") String orgUserId,
-      @RequestParam("app") Long appid, @RequestParam("externalRequest") Boolean extRequestValue,
-      @RequestParam("isSystemUser") Boolean isSystemUser,
-      HttpServletResponse response) {
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
-    List<RoleInAppForUser> result = null;
-    String feErrorString = "";
-    if (!adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps()) && !adminRolesService.isRoleAdmin(user.getId())) {
-      logger.debug(EELFLoggerDelegate.debugLogger,
-          "getAppRolesForUser: Accountadminpermissioncheck {}, RoleAdmincheck {}",
-          adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps()), adminRolesService.isRoleAdmin(user.getId()));
-      EcompPortalUtils.setBadPermissions(user, response, "getAppRolesForUser");
-      feErrorString = EcompPortalUtils.getFEErrorString(true, response.getStatus());
-    } else {
-      if (isSystemUser || EcompPortalUtils.legitimateUserId(orgUserId)) {
-        result = adminRolesService.getAppRolesForUser(appid, orgUserId, extRequestValue, user.getId());
-        logger.debug(EELFLoggerDelegate.debugLogger, "getAppRolesForUser: result {}, appId {}",
-            result, appid);
-        int responseCode = EcompPortalUtils.getExternalAppResponseCode();
-        if (responseCode != 0 && responseCode != 200) {
-          // external error
-          response.setStatus(responseCode);
-          feErrorString = EcompPortalUtils.getFEErrorString(false, responseCode);
-        } else if (result == null) {
-          // If the result is null, there was an internal onap error
-          // in the service call.
-          response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-          feErrorString = EcompPortalUtils.getFEErrorString(true,
-              HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+
+    @RequestMapping(value = {"/portalApi/adminAppsRoles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(Principal principal,
+        @RequestParam("user") String orgUserId, HttpServletResponse response) {
+
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+
+        AppsListWithAdminRole result = null;
+        if (!adminRolesService.isSuperAdmin(user.getLoginId())) {
+            EcompPortalUtils.setBadPermissions(user, response, "getAppsWithAdminRoleStateForUser");
+        } else {
+            if (EcompPortalUtils.legitimateUserId(orgUserId)) {
+                result = adminRolesService.getAppsWithAdminRoleStateForUser(orgUserId);
+            } else {
+                logger.info(EELFLoggerDelegate.errorLogger,
+                    "getAppsWithAdminRoleStateForUser - parms error, no Organization User ID");
+                response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+            }
         }
-      } else {
-        logger.info(EELFLoggerDelegate.errorLogger, "getAppRolesForUser - no Organization User ID");
-        response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-        feErrorString = EcompPortalUtils.getFEErrorString(true, HttpServletResponse.SC_BAD_REQUEST);
-      }
-    }
 
-    StringBuilder sbUserApps = new StringBuilder();
-    if (result != null && !result.isEmpty()) {
-      sbUserApps.append("User '").append(orgUserId).append("' has Roles={");
-      for (RoleInAppForUser appRole : result) {
-        if (appRole.getIsApplied()) {
-          sbUserApps.append(appRole.getRoleName()).append(", ");
+        StringBuilder adminAppRoles = new StringBuilder();
+        if (result != null) {
+            if (!result.getAppsRoles().isEmpty()) {
+                adminAppRoles.append("User '").append(result.getOrgUserId())
+                    .append("' has admin role to the apps = {");
+                for (AppNameIdIsAdmin adminAppRole : result.getAppsRoles()) {
+                    if (adminAppRole.getIsAdmin()) {
+                        adminAppRoles.append(adminAppRole.getAppName()).append(", ");
+                    }
+                }
+                adminAppRoles.append("}.");
+            } else {
+                adminAppRoles.append("User '").append(result.getOrgUserId())
+                    .append("' has no Apps with Admin Role.");
+            }
+        } else {
+            logger.error(EELFLoggerDelegate.errorLogger,
+                "putAppWithUserRoleStateForUser: getAppsWithAdminRoleStateForUser result is null");
         }
-      }
-      sbUserApps.append("} assigned to the appId '").append(appid).append("'.");
-    } else {
-      // Not sure creating an empty object will make any difference
-      // but would like to give it a shot for defect #DE221057
-      if (result == null) {
-        result = new ArrayList<>();
-      }
-      sbUserApps.append("User '").append(orgUserId).append("' and appid ").append(appid).append(" has no roles");
-    }
-    logger.info(EELFLoggerDelegate.errorLogger, sbUserApps.toString());
 
-    EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "get result =", result);
-    if (!feErrorString.isEmpty()) {
-      logger.debug(EELFLoggerDelegate.debugLogger, "LR: FEErrorString to header: " + feErrorString);
+        logger.info(EELFLoggerDelegate.errorLogger, adminAppRoles.toString());
+
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "get result =", result);
 
-      response.addHeader("FEErrorString", feErrorString);
-      response.addHeader("Access-Control-Expose-Headers", "FEErrorString");
+        return result;
     }
-    return result;
-  }
-
-
-  @RequestMapping(value = {"/portalApi/userAppRoles"}, method = {
-      RequestMethod.PUT}, produces = "application/json")
-  public PortalRestResponse<String> putAppWithUserRoleStateForUser(Principal principal,
-      @RequestBody AppWithRolesForUser newAppRolesForUser, HttpServletResponse response) {
-    // FieldsValidator fieldsValidator = new FieldsValidator();
-    PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
-    StringBuilder sbUserApps = new StringBuilder();
-    if (newAppRolesForUser != null) {
-      sbUserApps.append("User '").append(newAppRolesForUser.getOrgUserId());
-      if (newAppRolesForUser.getAppId() != null && !newAppRolesForUser.getAppRoles().isEmpty()) {
-        sbUserApps.append("' has roles = { ");
-        for (RoleInAppForUser appRole : newAppRolesForUser.getAppRoles()) {
-          if (appRole.getIsApplied()) {
-            sbUserApps.append(appRole.getRoleName()).append(" ,");
-          }
+
+    @RequestMapping(value = {"/portalApi/adminAppsRoles"}, method = {
+        RequestMethod.PUT}, produces = "application/json")
+    public FieldsValidator putAppsWithAdminRoleStateForUser(Principal principal,
+        @RequestBody AppsListWithAdminRole newAppsListWithAdminRoles, HttpServletResponse response) {
+        // newAppsListWithAdminRoles.appsRoles
+        FieldsValidator fieldsValidator = new FieldsValidator();
+        StringBuilder newAppRoles = new StringBuilder();
+        if (newAppsListWithAdminRoles != null) {
+            if (!newAppsListWithAdminRoles.getAppsRoles().isEmpty()) {
+                newAppRoles.append("User '").append(newAppsListWithAdminRoles.getOrgUserId())
+                    .append("' has admin role to the apps = { ");
+                for (AppNameIdIsAdmin adminAppRole : newAppsListWithAdminRoles.getAppsRoles()) {
+                    if (adminAppRole.getIsAdmin()) {
+                        newAppRoles.append(adminAppRole.getAppName()).append(" ,");
+                    }
+                }
+                newAppRoles.deleteCharAt(newAppRoles.length() - 1);
+                newAppRoles.append("}.");
+            } else {
+                newAppRoles.append("User '").append(newAppsListWithAdminRoles.getOrgUserId())
+                    .append("' has no Apps with Admin Role.");
+            }
+        } else {
+            logger.error(EELFLoggerDelegate.errorLogger,
+                "putAppWithUserRoleStateForUser: putAppsWithAdminRoleStateForUser result is null");
+            fieldsValidator.setHttpStatusCode((long) HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        logger.info(EELFLoggerDelegate.errorLogger, newAppRoles.toString());
+
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+
+        boolean changesApplied = false;
+
+        if (!adminRolesService.isSuperAdmin(user.getLoginId())) {
+            EcompPortalUtils.setBadPermissions(user, response, "putAppsWithAdminRoleStateForUser");
+        } else {
+            changesApplied = adminRolesService.setAppsWithAdminRoleStateForUser(newAppsListWithAdminRoles);
+            AuditLog auditLog = new AuditLog();
+            auditLog.setUserId(user.getId());
+            auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN);
+            if (newAppsListWithAdminRoles != null) {
+                auditLog.setAffectedRecordId(newAppsListWithAdminRoles.getOrgUserId());
+            }
+            auditLog.setComments(
+                EcompPortalUtils
+                    .truncateString(newAppRoles.toString(), PortalConstants.AUDIT_LOG_COMMENT_SIZE));
+            auditService.logActivity(auditLog, null);
+
+            MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
+                EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+            MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,
+                EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+            EcompPortalUtils.calculateDateTimeDifferenceForLog(
+                MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+                MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+            if (newAppsListWithAdminRoles != null) {
+                logger.info(EELFLoggerDelegate.auditLogger,
+                    EPLogUtil.formatAuditLogMessage(
+                        "UserRolesController.putAppsWithAdminRoleStateForUser",
+                        EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN, user.getOrgUserId(),
+                        newAppsListWithAdminRoles.getOrgUserId(), newAppRoles.toString()));
+            }
+            MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+            MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+            MDC.remove(SystemProperties.MDC_TIMER);
         }
-        sbUserApps.deleteCharAt(sbUserApps.length() - 1);
-        sbUserApps.append("} assigned for the app ").append(newAppRolesForUser.getAppId());
-      } else {
-        sbUserApps.append("' has no roles assigned for app ").append(newAppRolesForUser.getAppId());
-      }
+        EcompPortalUtils
+            .logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "put result =", changesApplied);
+
+        return fieldsValidator;
     }
-    logger.info(EELFLoggerDelegate.applicationLogger, "putAppWithUserRoleStateForUser: {}",
-        sbUserApps.toString());
-
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
-    // boolean changesApplied = false;
-    ExternalRequestFieldsValidator changesApplied = null;
-
-    if (!adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps()) && !adminRolesService.isRoleAdmin(user.getId())) {
-      EcompPortalUtils.setBadPermissions(user, response, "putAppWithUserRoleStateForUser");
-    } else if (newAppRolesForUser == null) {
-      logger.error(EELFLoggerDelegate.errorLogger,
-          "putAppWithUserRoleStateForUser: newAppRolesForUser is null");
-    } else {
-      changesApplied = adminRolesService.setAppWithUserRoleStateForUser(user, newAppRolesForUser);
-      try {
-        if (changesApplied.isResult()) {
-          logger.info(EELFLoggerDelegate.applicationLogger,
-              "putAppWithUserRoleStateForUser: succeeded for app {}, user {}",
-              newAppRolesForUser.getAppId(),
-              newAppRolesForUser.getAppId());
-
-          MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
-              EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-          AuditLog auditLog = new AuditLog();
-          auditLog.setUserId(user.getId());
-          auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_USER);
-          auditLog.setAffectedRecordId(newAppRolesForUser.getOrgUserId());
-          auditLog.setComments(EcompPortalUtils.truncateString(sbUserApps.toString(),
-              PortalConstants.AUDIT_LOG_COMMENT_SIZE));
-          auditService.logActivity(auditLog, null);
-
-          MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,
-              EPEELFLoggerAdvice.getCurrentDateTimeUTC());
-          EcompPortalUtils.calculateDateTimeDifferenceForLog(
-              MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
-              MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
-          logger.info(EELFLoggerDelegate.auditLogger,
-              EPLogUtil.formatAuditLogMessage(
-                  "UserRolesController.putAppWithUserRoleStateForUser",
-                  EcompAuditLog.CD_ACTIVITY_UPDATE_USER, user.getOrgUserId(),
-                  newAppRolesForUser.getOrgUserId(), sbUserApps.toString()));
-          MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
-          MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
-          MDC.remove(SystemProperties.MDC_TIMER);
-          portalResponse = new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", null);
 
+    @RequestMapping(value = {"/portalApi/userAppRoles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public List<RoleInAppForUser> getAppRolesForUser(Principal principal,
+        @RequestParam("user") String orgUserId,
+        @RequestParam("app") Long appid, @RequestParam("externalRequest") Boolean extRequestValue,
+        @RequestParam("isSystemUser") Boolean isSystemUser,
+        HttpServletResponse response) {
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+        List<RoleInAppForUser> result = null;
+        String feErrorString = "";
+        if (!adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps())
+            && !adminRolesService.isRoleAdmin(user.getId())) {
+            logger.debug(EELFLoggerDelegate.debugLogger,
+                "getAppRolesForUser: Accountadminpermissioncheck {}, RoleAdmincheck {}",
+                adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps()),
+                adminRolesService.isRoleAdmin(user.getId()));
+            EcompPortalUtils.setBadPermissions(user, response, "getAppRolesForUser");
+            feErrorString = EcompPortalUtils.getFEErrorString(true, response.getStatus());
+        } else {
+            if (isSystemUser || EcompPortalUtils.legitimateUserId(orgUserId)) {
+                result = adminRolesService.getAppRolesForUser(appid, orgUserId, extRequestValue, user.getId());
+                logger.debug(EELFLoggerDelegate.debugLogger, "getAppRolesForUser: result {}, appId {}",
+                    result, appid);
+                int responseCode = EcompPortalUtils.getExternalAppResponseCode();
+                if (responseCode != 0 && responseCode != 200) {
+                    // external error
+                    response.setStatus(responseCode);
+                    feErrorString = EcompPortalUtils.getFEErrorString(false, responseCode);
+                } else if (result == null) {
+                    // If the result is null, there was an internal onap error
+                    // in the service call.
+                    response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                    feErrorString = EcompPortalUtils.getFEErrorString(true,
+                        HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                }
+            } else {
+                logger.info(EELFLoggerDelegate.errorLogger, "getAppRolesForUser - no Organization User ID");
+                response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                feErrorString = EcompPortalUtils.getFEErrorString(true, HttpServletResponse.SC_BAD_REQUEST);
+            }
         }
-        if (!changesApplied.isResult()) {
-          throw new Exception(changesApplied.getDetailMessage());
+
+        StringBuilder sbUserApps = new StringBuilder();
+        if (result != null && !result.isEmpty()) {
+            sbUserApps.append("User '").append(orgUserId).append("' has Roles={");
+            for (RoleInAppForUser appRole : result) {
+                if (appRole.getIsApplied()) {
+                    sbUserApps.append(appRole.getRoleName()).append(", ");
+                }
+            }
+            sbUserApps.append("} assigned to the appId '").append(appid).append("'.");
+        } else {
+            // Not sure creating an empty object will make any difference
+            // but would like to give it a shot for defect #DE221057
+            if (result == null) {
+                result = new ArrayList<>();
+            }
+            sbUserApps.append("User '").append(orgUserId).append("' and appid ").append(appid).append(" has no roles");
         }
+        logger.info(EELFLoggerDelegate.errorLogger, sbUserApps.toString());
+
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "get result =", result);
+        if (!feErrorString.isEmpty()) {
+            logger.debug(EELFLoggerDelegate.debugLogger, "LR: FEErrorString to header: " + feErrorString);
 
-      } catch (Exception e) {
-        logger.error(EELFLoggerDelegate.errorLogger,
-            "putAppWithUserRoleStateForUser: failed for app {}, user {}",
-            newAppRolesForUser.getAppId(),
-            newAppRolesForUser.getOrgUserId(), e);
-        portalResponse = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage(), null);
-      }
+            response.addHeader("FEErrorString", feErrorString);
+            response.addHeader("Access-Control-Expose-Headers", "FEErrorString");
+        }
+        return result;
     }
 
-    EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "put result =", changesApplied);
-    return portalResponse;
-  }
-
-  @RequestMapping(value = {"/portalApi/updateRemoteUserProfile"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public PortalRestResponse<String> updateRemoteUserProfile(HttpServletRequest request) {
-
-    String updateRemoteUserFlag = FAILURE;
-    try {
-      // saveNewUser = userService.saveNewUser(newUser);
-      String orgUserId = request.getParameter("loginId");
-      long appId = Long.parseLong(request.getParameter("appId"));
-      fnUserRoleService.updateRemoteUserProfile(orgUserId, appId);
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger, "updateRemoteUserProfile failed", e);
-      return new PortalRestResponse<>(PortalRestStatusEnum.OK, updateRemoteUserFlag, e.getMessage());
+
+    @RequestMapping(value = {"/portalApi/userAppRoles"}, method = {
+        RequestMethod.PUT}, produces = "application/json")
+    public PortalRestResponse<String> putAppWithUserRoleStateForUser(Principal principal,
+        @RequestBody AppWithRolesForUser newAppRolesForUser, HttpServletResponse response) {
+        // FieldsValidator fieldsValidator = new FieldsValidator();
+        PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
+        StringBuilder sbUserApps = new StringBuilder();
+        if (newAppRolesForUser != null) {
+            sbUserApps.append("User '").append(newAppRolesForUser.getOrgUserId());
+            if (newAppRolesForUser.getAppId() != null && !newAppRolesForUser.getAppRoles().isEmpty()) {
+                sbUserApps.append("' has roles = { ");
+                for (RoleInAppForUser appRole : newAppRolesForUser.getAppRoles()) {
+                    if (appRole.getIsApplied()) {
+                        sbUserApps.append(appRole.getRoleName()).append(" ,");
+                    }
+                }
+                sbUserApps.deleteCharAt(sbUserApps.length() - 1);
+                sbUserApps.append("} assigned for the app ").append(newAppRolesForUser.getAppId());
+            } else {
+                sbUserApps.append("' has no roles assigned for app ").append(newAppRolesForUser.getAppId());
+            }
+        }
+        logger.info(EELFLoggerDelegate.applicationLogger, "putAppWithUserRoleStateForUser: {}",
+            sbUserApps.toString());
+
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+        // boolean changesApplied = false;
+        ExternalRequestFieldsValidator changesApplied = null;
+
+        if (!adminRolesService.isAccountAdmin(user.getId(), user.getOrgUserId(), user.getUserApps())
+            && !adminRolesService.isRoleAdmin(user.getId())) {
+            EcompPortalUtils.setBadPermissions(user, response, "putAppWithUserRoleStateForUser");
+        } else if (newAppRolesForUser == null) {
+            logger.error(EELFLoggerDelegate.errorLogger,
+                "putAppWithUserRoleStateForUser: newAppRolesForUser is null");
+        } else {
+            changesApplied = adminRolesService.setAppWithUserRoleStateForUser(user, newAppRolesForUser);
+            try {
+                if (changesApplied.isResult()) {
+                    logger.info(EELFLoggerDelegate.applicationLogger,
+                        "putAppWithUserRoleStateForUser: succeeded for app {}, user {}",
+                        newAppRolesForUser.getAppId(),
+                        newAppRolesForUser.getAppId());
+
+                    MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
+                        EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+                    AuditLog auditLog = new AuditLog();
+                    auditLog.setUserId(user.getId());
+                    auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_USER);
+                    auditLog.setAffectedRecordId(newAppRolesForUser.getOrgUserId());
+                    auditLog.setComments(EcompPortalUtils.truncateString(sbUserApps.toString(),
+                        PortalConstants.AUDIT_LOG_COMMENT_SIZE));
+                    auditService.logActivity(auditLog, null);
+
+                    MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,
+                        EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+                    EcompPortalUtils.calculateDateTimeDifferenceForLog(
+                        MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+                        MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+                    logger.info(EELFLoggerDelegate.auditLogger,
+                        EPLogUtil.formatAuditLogMessage(
+                            "UserRolesController.putAppWithUserRoleStateForUser",
+                            EcompAuditLog.CD_ACTIVITY_UPDATE_USER, user.getOrgUserId(),
+                            newAppRolesForUser.getOrgUserId(), sbUserApps.toString()));
+                    MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+                    MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+                    MDC.remove(SystemProperties.MDC_TIMER);
+                    portalResponse = new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", null);
+
+                }
+                if (!changesApplied.isResult()) {
+                    throw new Exception(changesApplied.getDetailMessage());
+                }
+
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger,
+                    "putAppWithUserRoleStateForUser: failed for app {}, user {}",
+                    newAppRolesForUser.getAppId(),
+                    newAppRolesForUser.getOrgUserId(), e);
+                portalResponse = new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage(), null);
+            }
+        }
+
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "put result =", changesApplied);
+        return portalResponse;
     }
-    return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, updateRemoteUserFlag, "");
-
-  }
-
-  @RequestMapping(value = {"/portalApi/app/{appId}/users"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public List<UserApplicationRoles> getUsersFromAppEndpoint(@PathVariable("appId") Long appId) {
-    try {
-      logger.debug(EELFLoggerDelegate.debugLogger, "/portalApi/app/{}/users was invoked", appId);
-      return fnUserRoleService.getUsersFromAppEndpoint(appId);
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger, "getUsersFromAppEndpoint failed", e);
-      return new ArrayList<>();
+
+    @RequestMapping(value = {"/portalApi/updateRemoteUserProfile"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public PortalRestResponse<String> updateRemoteUserProfile(HttpServletRequest request) {
+
+        String updateRemoteUserFlag = FAILURE;
+        try {
+            // saveNewUser = userService.saveNewUser(newUser);
+            String orgUserId = request.getParameter("loginId");
+            long appId = Long.parseLong(request.getParameter("appId"));
+            fnUserRoleService.updateRemoteUserProfile(orgUserId, appId);
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "updateRemoteUserProfile failed", e);
+            return new PortalRestResponse<>(PortalRestStatusEnum.OK, updateRemoteUserFlag, e.getMessage());
+        }
+        return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, updateRemoteUserFlag, "");
+
     }
-  }
-
-  @RequestMapping(value = {"/portalApi/app/{appId}/roles"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public List<EcompRole> testGetRoles(HttpServletRequest request, @PathVariable("appId") Long appId)
-      throws HTTPException {
-    EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, appId, "/roles");
-    List<EcompRole> rolesList = Arrays.asList(appRoles);
-    EcompPortalUtils
-        .logAndSerializeObject(logger, "/portalApi/app/{appId}/roles", "response for appId=" + appId,
-            rolesList);
-
-    return rolesList;
-  }
-
-
-  @RequestMapping(value = {"/portalApi/admin/import/app/{appId}/roles"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public List<FnRole> importRolesFromRemoteApplication(@PathVariable("appId") Long appId) throws HTTPException {
-    List<FnRole> rolesList = fnUserRoleService.importRolesFromRemoteApplication(appId);
-    EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/admin/import/app/{appId}/roles",
-        "response for appId=" + appId, rolesList);
-
-    return rolesList;
-  }
-
-
-  @RequestMapping(value = {"/portalApi/app/{appId}/user/{orgUserId}/roles"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public EcompRole testGetRoles(@PathVariable("appId") Long appId,
-      @PathVariable("orgUserId") String orgUserId) throws Exception {
-    if (!EcompPortalUtils.legitimateUserId(orgUserId)) {
-      String msg = "Error /user/<user>/roles not legitimate orgUserId = " + orgUserId;
-      logger.error(EELFLoggerDelegate.errorLogger, msg);
-      throw new Exception(msg);
+
+    @RequestMapping(value = {"/portalApi/app/{appId}/users"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public List<UserApplicationRoles> getUsersFromAppEndpoint(@PathVariable("appId") Long appId) {
+        try {
+            logger.debug(EELFLoggerDelegate.debugLogger, "/portalApi/app/{}/users was invoked", appId);
+            return fnUserRoleService.getUsersFromAppEndpoint(appId);
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "getUsersFromAppEndpoint failed", e);
+            return new ArrayList<>();
+        }
     }
-    EcompRole[] roles = applicationsRestClientService.get(EcompRole[].class, appId,
-        String.format("/user/%s/roles", orgUserId));
-    if (roles.length != 1) {
-      String msg =
-          "Error /user/<user>/roles returned array. expected size 1 recieved size = " + roles.length;
-      logger.error(EELFLoggerDelegate.errorLogger, msg);
-      throw new Exception(msg);
+
+    @RequestMapping(value = {"/portalApi/app/{appId}/roles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public List<EcompRole> testGetRoles(HttpServletRequest request, @PathVariable("appId") Long appId)
+        throws HTTPException {
+        EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, appId, "/roles");
+        List<EcompRole> rolesList = Arrays.asList(appRoles);
+        EcompPortalUtils
+            .logAndSerializeObject(logger, "/portalApi/app/{appId}/roles", "response for appId=" + appId,
+                rolesList);
+
+        return rolesList;
     }
 
-    EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/app/{appId}/user/{orgUserId}/roles",
-        "response for appId='" + appId + "' and orgUserId='" + orgUserId + "'", roles[0]);
-    return roles[0];
-  }
 
+    @RequestMapping(value = {"/portalApi/admin/import/app/{appId}/roles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public List<FnRole> importRolesFromRemoteApplication(@PathVariable("appId") Long appId) throws HTTPException {
+        List<FnRole> rolesList = fnUserRoleService.importRolesFromRemoteApplication(appId);
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/admin/import/app/{appId}/roles",
+            "response for appId=" + appId, rolesList);
 
-  @RequestMapping(value = {"/portalApi/saveUserAppRoles"}, method = {
-      RequestMethod.PUT}, produces = "application/json")
-  public FieldsValidator putAppWithUserRoleRequest(Principal principal,
-      @RequestBody AppWithRolesForUser newAppRolesForUser, HttpServletResponse response) {
-    FieldsValidator fieldsValidator = null;
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
-    try {
-      fieldsValidator = fnUserRoleService.putUserAppRolesRequest(newAppRolesForUser, user);
-      response.setStatus(0);
+        return rolesList;
+    }
 
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger, "putAppWithUserRoleRequest failed", e);
 
+    @RequestMapping(value = {"/portalApi/app/{appId}/user/{orgUserId}/roles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public EcompRole testGetRoles(@PathVariable("appId") Long appId,
+        @PathVariable("orgUserId") String orgUserId) throws Exception {
+        if (!EcompPortalUtils.legitimateUserId(orgUserId)) {
+            String msg = "Error /user/<user>/roles not legitimate orgUserId = " + orgUserId;
+            logger.error(EELFLoggerDelegate.errorLogger, msg);
+            throw new Exception(msg);
+        }
+        EcompRole[] roles = applicationsRestClientService.get(EcompRole[].class, appId,
+            String.format("/user/%s/roles", orgUserId));
+        if (roles.length != 1) {
+            String msg =
+                "Error /user/<user>/roles returned array. expected size 1 recieved size = " + roles.length;
+            logger.error(EELFLoggerDelegate.errorLogger, msg);
+            throw new Exception(msg);
+        }
+
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/app/{appId}/user/{orgUserId}/roles",
+            "response for appId='" + appId + "' and orgUserId='" + orgUserId + "'", roles[0]);
+        return roles[0];
     }
-    // return fieldsValidator;
-    EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/saveUserAppRoles", "PUT result =",
-        response.getStatus());
-    return fieldsValidator;
-  }
-
-
-  @SuppressWarnings("ConstantConditions")
-  @RequestMapping(value = {"/portalApi/appCatalogRoles"}, method = {
-      RequestMethod.GET}, produces = "application/json")
-  public List<EPUserAppCatalogRoles> getUserAppCatalogRoles(Principal principal,
-      @RequestParam("appName") String appName) {
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
-    List<EPUserAppCatalogRoles> userAppRoleList = null;
-    try {
-      userAppRoleList = fnUserRoleService.getUserAppCatalogRoles(user, appName);
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger, "putUserWidgetsSortPref failed", e);
 
+
+    @RequestMapping(value = {"/portalApi/saveUserAppRoles"}, method = {
+        RequestMethod.PUT}, produces = "application/json")
+    public FieldsValidator putAppWithUserRoleRequest(Principal principal,
+        @RequestBody AppWithRolesForUser newAppRolesForUser, HttpServletResponse response) {
+        FieldsValidator fieldsValidator = null;
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+        try {
+            fieldsValidator = fnUserRoleService.putUserAppRolesRequest(newAppRolesForUser, user);
+            response.setStatus(0);
+
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "putAppWithUserRoleRequest failed", e);
+
+        }
+        // return fieldsValidator;
+        EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/saveUserAppRoles", "PUT result =",
+            response.getStatus());
+        return fieldsValidator;
     }
-    userAppRoleList.sort(getUserAppCatalogRolesComparator);
-    EcompPortalUtils
-        .logAndSerializeObject(logger, "/portalApi/userApplicationRoles", "result =", userAppRoleList);
-
-    return userAppRoleList;
-
-  }
-
-
-  private final Comparator<EPUserAppCatalogRoles> getUserAppCatalogRolesComparator =
-      Comparator.comparing(EPUserAppCatalogRoles::getRoleName);
-
-  @RequestMapping(value = "/portalApi/externalRequestAccessSystem", method = RequestMethod.GET,
-      produces = "application/json")
-  public ExternalSystemAccess readExternalRequestAccess() {
-    ExternalSystemAccess result = null;
-    try {
-      result = fnUserRoleService.getExternalRequestAccess();
-      EcompPortalUtils
-          .logAndSerializeObject(logger, "/portalApi/externalRequestAccessSystem", "GET result =",
-              result);
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger,
-          "readExternalRequestAccess failed: " + e.getMessage());
+
+
+    @SuppressWarnings("ConstantConditions")
+    @RequestMapping(value = {"/portalApi/appCatalogRoles"}, method = {
+        RequestMethod.GET}, produces = "application/json")
+    public List<EPUserAppCatalogRoles> getUserAppCatalogRoles(Principal principal,
+        @RequestParam("appName") String appName) {
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
+        List<EPUserAppCatalogRoles> userAppRoleList = null;
+        try {
+            userAppRoleList = fnUserRoleService.getUserAppCatalogRoles(user, appName);
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "putUserWidgetsSortPref failed", e);
+
+        }
+        userAppRoleList.sort(getUserAppCatalogRolesComparator);
+        EcompPortalUtils
+            .logAndSerializeObject(logger, "/portalApi/userApplicationRoles", "result =", userAppRoleList);
+
+        return userAppRoleList;
+
     }
-    return result;
 
-  }
 
-  @RequestMapping(value = {"/portalApi/checkIfUserIsSuperAdmin"}, method = RequestMethod.GET,
-      produces = "application/json")
-  public boolean checkIfUserIsSuperAdmin(Principal principal) {
-    FnUser user = fnUserService.loadUserByUsername(principal.getName());
+    private final Comparator<EPUserAppCatalogRoles> getUserAppCatalogRolesComparator =
+        Comparator.comparing(EPUserAppCatalogRoles::getRoleName);
+
+    @RequestMapping(value = "/portalApi/externalRequestAccessSystem", method = RequestMethod.GET,
+        produces = "application/json")
+    public ExternalSystemAccess readExternalRequestAccess() {
+        ExternalSystemAccess result = null;
+        try {
+            result = fnUserRoleService.getExternalRequestAccess();
+            EcompPortalUtils
+                .logAndSerializeObject(logger, "/portalApi/externalRequestAccessSystem", "GET result =",
+                    result);
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger,
+                "readExternalRequestAccess failed: " + e.getMessage());
+        }
+        return result;
+
+    }
+
+    @RequestMapping(value = {"/portalApi/checkIfUserIsSuperAdmin"}, method = RequestMethod.GET,
+        produces = "application/json")
+    public boolean checkIfUserIsSuperAdmin(Principal principal) {
+        FnUser user = fnUserService.loadUserByUsername(principal.getName());
 
-    boolean isSuperAdmin = false;
-    try {
-      isSuperAdmin = adminRolesService.isSuperAdmin(user.getLoginId());
-    } catch (Exception e) {
-      logger.error(EELFLoggerDelegate.errorLogger, "checkIfUserIsSuperAdmin failed: " + e.getMessage());
+        boolean isSuperAdmin = false;
+        try {
+            isSuperAdmin = adminRolesService.isSuperAdmin(user.getLoginId());
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "checkIfUserIsSuperAdmin failed: " + e.getMessage());
+        }
+        return isSuperAdmin;
     }
-    return isSuperAdmin;
-  }
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
index b8307b90..375838e2 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUser.java
@@ -162,7 +162,10 @@ CREATE TABLE `fn_user` (
         query = "FROM FnUser WHERE activeYn = 'Y'"),
     @NamedQuery(
         name = "FnUser.getUsersByOrgIds",
-        query = "FROM FnUser WHERE orgUserId IN :orgIds"
+        query = "FROM FnUser WHERE orgUserId IN :orgIds"),
+    @NamedQuery(
+        name = "FnUSer.findByFirstNameAndLastName",
+        query = "FROM FnUser WHERE firstName = :firstName AND  lastName = :lastName"
     )
 })
 
diff --git a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
index e2913e05..581b7ab4 100644
--- a/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
+++ b/portal-BE/src/main/java/org/onap/portal/domain/db/fn/FnUserRole.java
@@ -186,7 +186,7 @@ public class FnUserRole implements Serializable {
   @Digits(integer = 4, fraction = 0)
   private Long priority;
   @ManyToOne(cascade = CascadeType.MERGE, fetch = FetchType.LAZY)
-  @JoinColumn(name = "fn_App_Id", columnDefinition = "bigint")
+  @JoinColumn(name = "fn_app_id", columnDefinition = "bigint")
   @Valid
   private FnApp fnAppId;
-}
\ No newline at end of file
+}
diff --git a/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java b/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
index a103f44e..f8ef4a99 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/AdminRolesService.java
@@ -78,6 +78,7 @@ import org.onap.portal.domain.db.fn.FnRole;
 import org.onap.portal.domain.db.fn.FnRoleFunction;
 import org.onap.portal.domain.db.fn.FnUser;
 import org.onap.portal.domain.db.fn.FnUserRole;
+import org.onap.portal.domain.dto.ecomp.EPUserApp;
 import org.onap.portal.domain.dto.transport.AppNameIdIsAdmin;
 import org.onap.portal.domain.dto.transport.AppWithRolesForUser;
 import org.onap.portal.domain.dto.transport.AppsListWithAdminRole;
@@ -1932,4 +1933,47 @@ public class AdminRolesService {
 
         return finalRoleFunctionSet;
     }
+
+    public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(String orgUserId) {
+            AppsListWithAdminRole appsListWithAdminRole = null;
+
+            try {
+                List<FnUser> userList = fnUserService.getUserWithOrgUserId(orgUserId);
+                HashMap<Long, Long> appsUserAdmin = new HashMap<>();
+                if (userList!= null && userList.size() > 0) {
+                    FnUser user = userList.get(0);
+                    List<FnUserRole> userAppList = new ArrayList<>();
+                    try {
+                        userAppList = fnUserRoleService.retrieveByUserIdAndRoleId(user.getId(), ACCOUNT_ADMIN_ROLE_ID);
+                    } catch (Exception e) {
+                        logger.error(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser 1 failed", e);
+                        EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+                    }
+                    for (FnUserRole userApp : userAppList) {
+                        appsUserAdmin.put(userApp.getFnAppId().getId(), userApp.getUserId().getId());
+                    }
+                }
+
+                appsListWithAdminRole = new AppsListWithAdminRole();
+                appsListWithAdminRole.setOrgUserId(orgUserId);
+                List<FnApp> appsList = new ArrayList<>();
+                try {
+                    appsList = fnAppService.findAll();
+                } catch (Exception e) {
+                    logger.error(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser 2 failed", e);
+                    EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+                }
+                for (FnApp app : appsList) {
+                    AppNameIdIsAdmin appNameIdIsAdmin = new AppNameIdIsAdmin();
+                    appNameIdIsAdmin.setId(app.getId());
+                    appNameIdIsAdmin.setAppName(app.getAppName());
+                    appNameIdIsAdmin.setIsAdmin(appsUserAdmin.containsKey(app.getId()));
+                    appNameIdIsAdmin.setRestrictedApp(app.isRestrictedApp());
+                    appsListWithAdminRole.getAppsRoles().add(appNameIdIsAdmin);
+                }
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser 3 failed", e);
+            }
+            return appsListWithAdminRole;
+        }
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/service/SearchService.java b/portal-BE/src/main/java/org/onap/portal/service/SearchService.java
new file mode 100644
index 00000000..0829239d
--- /dev/null
+++ b/portal-BE/src/main/java/org/onap/portal/service/SearchService.java
@@ -0,0 +1,179 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
+ *
+ * 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============================================
+ *
+ *
+ */
+
+package org.onap.portal.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.domain.dto.transport.UserWithNameSurnameTitle;
+import org.onap.portal.service.user.FnUserService;
+import org.onap.portal.utils.EcompPortalUtils;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class SearchService {
+
+    EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SearchService.class);
+
+    private static final int maxSizeOfSearchResult = 100;
+
+    private final FnUserService userService;
+
+    @Autowired
+    public SearchService(FnUserService userService) {
+        this.userService = userService;
+    }
+
+    public String searchUsersInPhoneBook(final String searchString) {
+        List<String> tokens = EcompPortalUtils.parsingByRegularExpression(searchString, " ");
+        while (tokens.size() > 2) { // we use no more then first 2 tokens (userId is removed, see above)
+            tokens.remove(tokens.size() - 1);
+        }
+        FnUser attrUser = new FnUser();
+        List<UserWithNameSurnameTitle> resultOfSearch = new ArrayList<UserWithNameSurnameTitle>(), resultOfAdditionalSearch = null,
+            resultOfSearchUserId = new ArrayList<UserWithNameSurnameTitle>();
+        if (tokens.size() == 2) {
+            attrUser.setFirstName(tokens.get(0));
+            attrUser.setLastName(tokens.get(1));
+            resultOfSearch = this.searchUsersByName(attrUser);
+            resultOfSearch = this.removeWrongFirstNames(resultOfSearch, tokens.get(0));
+            resultOfSearch = this.removeWrongLastNames(resultOfSearch, tokens.get(1));
+            if (resultOfSearch.size() < maxSizeOfSearchResult) {
+                attrUser.setFirstName(tokens.get(1));
+                attrUser.setLastName(tokens.get(0));
+                resultOfAdditionalSearch = this.searchUsersByName(attrUser);
+                resultOfAdditionalSearch = this.removeWrongFirstNames(resultOfAdditionalSearch, tokens.get(1));
+                resultOfAdditionalSearch = this.removeWrongLastNames(resultOfAdditionalSearch, tokens.get(0));
+            }
+        } else if (tokens.size() == 1) {
+            attrUser.setFirstName(tokens.get(0));
+            attrUser.setOrgUserId(tokens.get(0));
+            resultOfSearch = this.searchUsersByName(attrUser);
+            resultOfSearchUserId = this.searchUsersByUserId(attrUser);
+            resultOfSearch = this.removeWrongFirstNames(resultOfSearch, tokens.get(0));
+            if (resultOfSearch.size() < maxSizeOfSearchResult) {
+                attrUser.setFirstName(null);
+                attrUser.setLastName(tokens.get(0));
+                resultOfAdditionalSearch = this.searchUsersByName(attrUser);
+                resultOfAdditionalSearch = this.removeWrongLastNames(resultOfAdditionalSearch, tokens.get(0));
+            }
+        }
+        if (resultOfAdditionalSearch != null) {
+            resultOfSearch.addAll(resultOfAdditionalSearch);
+        }
+        resultOfSearch.addAll(resultOfSearchUserId);
+        resultOfSearch.stream().distinct().collect(Collectors.toList());
+        resultOfSearch = this.cutSearchResultToMaximumSize(resultOfSearch);
+        ObjectMapper mapper = new ObjectMapper();
+        String result = "[]";
+        try {
+            result = mapper.writeValueAsString(resultOfSearch);
+        } catch (JsonProcessingException e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "searchUsersInFnTable failed", e);
+        }
+        return result;
+    }
+
+    public List<UserWithNameSurnameTitle> searchUsersByUserId(FnUser attrUser) {
+        List<UserWithNameSurnameTitle> foundUsers = new ArrayList<UserWithNameSurnameTitle>();
+        try {
+            List<FnUser> searchResult = this.userService.getUserByUserId(attrUser.getOrgUserId());
+            for (FnUser user : searchResult) {
+                UserWithNameSurnameTitle foundUser = new UserWithNameSurnameTitle(user.getOrgUserId(), user.getFirstName(), user.getLastName(), user.getJobTitle());
+                foundUsers.add(foundUser);
+            }
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "searchUsersByUserId failed", e);
+        }
+        return foundUsers;
+    }
+
+    public List<UserWithNameSurnameTitle> searchUsersByName(FnUser attrUser) {
+        List<UserWithNameSurnameTitle> foundUsers = new ArrayList<UserWithNameSurnameTitle>();
+        try {
+            List<FnUser> searchResult = this.userService.getUserByFirstLastName(attrUser.getFirstName(),attrUser.getLastName());
+            for (Object obj : searchResult) {
+                FnUser user = (FnUser) obj;
+                UserWithNameSurnameTitle foundUser = new UserWithNameSurnameTitle(user.getOrgUserId(), user.getFirstName(), user.getLastName(), user.getJobTitle());
+                foundUsers.add(foundUser);
+            }
+        } catch (Exception e) {
+            logger.error(EELFLoggerDelegate.errorLogger, "searchUsersByName failed", e);
+        }
+        return foundUsers;
+    }
+
+    private List<UserWithNameSurnameTitle> removeWrongFirstNames(List<UserWithNameSurnameTitle> resultOfSearch, String firstName) {
+        firstName = firstName.toUpperCase();
+        for (int i = resultOfSearch.size() - 1; i >= 0; i--) {
+            UserWithNameSurnameTitle user = resultOfSearch.get(i);
+            if ((user.getFirstName() == null) || !user.getFirstName().toUpperCase().startsWith(firstName)) {
+                resultOfSearch.remove(i);
+            }
+        }
+        return resultOfSearch;
+    }
+
+    private List<UserWithNameSurnameTitle> removeWrongLastNames(List<UserWithNameSurnameTitle> resultOfSearch, String lastName) {
+        lastName = lastName.toUpperCase();
+        for (int i = resultOfSearch.size() - 1; i >= 0; i--) {
+            UserWithNameSurnameTitle user = resultOfSearch.get(i);
+            if ((user.getLastName() == null) || !user.getLastName().toUpperCase().startsWith(lastName)) {
+                resultOfSearch.remove(i);
+            }
+        }
+        return resultOfSearch;
+    }
+
+    private List<UserWithNameSurnameTitle> cutSearchResultToMaximumSize(List<UserWithNameSurnameTitle> resultOfSearch) {
+        if (resultOfSearch.size() > maxSizeOfSearchResult) {
+            resultOfSearch.subList(maxSizeOfSearchResult, resultOfSearch.size()).clear();
+        }
+        return resultOfSearch;
+    }
+}
diff --git a/portal-BE/src/main/java/org/onap/portal/service/app/FnAppService.java b/portal-BE/src/main/java/org/onap/portal/service/app/FnAppService.java
index 13d0911a..1a7c2fa5 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/app/FnAppService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/app/FnAppService.java
@@ -138,4 +138,8 @@ public class FnAppService {
   public List<FnApp> saveAll(List<FnApp> fnApps) {
     return fnAppDao.saveAll(fnApps);
   }
+
+  public List<FnApp> findAll() {
+    return Optional.of(fnAppDao.findAll()).orElse(new ArrayList<>());
+  }
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserDao.java b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserDao.java
index f7a150d3..197b2b28 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserDao.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserDao.java
@@ -68,4 +68,7 @@ interface FnUserDao extends JpaRepository<FnUser, Long> {
        @Query
        Optional<List<FnUser>> getActiveUsers();
 
+       @Query
+       Optional<List<FnUser>> findByFirstNameAndLastName(final @Param("firstName") String firstName, final @Param("lastName") String lastName);
+
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
index 23732d69..7962755f 100644
--- a/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
+++ b/portal-BE/src/main/java/org/onap/portal/service/user/FnUserService.java
@@ -40,12 +40,27 @@
 
 package org.onap.portal.service.user;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.onap.portal.domain.db.fn.FnUser;
+import org.onap.portal.utils.EPCommonSystemProperties;
+import org.onap.portal.utils.EPSystemProperties;
+import org.onap.portalsdk.core.domain.FusionObject.Utilities;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.query.Param;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
@@ -55,66 +70,199 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class FnUserService implements UserDetailsService {
 
-       private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class);
+    private final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FnUserService.class);
 
-       private final FnUserDao fnUserDao;
+    private final FnUserDao fnUserDao;
 
-       @Autowired
-       public FnUserService(FnUserDao fnUserDao) {
-              this.fnUserDao = fnUserDao;
-       }
+    @Autowired
+    public FnUserService(FnUserDao fnUserDao) {
+        this.fnUserDao = fnUserDao;
+    }
 
-       @Override
-       public FnUser loadUserByUsername(final String username) throws UsernameNotFoundException {
-              Optional<FnUser> fnUser = fnUserDao.findByLoginId(username);
-              if (fnUser.isPresent()) {
-                     return fnUser.get();
-              } else {
-                     throw new UsernameNotFoundException("User not found for username: " + username);
-              }
-       }
+    @Override
+    public FnUser loadUserByUsername(final String username) throws UsernameNotFoundException {
+        Optional<FnUser> fnUser = fnUserDao.findByLoginId(username);
+        if (fnUser.isPresent()) {
+            return fnUser.get();
+        } else {
+            throw new UsernameNotFoundException("User not found for username: " + username);
+        }
+    }
 
-       public FnUser saveFnUser(final FnUser fnUser) {
-              return fnUserDao.save(fnUser);
-       }
+    public FnUser saveFnUser(final FnUser fnUser) {
+        return fnUserDao.save(fnUser);
+    }
 
-       public Optional<FnUser> getUser(final Long id) {
-              return Optional.of(fnUserDao.getOne(id));
-       }
+    public Optional<FnUser> getUser(final Long id) {
+        return Optional.of(fnUserDao.getOne(id));
+    }
 
-       public List<FnUser> getUserWithOrgUserId(final String orgUserIdValue) {
-              return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
-       }
+    public List<FnUser> getUserWithOrgUserId(final String orgUserIdValue) {
+        return fnUserDao.getUserWithOrgUserId(orgUserIdValue).orElse(new ArrayList<>());
+    }
 
-       public List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
-              return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
-       }
+    public List<FnUser> getUsersByOrgIds(final List<String> orgIds) {
+        return fnUserDao.getUsersByOrgIds(orgIds).orElse(new ArrayList<>());
+    }
 
-       public List<FnUser> getActiveUsers() {
-              return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
-       }
+    public List<FnUser> getActiveUsers() {
+        return fnUserDao.getActiveUsers().orElse(new ArrayList<>());
+    }
 
-       public void deleteUser(final FnUser fnUser) {
-              fnUserDao.delete(fnUser);
-       }
+    public void deleteUser(final FnUser fnUser) {
+        fnUserDao.delete(fnUser);
+    }
 
-       public boolean existById(final Long userId) {
-              return fnUserDao.existsById(userId);
-       }
+    public boolean existById(final Long userId) {
+        return fnUserDao.existsById(userId);
+    }
 
-       public List<FnUser> findAll() {
-              return fnUserDao.findAll();
-       }
+    public List<FnUser> findAll() {
+        return fnUserDao.findAll();
+    }
 
-       public List<FnUser> saveAll(final List<FnUser> fnUsers) {
-              return fnUserDao.saveAll(fnUsers);
-       }
+    public List<FnUser> saveAll(final List<FnUser> fnUsers) {
+        return fnUserDao.saveAll(fnUsers);
+    }
 
-       public FnUser save(final FnUser user) {
-              return fnUserDao.save(user);
-       }
+    public FnUser save(final FnUser user) {
+        return fnUserDao.save(user);
+    }
 
-       public void delete(final FnUser user) {
-              fnUserDao.delete(user);
-       }
+    public void delete(final FnUser user) {
+        fnUserDao.delete(user);
+    }
+
+    public List<FnUser> findByFirstNameAndLastName(final String firstName, final String lastName) {
+        return fnUserDao.findByFirstNameAndLastName(firstName, lastName).orElse(new ArrayList<>());
+    }
+
+    public List<FnUser> getUserByUserId(String userId) {
+        if (SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM).trim().equalsIgnoreCase("OIDC")) {
+            List<FnUser> users = new ArrayList<>();
+            List<FnUser> filterdUsers = new ArrayList<>();
+            BufferedReader in = null;
+            HttpURLConnection con = null;
+            try {
+                String url = EPSystemProperties.getProperty(EPSystemProperties.AUTH_USER_SERVER);
+                URL obj = new URL(url);
+
+                con = (HttpURLConnection) obj.openConnection();
+
+                // optional default is GET
+                con.setRequestMethod("GET");
+                con.setConnectTimeout(3000);
+                con.setReadTimeout(8000);
+
+                StringBuffer response = new StringBuffer();
+
+                in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
+                String inputLine;
+                while ((inputLine = in.readLine()) != null) {
+                    response.append(inputLine);
+                }
+                JSONObject jObject = new JSONObject(response.toString()); // json
+                JSONArray jsonUsers = jObject.getJSONArray("response"); // get data object
+                for (int i = 0; i < jsonUsers.length(); i++) {
+                    JSONObject eachObject = jsonUsers.getJSONObject(i);
+                    FnUser eachUser = new FnUser();
+                    eachUser.setOrgUserId(eachObject.get("id").toString());// getString("id"));
+                    eachUser.setFirstName(eachObject.get("givenName").toString());
+                    eachUser.setLastName(eachObject.get("familyName").toString());
+                    eachUser.setEmail(eachObject.get("email").toString());
+                    users.add(eachUser);
+                }
+
+                for (FnUser user : users) {
+
+                    if (Utilities.nvl(userId).length() > 0) {
+                        if (!userId.equalsIgnoreCase(user.getOrgUserId())) {
+                            continue;
+                        }
+                    }
+                    filterdUsers.add(user);
+
+                }
+
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId failed", e);
+            } finally {
+                try {
+                    if (in != null) {
+                        in.close();
+                    }
+                    con.disconnect();
+                } catch (IOException e) {
+                    logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId 2 failed", e);
+                }
+            }
+            return filterdUsers;
+        } else {
+            List<FnUser> list = this.getUserWithOrgUserId(userId);
+            return (list == null || list.size() == 0) ? null : list;
+        }
+
+    }
+
+    public List<FnUser> getUserByFirstLastName(String firstName, String lastName) {
+        if (!SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM).trim().equalsIgnoreCase("OIDC")) {
+            List<FnUser> list = this.findByFirstNameAndLastName(firstName, lastName);
+            return (list == null || list.size() == 0) ? null : list;
+        } else {
+            List<FnUser> users = new ArrayList<>();
+            List<FnUser> filterdUsers = new ArrayList<>();
+            BufferedReader in = null;
+            HttpURLConnection con = null;
+            try {
+                String url = EPCommonSystemProperties.getProperty(EPCommonSystemProperties.AUTH_USER_SERVER);
+                URL obj = new URL(url);
+                con = (HttpURLConnection) obj.openConnection();
+                con.setRequestMethod("GET");
+                con.setConnectTimeout(3000);
+                con.setReadTimeout(8000);
+                StringBuffer response = new StringBuffer();
+                in = new BufferedReader(new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8));
+                String inputLine;
+                while ((inputLine = in.readLine()) != null) {
+                    response.append(inputLine);
+                }
+                JSONObject jObject = new JSONObject(response.toString());
+                JSONArray jsonUsers = jObject.getJSONArray("response");
+                for (int i = 0; i < jsonUsers.length(); i++) {
+                    JSONObject eachObject = jsonUsers.getJSONObject(i);
+                    FnUser eachUser = new FnUser();
+                    eachUser.setOrgUserId(eachObject.get("id").toString());
+                    eachUser.setFirstName(eachObject.get("givenName").toString());
+                    eachUser.setLastName(eachObject.get("familyName").toString());
+                    eachUser.setEmail(eachObject.get("email").toString());
+                    users.add(eachUser);
+                }
+                for (FnUser user : users) {
+                    if (Utilities.nvl(firstName).length() > 0) {
+                        if (!firstName.equalsIgnoreCase(user.getFirstName())) {
+                            continue;
+                        }
+                    }
+                    if (Utilities.nvl(lastName).length() > 0) {
+                        if (!lastName.equalsIgnoreCase(user.getLastName())) {
+                            continue;
+                        }
+                    }
+                    filterdUsers.add(user);
+                }
+            } catch (Exception e) {
+                logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed", e);
+            } finally {
+                try {
+                    if (in != null) {
+                        in.close();
+                        con.disconnect();
+                    }
+                } catch (IOException e) {
+                    logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed to close", e);
+                }
+            }
+            return filterdUsers;
+        }
+    }
 }
diff --git a/portal-BE/src/main/java/org/onap/portal/utils/EPSystemProperties.java b/portal-BE/src/main/java/org/onap/portal/utils/EPSystemProperties.java
new file mode 100644
index 00000000..9db97ce7
--- /dev/null
+++ b/portal-BE/src/main/java/org/onap/portal/utils/EPSystemProperties.java
@@ -0,0 +1,61 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
+ *
+ * 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============================================
+ *
+ *
+ */
+
+package org.onap.portal.utils;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.PropertySources;
+
+@Configuration
+@PropertySources({
+    @PropertySource("classpath:/WEB-INF/conf/system.properties"),
+    @PropertySource("classpath:/WEB-INF/conf/sql.properties"),
+    @PropertySource("classpath:/WEB-INF/fusion/conf/fusion.properties"),
+   //@PropertySource(value = "file:${catalina.home}/conf/system.properties", ignoreResourceNotFound = true),
+   //@PropertySource(value = "file:${catalina.home}/conf/fusion.properties", ignoreResourceNotFound = true)
+})
+
+public class EPSystemProperties extends EPCommonSystemProperties {
+
+    public static final String CONTACT_US_URL = "contact_us_link";
+    public static final String ECOMP_CONTEXT_ROOT = "context_root";
+
+}
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/cache.ccf b/portal-BE/src/main/resources/WEB-INF/conf/cache.ccf
new file mode 100644
index 00000000..b8a2363d
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/cache.ccf
@@ -0,0 +1,30 @@
+# DEFAULT CACHE REGION
+jcs.default=DC
+jcs.default.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.default.cacheattributes.MaxObjects=1000
+jcs.default.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
+jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
+jcs.default.elementattributes.IsEternal=true
+jcs.default.elementattributes.IsSpool=true
+
+
+# MEMORY SHRINKING CONFIGURATION (Commented)
+#jcs.default.cacheattributes.UseMemoryShrinker=true
+#jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
+#jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+#jcs.default.cacheattributes.MaxSpoolPerRun=500
+#jcs.default.elementattributes=org.apache.jcs.engine.ElementAttributes
+#jcs.default.elementattributes.IsEternal=false
+
+
+# AUXILLARY CACHE CONFIGURATION
+jcs.auxiliary.DC=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
+jcs.auxiliary.DC.attributes=org.apache.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
+jcs.auxiliary.DC.attributes.DiskPath=fusion/cache
+
+
+# PRE-DEFINED REGION FOR LOOKUP DATA
+jcs.region.lookUpObjectCache=DC
+jcs.region.lookUpObjectCache.cacheattributes=org.apache.jcs.engine.CompositeCacheAttributes
+jcs.region.lookUpObjectCache.cacheattributes.MaxObjects=4000
+jcs.region.lookUpObjectCache.cacheattributes.MemoryCacheName=org.apache.jcs.engine.memory.lru.LRUMemoryCache
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/quartz.properties b/portal-BE/src/main/resources/WEB-INF/conf/quartz.properties
new file mode 100644
index 00000000..12b731a1
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/quartz.properties
@@ -0,0 +1,73 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+#################################################################################
+# Quartz configurations for Quantum Work Flow									#
+#################################################################################
+
+org.quartz.scheduler.instanceId = AUTO
+
+#################################################################################
+# Main configurations
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 30
+
+============================================================================
+# Configure JobStore  
+#============================================================================
+
+org.quartz.jobStore.misfireThreshold = 60000
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.jobStore.useProperties = false
+#org.quartz.jobStore.dataSource = myDS
+org.quartz.jobStore.tablePrefix = FN_QZ_
+
+org.quartz.jobStore.isClustered = true
+org.quartz.jobStore.clusterCheckinInterval = 20000
+
+#============================================================================
+# Configure Datasources  
+#============================================================================
+
+#org.quartz.dataSource.myDS.driver = com.mysql.jdbc.Driver
+#org.quartz.dataSource.myDS.URL = jdbc:mysql://localhost:3306/portal
+#org.quartz.dataSource.myDS.user = todo
+#org.quartz.dataSource.myDS.password = todo
+#org.quartz.dataSource.myDS.maxConnections = 5
+#org.quartz.dataSource.myDS.validationQuery=select 0 from dual
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/raptor.properties b/portal-BE/src/main/resources/WEB-INF/conf/raptor.properties
new file mode 100644
index 00000000..34bc8c99
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/raptor.properties
@@ -0,0 +1,203 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+##C## Mention the name of the framework. At present RAPTOR supports FUSION
+system=fusion
+##C## Determines the priority for the debug message.
+debug_level=5
+##C## Determines the number of records can be downloaded in excel when you select "download all" option.
+download_limit=65000
+csv_download_limit=10
+##C## Determines the number of records to be displayed in a single page.
+default_page_size=50
+##C## Determines the list size in the form field.
+form_fields_list_size=99000
+##C## Determines the scheduler interval
+#scheduler_interval=0 => disabled
+scheduler_interval=0
+##C## System Name
+system_name=RAPTOR
+##C## This is used for Bread crumbs.
+base_title=ANALYSIS
+##C## whether to allow SQL-based report definition (security risk); super users are always allowed to create SQL-based reports
+allow_sql_based_reports=no
+##C## Determines whether to include disclaimer page at the bottom of each screen
+show_disclaimer=yes
+disclaimer_positioned_top_in_csvexcel=yes
+##C## Determines whether to display the form page as a separate page before running the report
+display_form_before_run=yes
+##C## Determines whether to include the form page on the report data page
+include_form_with_data=yes
+##C## Determines whether to cache chart data in the session => faster re-display if the data volume does not get too large
+cache_chart_data=yes
+##C## Determines whether to cache report data for the currently displayed page in the session => faster re-display
+	##C## if the data volume does not get too large
+cache_cur_page_data=yes
+##C## Determines Chart width
+default_chart_width=700
+##C## Determines Chart height
+default_chart_height=420
+##C## Determines whether to permit report deletion only by report owner or by everyone with "write" access
+delete_only_by_owner=yes
+##C## Determines whether to log each report execution and update time and user ID
+enable_report_log=yes
+##C## Determines whether to cache user roles info in memory (saves many DB reads, but does not account for roles
+	##C## assigned after the cache was loaded)
+cache_user_roles=yes
+##C## Determines whether to convert month formats (e.g. MM/YYYY) to the last day of the month (true) or
+        ##C## first day (false) - like 12/2003 is converted to either 12/31/2003 or 12/01/2003
+month_format_use_last_day=no
+##C## Determines whether to print the report title in the download files
+print_title_in_download=yes
+##C## Determines whether to show report description when the report is run and in the quick links
+show_descr_at_runtime=no
+##C## Determines whether to skip labels on the Line chart axis when they overlap
+#DEPRECATED skip_chart_labels_to_fit=no
+##C## Determines whether to show chart types that are purpose and/or data specific
+show_nonstandard_charts=yes
+##C## Determines whether to allow the user to change the chart type at runtime
+allow_runtime_chart_sel=yes
+##C## Determines whether to display the report title as chart title as well
+display_chart_title=yes
+##C## Determines whether to merge/blank multi-level row headings in cross-tab report
+merge_crosstab_row_headings=yes
+##C## Determines whether to display chart when displaying the report at first or just a "Show Chart" button
+display_chart_by_default=yes
+##C## Determines whether to print the form field values in the download files
+print_params_in_download=yes
+##C## Determines the limitation to the characters in chart label.
+skip_chart_labels_limit=30
+##C## Determines whether to users with read-only rights for a report can copy it
+can_copy_on_read_only=yes
+##C## Determines the no of decimals to be displayed in Totals column
+#max_decimals_on_totals=-1 => don't truncate, display all decimal digits
+max_decimals_on_totals=2
+##C## Determines which JFreeChart to use.
+jfree_version=latest
+#jfree_version=0.9.11
+# Added this restriction so that heavily used system which contain
+# more than 1000 users can enable this feature not to display whole
+# users in the drop down menu
+display_all_users=yes
+##Sheet name
+sheet_name=raptor
+#shell_script_name=/home/sundar/test.sh
+#download_query_folder=/titan/PROJECT3/RAPTOR/raptor/dwnld/query/
+## this directory is mentioned if the flat file is downloaded using shell script
+shell_script_dir=/titan/PROJECT3/RAPTOR/raptor/dwnld/
+flat_file_lower_limit=1
+flat_file_upper_limit=200000
+## whatever request mentioned here would be parsed in sql and request parameter would be filled
+request_get_params=c_master,isEmbedded
+print_footer_in_download=yes
+## footer mentioned here appears in downloaded excel
+footer_first_line=Raptor
+footer_second_line=Use Pursuant to Company Instructions
+## to run report in popup window
+report_in_popup_window=yes
+## to run each report in new popup window if the above is selected
+popup_in_new_window=yes
+## "Yes" allows the request param to be passed to the drill down report
+pass_request_param_in_drilldown=yes
+## Show PDF download icon
+show_pdf_download=yes
+# Show Folder Tree
+show_folder_tree=no
+#Show folder tree only for Admin Users
+show_folder_tree_only_to_admin_users=no
+#folder tree should be minimized
+folder_tree_minimized=yes
+## whatever session mentioned here would be parsed in sql and session parameter would be filled
+session_params=login_id
+display_formfield_info=yes
+customize_formfield_info=yes
+#schedule limit for end users
+schedule_limit=10
+# customized query if you need any restrictions for schedule and security tab for fusion
+#schedule_custom_query_for_users=getAllUsersByCustomer
+#schedule_custom_query_for_roles=getAllRolesByCustomer
+# customized query if you need any restrictions for schedule and security tab for prisms example
+#schedule_custom_query_for_users=SELECT au.user_id, au.first_name||' '||au.last_name user_name FROM app_user au order by 2
+schedule_custom_query_for_users=SELECT au.user_id id, au.first_name||' '||au.last_name name FROM app_user au where user_id = 1 order by 2
+#schedule_custom_query_for_roles=SELECT ar.role_id, ar.descr role_name FROM app_role ar order by 2
+schedule_date_pattern=MM/dd/yyyy hh:mm:ss a
+## This is used to display in right format in chart timestamp axis as we give in the sql
+#chart_yearly_format=yyyy
+#chart_monthly_format=MMM-yyyy
+#chart_daily_format=MM-dd-yyyy
+chart_hourly_format=MM/dd HH
+#chart_minute_format=HH:mm
+chart_minute_format=MM-dd-yyyy-HH:mm
+#chart_second_format=HH:mm:ss
+chart_second_format=MM-dd-yyyy
+#chart_millisecond_format=HH:mm:ss.S
+schedule_help_text=This form is used to schedule a specific Reporting Platform report to be delivered to one or more email addresses associated with your Company's Business Direct user logins.  Note that report output delivered via email does not include the capability to drill down/back up to additional data levels.  So, select the appropriate data level report for the scheduled report.  View the status of scheduled report requests in the My Schedules menu item.
+use_loginid_in_schedYN=Y
+session_params_for_scheduling=login_id
+session_date_formfield_auto_incr=yes
+display_session_param_pdfexcel=login_id;Login Id
+session_params_for_displaying_in_scheduling=login_id;Login Id
+application_server=tomcat
+#gmap properties
+gmap_key=ABQIAAAAToJSSetKBMjBJx8MiRw4ghQiU0SbbKnm8C5eu25cpyLwgkLzyRShrQTbgZtqnKAqZU9JwcSq1bKwiA
+PROJECT-FOLDER=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0
+# 
+MARKET-SHAPEFILE-FOLDER=resources/files
+# output folder for files generated on server side
+OUTPUT-FOLDER=resources/temp
+# tile size in pixel
+TILE-SIZE=256
+#check if map is disabled or not
+map_allowed=Y
+max_drilldown_level=2
+admin_role_equiv_to_super_role=N
+show_loading_during_formfield_chain=Y
+show_print_icon=N
+globally_nowrap=N
+calendar_output_date_format=MM/dd/yyyy
+memory_threshold_percentage=99
+print_params_in_csv_download=yes
+notitle_in_dashboard=yes
+generate_store_sched_reports=yes
+show_excel_2007_download=yes
+print_excel_in_landscape=yes
+show_animated_chart_option=yes
+show_animated_chart_only=no
+adjust_content_based_on_height=yes
+custom_submit_button_text=Run Button
+customize_formfield_layout=yes
+db_type=postgresql
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/raptor_app_fusion.properties b/portal-BE/src/main/resources/WEB-INF/conf/raptor_app_fusion.properties
new file mode 100644
index 00000000..8c9190c2
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/raptor_app_fusion.properties
@@ -0,0 +1,54 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+temp_folder_path=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0/temp/
+upload_folder_path=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0/files/
+excel_template_path=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0/files/raptor_template/
+temp_folder_url=temp/
+upload_folder_url=upload/
+smtp_server=todo_url
+default_email_sender=dev-local@email.com
+error_page=error_page.jsp
+jsp_context_path=raptor/
+img_folder_url=static/fusion/raptor/images/
+base_folder_url=static/fusion/raptor/
+direct_access_url=http://localhost:8080/quantum/raptor_email_attachment.htm?action=raptor&source_page=report_run&display_content=y
+base_action_url=raptor.htm?action=
+base_action_param=c_master=
+super_role_id=1
+admin_role_ids=1
+quick_links_menu_ids=HOME,CUSTOMER,REPORTS
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/raptor_db_fusion.properties b/portal-BE/src/main/resources/WEB-INF/conf/raptor_db_fusion.properties
new file mode 100644
index 00000000..a0c26f75
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/raptor_db_fusion.properties
@@ -0,0 +1,37 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/raptor_pdf.properties b/portal-BE/src/main/resources/WEB-INF/conf/raptor_pdf.properties
new file mode 100644
index 00000000..f5117690
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/raptor_pdf.properties
@@ -0,0 +1,67 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+## pdf file specific properties
+pdf_data_font_size=9
+pdf_data_font_family=Arial
+#reduce the font size from html config
+pdf_data_font_size_offset=2
+pdf_data_alternate_color=true
+#data row background(white), alternate(light light blue/gray)
+pdf_data_background_alternate_hex_code=#EDEDED
+pdf_data_default_background_hex_code=#FFFFFF
+#header font (white)  background (gray)
+pdf_data_table_header_font_hex_code=#FFFFFF
+pdf_data_table_header_background_hex_code=#8A9BB3
+#footer header
+pdf_footer_font_size=9
+pdf_footer_font_family=Arial
+pdf_proprietary=xxxx
+pdf_proprierary_font_size=7
+pdf_date_timezone=GMT
+pdf_date_pattern=MM/dd/yyyy hh:mm:ss a
+##page number position at 1 - footer middle, 0 -- header right, 2 - both
+pdf_page_number_position=1
+pdf_word_before_page_number=Page
+pdf_word_after_page_number=
+pdf_coverpage_firstcolumn_size=0.3
+pdf_image_auto_rotate=false
+display_create_owner_info=true
+#session_info=customer,customerId
+display_loginid_for_downloaded_by=false
+# please use false if you want landscape to be default.
+is_default_orientation_portrait=true
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/scheduler.properties b/portal-BE/src/main/resources/WEB-INF/conf/scheduler.properties
new file mode 100644
index 00000000..ce52554c
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/scheduler.properties
@@ -0,0 +1,61 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+
+
+##scheduler authentication credentials
+scheduler.user.name=test1
+scheduler.password=test2
+#scheduler properties
+scheduler.server.url=http://mtanjv9sdlg10.aic.cip.onap.com:8989/scheduler
+scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/
+scheduler.get.time.slots=/v1/ChangeManagement/schedules/
+scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals
+vid.truststore.filename=C:\\Temp\\vid_keystore.jks
+vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi
+
+#scheduler-policy properties
+policy.server.url=https://policypdp-conexus-e2e.ecomp.cci.onap.com:8081/pdp
+policy.get.config=/api/getConfig
+policy.ClientAuth=UHlQRFBTZXJ2ZXI6dGVzdA==
+policy.client.mechId=m06814@controller.dcae.ecomp.onap.com
+policy.client.password=OBF:1ffu1qvu1t2z1l161fuk1i801nz91ro41xf71xfv1rqi1nx51i7y1fuq1kxw1t371qxw1fh0
+policy.username=testpdp
+policy.password=OBF:1igd1kft1l1a1sw61svs1kxs1kcl1idt
+policy.Authorization=dGVzdHBkcDphbHBoYTEyMw==
+policy.environment=TEST
+
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/sql.properties b/portal-BE/src/main/resources/WEB-INF/conf/sql.properties
new file mode 100644
index 00000000..8663cd44
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/sql.properties
@@ -0,0 +1,300 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+#SQL Statements for PostgreSQL
+
+#ReportLoader.java
+
+load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=?::int
+
+db.update.report.xml = SELECT cr.rep_id, cr.report_xml FROM cr_report cr WHERE rep_id=? FOR UPDATE
+
+update.custom.report.rec = UPDATE cr_report SET title='[Utils.oracleSafe(rw.getReportName())]', descr='[Utils.oracleSafe(rw.getReportDescr())]', public_yn='[(rw.isPublic()]', menu_id='[rw.getMenuID()]', menu_approved_yn='[(rw.isMenuApproved()]', owner_id=[rw.getOwnerID()], maint_id=[rw.getUpdateID()], maint_date=TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), dashboard_type_yn='[(rw.isDashboardType()]', dashboard_yn= '[(rw.getReportType().equals(AppConstants.RT_DASHBOARD)]' WHERE rep_id = [rw.getReportID()]
+
+is.report.already.scheduled = select rep_id from cr_report_schedule where rep_id = ?::int
+
+create.custom.report.rec = INSERT INTO cr_report(rep_id, title, descr, public_yn, menu_id, menu_approved_yn, report_xml, owner_id, create_id, create_date, maint_id, maint_date, dashboard_type_yn, dashboard_yn, folder_id) VALUES([rw.getReportID()], '[Utils.oracleSafe(rw.getReportName())]', '[Utils.oracleSafe(rw.getReportDescr())]', '[rw.isPublic()]', '[rw.getMenuID()]', '[rw.isMenuApproved()]', '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>', [rw.getOwnerID()], [rw.getCreateID()], TO_DATE('[rw.getCreateDate()]', '[Globals.getOracleTimeFormat()]'), [rw.getUpdateID()], TO_DATE('[rw.getUpdateDate()]', '[Globals.getOracleTimeFormat()]'), '[rw.isDashboardType()]', '[rw.getReportType().equals(AppConstants.RT_DASHBOARD)]',[rw.getFolderId()]) 
+
+get.user.report.names = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE coalesce(cr.owner_id, cr.create_id) = [userID]							
+								
+get.report.owner.id = SELECT coalesce(cr.owner_id, cr.create_id) AS owner FROM cr_report cr WHERE rep_id = ?::int						
+
+delete.report.record.log = DELETE FROM cr_report_log WHERE rep_id = [reportID]
+
+delete.report.record.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]
+
+delete.report.record.schedule = DELETE FROM cr_report_schedule WHERE rep_id = [reportID]
+
+delete.report.record.access = DELETE FROM cr_report_access WHERE rep_id = [reportID]
+
+delete.report.record.email = DELETE FROM cr_report_email_sent_log WHERE rep_id = [reportID]
+
+delete.report.record.favorite = DELETE FROM cr_favorite_reports WHERE rep_id = [reportID]
+
+delete.report.record.report = DELETE FROM cr_report WHERE rep_id = [reportID]
+																						
+load.quick.links =  SELECT cr.rep_id, cr.title, cr.descr FROM (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra LEFT JOIN cr_report cr ON cr.rep_id = ra.rep_id WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND cr.menu_approved_yn = 'Y' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) ORDER BY cr.title
+
+load.folder.reports = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] || CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END||cr.title||'</a>' title, cr.descr, au.first_name||' '||au.last_name owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN app_user au ON coalesce(cr.owner_id, cr.create_id) = au.user_id AND cr.folder_id= '[folderId]' LEFT JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL(SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id
+#If roleList.toString() is '' PostgreSQL returns an error - needs to be null instead of empty
+
+load.folder.reports.user = AND coalesce(cr.owner_id, cr.create_id) = [userID]	
+
+load.folder.reports.publicsql = AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.quick.download.links = SELECT a.file_name, b.title,to_char(a.dwnld_start_time, 'Dy DD-Mon-YYYY HH24:MI:SS') as time, a.dwnld_start_time FROM cr_report_dwnld_log a, cr_report b where a.user_id = [userID] and a.rep_id = b.rep_id and (a.dwnld_start_time) >= to_date(to_char(now()- interval '1 day', 'mm/dd/yyyy'), 'mm/dd/yyyy') and a.record_ready_time is not null order by a.dwnld_start_time
+
+load.reports.to.schedule = SELECT cr.rep_id, Initcap(cr.title), cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL or cr.owner_id = [userID] )ORDER BY Initcap(cr.title)
+		
+load.reports.to.add.in.dashboard = SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) AND (cr.dashboard_yn = 'N' or cr.dashboard_yn is null) ORDER BY cr.title
+
+load.my.recent.links = select rep_id, title, descr, form_fields from ( select row_number() OVER () AS rnum, rep_id, title, descr, form_fields from  (select cr.rep_id, cr.title, a.form_fields,  cr.descr, a.log_time, a.user_id, a.action, a.action_value from cr_report_log a, cr_report cr where user_id = [userID] AND action = 'Report Execution Time' and a.rep_id = cr.rep_id order by log_time desc) AS x) AS y where rnum <= 6 AND rnum >= 1
+
+create.report.log.entry = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], now(), [userID], '[action]' , '[executionTime]', '[form_fields]')
+
+create.report.log.entry.exec.time = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], now()+'1 second', [userID], '[action]' , '[executionTime]', '[formFields]')
+
+clear.report.log.entries = DELETE FROM cr_report_log WHERE rep_id = ? and user_id = ?
+
+load.report.log.entries = SELECT x.log_time, x.user_id, (CASE WHEN x.action = 'Report Execution Time' THEN  '<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master='||x.rep_id||'&'||x.form_fields||'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\">'||x.action||'</a>' ELSE x.action END) action, (CASE WHEN x.action = 'Report Execution Time' THEN  action_value  ELSE 'N/A' END) time_taken, (CASE WHEN x.action = 'Report Execution Time' THEN '<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master='||x.rep_id||'&'||x.form_fields||'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\"><img src=\"[AppUtils.getImgFolderURL()]test_run.gif\" width=\"12\" height=\"12\" border=0 alt=\"Run report\"/></a>' ELSE 'N/A' END) run_image, x.name FROM  (SELECT rl.rep_id, TO_CHAR(rl.log_time, 'Month DD, YYYY HH:MI:SS AM') log_time, rl.action_value, fuser.last_name ||', '||fuser.first_name name, rl.user_id, rl.action, rl.form_fields FROM cr_report_log rl, fn_user fuser WHERE rl.rep_id = [nvls(reportId)] and rl.action != 'Report Run' and fuser.user_id = rl.user_id ORDER BY rl.log_time DESC) x WHERE LIMIT 100
+
+does.user.can.schedule.report = select crs.sched_user_id, count(*) from cr_report_schedule crs where sched_user_id = [userId] group by crs.sched_user_id having count(*) >= [Globals.getScheduleLimit()]
+
+does.user.can.schedule = select crs.schedule_id from cr_report_schedule crs where schedule_id = [scheduleId]
+
+get.system.date.time = select to_char(now(),'MM/dd/yyyy HH24:mi:ss')
+
+get.next.day.date.time = select to_char(now()+'1 day','MM/dd/yyyy HH24:mi:ss')
+
+get.next.fifteen.minutes.date.time = select to_char(now()+'15 min','MM/dd/yyyy HH24:mi:ss')
+
+get.next.thirty.minutes.date.time = select to_char(now()+'30 min','MM/dd/yyyy HH24:mi:ss')
+
+get.template.file = select template_file from cr_report_template_map where report_id = [reportId]
+
+load.pdf.img.lookup = select image_id, image_loc from cr_raptor_pdf_img
+
+load.action.img.lookup = select image_id, image_loc from cr_raptor_action_img
+
+
+#ActionHandler.java
+
+report.values.map.def.a = SELECT x FROM (SELECT DISTINCT 
+
+report.values.map.def.b = TO_CHAR([colName], '[nvl(displayFormat, AppConstants.DEFAULT_DATE_FORMAT)]')
+
+report.values.map.def.c = [colName] 
+
+report.values.map.def.d =  x FROM [rdef.getTableById(tableId).getTableName()] WHERE [colName] IS NOT NULL ORDER BY 1) xx LIMIT <= [Globals.getDefaultPageSize()]
+
+test.sched.cond.popup = SELECT 1 WHERE EXISTS ([sql])
+
+download.all.email.sent = Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG where gen_key='[pdfAttachmentKey.trim()]' and log_id =[report_email_sent_log_id.trim()] and (now() - sent_date) < '1 day' limit 1
+
+download.all.gen.key = select schedule_id from cr_report_email_sent_log u where U.GEN_KEY = '[pdfAttachmentKey]'
+
+download.all.retrieve = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.run_date IS NOT NULL  AND rs.schedule_id = [scheduleId]) x, cr_report r, app_user au WHERE x.rep_id = r.rep_id  AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [scheduleId]  UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and  rsu2.schedule_id = [scheduleId]))
+
+download.all.insert = insert into cr_report_dwnld_log (user_id,rep_id,file_name,dwnld_start_time,filter_params) values (?,?,?,?,?)
+
+#ReportWrapper.java
+
+report.wrapper.format = SELECT coalesce(cr.owner_id, cr.create_id) owner_id, cr.create_id, TO_CHAR(cr.create_date, '[Globals.getOracleTimeFormat()]') create_date, maint_id, TO_CHAR(cr.maint_date, '[Globals.getOracleTimeFormat()]') update_date, cr.menu_id, cr.menu_approved_yn FROM cr_report cr WHERE cr.rep_id= [reportID]
+
+generate.subset.sql = SELECT [colNames.toString()] FROM (SELECT row_number() OVER () AS rnum, [colNames.toString()] FROM ([reportSQL]) AS x ) AS y 
+
+report.sql.only.first.part = SELECT row_number() OVER () AS rnum, [colNames.toString()] FROM (SELECT row_number() OVER () AS rnum, [colNames.toString()] FROM (
+
+report.sql.only.second.part.a = WHERE rnum <= [endRow] 
+
+report.sql.only.second.part.b =  AND rnum >= [startRow] ORDER BY rnum
+
+report.sql.only.second.part.b.noorderby =  AND rnum >= [startRow]
+
+generate.sql.visual.select = SELECT
+
+generate.sql.visual.count = COUNT(*) cnt
+
+generate.sql.visual.dual = 
+#No DUAL table in PostgreSQL so this is blank
+
+#ReportRuntime.java
+
+load.crosstab.report.data = SELECT row_number() OVER () AS rnum, [colNames.toString()] FROM ( [reportSQL] 
+
+#RaptorRunHandler.java
+
+generate.sql.handler = SELECT row_number() OVER () AS rnum, x.* from ([sql]) AS x LIMIT 2
+
+generate.sql.select = SELECT [colNames.toString()] FROM (SELECT row_number() OVER () AS rnum, [colNames.toString()] FROM ([sql]) AS y) AS x 
+			
+#ReportSchedule.java
+
+load.schedule.data = SELECT rs.enabled_yn, TO_CHAR(rs.start_date, 'MM/DD/YYYY') start_date, TO_CHAR(rs.end_date, 'MM/DD/YYYY') end_date, TO_CHAR(rs.run_date, 'MM/DD/YYYY') run_date, coalesce(TO_CHAR(rs.run_date, 'HH'), '12') run_hour, coalesce(TO_CHAR(rs.run_date, 'MI'), '00') run_min, coalesce(TO_CHAR(rs.run_date, 'AM'), 'AM') run_ampm, rs.recurrence, rs.conditional_yn, rs.notify_type, rs.max_row, rs.initial_formfields, rs.schedule_id, coalesce(TO_CHAR(rs.end_date, 'HH'), '11') end_hour, coalesce(TO_CHAR(rs.end_date, 'MI'), '45') end_min, coalesce(TO_CHAR(rs.end_date, 'AM'), 'PM') end_ampm, encrypt_yn, attachment_yn FROM cr_report_schedule rs WHERE rs.rep_id = [reportID]
+
+load.schedule.getid = SELECT rsu.user_id, fuser.last_name||', '||fuser.first_name, fuser.login_id FROM cr_report_schedule_users rsu, fn_user fuser WHERE rsu.rep_id = [reportID]  AND rsu.schedule_id = [getScheduleID()] and rsu.user_id IS NOT NULL and rsu.user_id = fuser.user_id
+
+load.schedule.users = SELECT rsu.role_id FROM cr_report_schedule_users rsu WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] AND rsu.role_id IS NOT NULL
+
+new.schedule.data = SELECT nextval('SEQ_CR_REPORT_SCHEDULE') AS sequence
+
+execute.update = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()]
+
+execute.update.users = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], [emailToUsers.get(i)).getId()], NULL, [(i + 1)])
+
+execute.update.roles = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], NULL, [emailToRoles.get(i)).getId()], [((emailToUsers.size() + i + 1)])
+
+execute.update.activity = INSERT into cr_schedule_activity_log (schedule_id, notes, run_time) values ([getScheduleID()],'Submitted:Schedule',TO_DATE('[getRunDate()] [getRunHour()]:[getRunMin()] [getRunAMPM()]', 'MM/DD/YYYY HH:MI AM'))
+ 
+delete.schedule.data = SELECT 1 FROM cr_report_schedule WHERE rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]  and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.id = DELETE FROM cr_report_schedule where rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+
+load.cond.sql = SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=?::int
+
+load.cond.sql.select = SELECT condition_sql FROM cr_report_schedule WHERE schedule_id = [scheduleId]
+
+persist.cond.sql.update = update cr_report_schedule set condition_large_sql = '' where  schedule_id = [scheduleId]
+#EMPTY CLOB() changed to ''
+
+persist.cond.sql.large = SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE
+
+persist.cond.sql.set = update cr_report_schedule set condition_sql = ? where schedule_id = [scheduleId]
+
+#DataCache.java
+
+get.data.view.actions = SELECT ts.web_view_action FROM cr_table_source ts WHERE ts.web_view_action IS NOT NULL
+
+get.public.report.id.names = SELECT rep_id, title FROM cr_report WHERE public_yn = 'Y' ORDER BY title
+
+get.private.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id not in (select rep_id from cr_report_access cra where user_id =  '[user_id]' 
+
+get.private.accessible.names.if =  OR role_id in (
+
+get.private.accessible.names.b =  ) AND public_yn = 'N' and cr.owner_id = '[user_id]' order by 2 
+
+get.group.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr  WHERE cr.rep_id  in (select rep_id from cr_report_access cra where user_id =  '[user_id]'
+
+get.group.accessible.names.b =  )  AND public_yn = 'N' order by 2 
+
+get.report.table.sources.a = SELECT table_name, display_name, pk_fields, web_view_action, large_data_source_yn, filter_sql FROM cr_table_source 
+
+get.report.table.sources.where =  where SOURCE_DB= '[dBInfo]'
+
+get.report.table.sources.if =  where SOURCE_DB is null or SOURCE_DB = '[AppConstants.DB_LOCAL]'
+
+get.report.table.sources.else =  ORDER BY table_name
+
+grab.report.table.a = SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql FROM cr_table_source ts  WHERE 
+
+grab.report.table.if = ts.SOURCE_DB= '[dBInfo]'
+
+grab.report.table.else = (ts.SOURCE_DB is null or ts.SOURCE_DB = '[AppConstants.DB_LOCAL]')
+
+grab.report.table.b =  except SELECT ts.table_name, ts.display_name, ts.pk_fields,  ts.web_view_action,  ts.large_data_source_yn, ts.filter_sql from cr_table_source ts where table_name in (select table_name from  cr_table_role where role_id not IN [sb.toString()]) and 
+
+grab.report.table.c =  ORDER BY 1 
+
+get.report.table.crjoin = SELECT src_table_name, dest_table_name, join_expr FROM cr_table_join
+
+get.report.table.joins = SELECT tj.src_table_name, tj.dest_table_name, tj.join_expr FROM cr_table_join tj WHERE ((EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name AND trs.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name))) AND ((EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name AND trd.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name)))
+
+generate.report.table.col = SELECT a.table_name, a.column_name, a.data_type, a.label FROM user_column_def a WHERE a.table_name = '[tableName.toUpperCase()]' ORDER BY a.column_id
+
+generate.db.user.sql.a = SELECT utc.table_name, utc.column_name, utc.data_type, 
+
+generate.db.user.sql.if = utc.column_name FROM user_tab_columns utc 
+
+generate.db.user.sql.else = coalesce(x.label, utc.column_name) FROM user_tab_columns utc 
+
+generate.db.user.sql.b = WHERE utc.table_name = '[tableName.toUpperCase()]' 
+
+generate.db.user.sql.c = AND utc.table_name = x.table_name AND utc.column_name = x.column_name 
+
+generate.db.user.sql.d = ORDER BY utc.column_id 
+
+#SearchHandler.java
+
+load.report.search.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] || CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END || cr.title ||'</a>' title, cr.descr, au.first_name||' '||au.last_name owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn, case when report_xml like '%<allowSchedule>N</allowSchedule>%' then 'N' when report_xml like '%<allowSchedule>Y</allowSchedule>%' or 1 = (select distinct 1 from cr_report_schedule where rep_id = cr.rep_id) then 'Y' else 'N' end FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id AND TO_CHAR(cr.rep_id, 'FM99999999') like coalesce('%[fReportID]%', TO_CHAR(cr.rep_id, 'FM99999999')) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
+
+load.report.search.instr = WHERE cr.menu_id LIKE '%[menuId]%'
+
+load.report.search.result.user = WHERE coalesce(cr.owner_id, cr.create_id) = [userID]
+
+load.report.search.result.public = WHERE (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.report.search.result.fav =  WHERE cr.rep_id in (select rep_id from cr_favorite_reports where user_id = [userID]
+
+load.report.search.result.sort = ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN 'upper(au.first_name||' '||au.last_name)' ELSE 'upper(cr.title)' END
+
+load.folder.report.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] || CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END || cr.title || '</a>' title, cr.descr, au.first_name||' '||au.last_name owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id AND TO_CHAR(cr.rep_id, 'FM99999999') like coalesce('%[fReportID]%', TO_CHAR(cr.rep_id, 'FM99999999')) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
+
+load.folder.report.result.sort =  ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN '(au.first_name||' '||au.last_name)' ELSE 'cr.title' END
+
+#WizardProcessor.java
+
+process.filter.add.edit = '[argValue]'
+
+#ReportDefinition.java
+
+persist.report.adhoc = SELECT nextval('[Globals.getAdhocReportSequence()]') AS sequence
+
+#Globals.java
+
+initialize.roles = SELECT 1 WHERE EXISTS (SELECT 1 FROM cr_table_role)
+
+initialize.version = SELECT cr_raptor.get_version
+
+# scheduler
+
+
+scheduler.available.schedules = SELECT x.rep_id, x.schedule_id, x.conditional_yn, x.condition_large_sql, x.notify_type, x.max_row, x.initial_formfields, x.processed_formfields, r.title, x.user_id FROM ( SELECT rs.rep_id, rs.schedule_id, rs.sched_user_id user_id, rs.conditional_yn, rs.condition_large_sql, rs.notify_type, rs.max_row, rs.initial_formfields, rs.processed_formfields  FROM cr_report_schedule rs  WHERE rs.enabled_yn='Y'  AND rs.start_date <= [currentDate]  AND  (rs.end_date >= [currentDate] or rs.end_date is null )  AND rs.run_date IS NOT NULL  ) x, cr_report r  WHERE x.rep_id = r.rep_id
+
+random.string = select ( 'Z' || round(random() * 1000000000000))
+
+
+scheduler.user.emails = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= now() AND rs.end_date  >= now() AND rs.run_date IS NOT NULL AND rs.schedule_id = [p_schedule_id] ) x, cr_report r, fn_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [p_schedule_id] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [p_schedule_id]))  
+
+# basic sql
+
+seq.next.val = SELECT nextval('[sequenceName]') AS id
+
+current.date = now()
+
+nvl = IFNULL
diff --git a/portal-BE/src/main/resources/WEB-INF/conf/system.properties b/portal-BE/src/main/resources/WEB-INF/conf/system.properties
new file mode 100644
index 00000000..041458d3
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/conf/system.properties
@@ -0,0 +1,157 @@
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+
+db.driver = org.mariadb.jdbc.Driver
+#db.connectionURL = jdbc:mariadb:failover://localhost:3306/ecomp_portal
+#db.userName = XXXX
+#db.password = XXXX
+db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_2_6_os
+db.userName = root
+db.password = root
+# is the db.password property encrypted?
+db.encrypt_flag = false
+
+
+db.hib.dialect = org.hibernate.dialect.MySQLDialect
+db.min_pool_size = 5
+db.max_pool_size = 10
+hb.dialect = org.hibernate.dialect.MySQLDialect
+hb.show_sql = false
+hb.db_reconnect = true
+hb.idle_connection_test_period = 3600
+
+# Ecomp portal title
+app_display_name					  = Portal
+files_path = /tmp
+context_root = ECOMPPORTAL
+# menu settings
+menu_query_name                      = menuData
+menu_properties_file_location        = /WEB-INF/fusion/menu/
+application_menu_set_name            = APP
+application_menu_attribute_name      = applicationMenuData
+application_menu_properties_name     = menu.properties
+business_direct_menu_set_name        = BD
+business_direct_menu_properties_name = bd.menu.properties
+business_direct_menu_attribute_name  = businessDirectMenuData
+
+application_user_id           = 30000
+post_default_role_id          = 1
+
+#Enable Fusion Mobile capabilities for the application
+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==
+
+
+#Cron Schedules
+cron_site_name                = one
+log_cron                      = 0 * * * * ? *
+sessiontimeout_feed_cron	  = 0 0/5 * * * ? *
+
+#Front end URL	
+frontend_url                  = http://localhost:9000/ecompportal/applicationsHome
+
+#cookie domain 	 PLEASE DO NOT REMOVE THIS VALUE FOR OPEN SOUCE REFACTOR
+cookie_domain = openecomp.org
+
+# An Unique 128-bit value defined to identify a specific version of
+# ECOMP Portal deployed on a specific virtual machine.
+# 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
+
+ecomp_shared_context_rest_url= http://todo_enter_be_hostname:9000/ecompportal/context
+
+ecomp_shared_context_rest_url= http://todo_enter_share_context_rest_hostname:9000/ecompportal/context
+elastic_search_url 			= http://todo_enter_elastic_search_hostname:9200
+contact_us_link				= http://todo_enter_contact_us_hostname	
+user_guide_link             = http://todo_enter_user_guide_link
+
+# Contact Us page properties
+ush_ticket_url				= http://todo_enter_ush_ticket_url
+feedback_email_address		= portal@lists.openecomp.org
+portal_info_url				= https://todo_enter_portal_info_url	
+
+#Online user bar refresh interval, in seconds
+online_user_update_rate                  = 5
+
+#Online user bar refresh total duration, in seconds
+online_user_update_duration			= 900
+
+# User notification refresh interval and duration, in seconds
+notification_update_rate			= 90
+notification_update_duration		= 900
+#Widgets upload flag
+microservices.widget.upload.flag=true
+
+#Microservices Related Properties for Portal
+microservices.widget.username = widget_user
+microservices.widget.password = KpuqIB08YHg+btG+pjX+sA==
+#This property won't be needed after consul is functional on VMs -
+microservices.widget.local.port = 8082
+
+#delete auditlog from number of days ago
+auditlog_del_day_from = 365
+
+#authenticate user server
+authenticate_user_server=http://todo_enter_auth_server_hostname:8383/openid-connect-server-webapp/allUsers
+
+#window width threshold to collapse left/right menu when page onload
+window_width_threshold_left_menu = 1400
+window_width_threshold_right_menu = 1350
+
+#External system notification URL
+external_system_notification_url= https://jira.onap.org/browse/
+
+# External Access System Basic Auth Credentials & Rest endpoint(These credentials doesn't work as these are place holders for now)
+ext_central_access_user_name = m00468@portal.onap.org
+ext_central_access_password = dR2NABMkxPaFbIbym87ZwQ==
+ext_central_access_url = https://aaftest.test.onap.org:8095/proxy/authz/
+ext_central_access_user_domain = @csp.onap.org
+
+# External Central Auth system access
+remote_centralized_system_access = false
+
+#left menu with root value or non-root
+portal_left_menu = non-root
\ No newline at end of file
diff --git a/portal-BE/src/main/resources/WEB-INF/fusion/conf/fusion.properties b/portal-BE/src/main/resources/WEB-INF/fusion/conf/fusion.properties
new file mode 100644
index 00000000..3d90d621
--- /dev/null
+++ b/portal-BE/src/main/resources/WEB-INF/fusion/conf/fusion.properties
@@ -0,0 +1,101 @@
+#os
+###
+# ============LICENSE_START==========================================
+# ONAP Portal
+# ===================================================================
+# 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============================================
+#
+# 
+###
+# domain settings
+#domain_class_location = 
+
+# validator settings
+#default_error_message = Default error message
+
+login_url_no_ret_val = http://localhost:9000/ecompportal/login.htm
+
+user_attribute_name      = user
+
+# User Session settings
+#user_attribute_name           = user
+roles_attribute_name          = roles
+role_functions_attribute_name = role_functions
+#client_device_attribute_name  = client_device
+#client_device_emulation       = false
+#client_device_type_to_emulate = 
+
+# menu settings
+menu_query_name                      = menuData
+#menu_properties_file_location        = /WEB-INF/fusion/menu/
+application_menu_set_name            = APP
+application_menu_attribute_name      = applicationMenuData
+#application_menu_properties_name     = menu.properties
+business_direct_menu_set_name        = BD
+#business_direct_menu_properties_name = bd.menu.properties
+business_direct_menu_attribute_name  = businessDirectMenuData
+
+# RAPTOR config settings
+#raptor_config_file_path = /WEB-INF/conf/
+
+# ECOMP settings
+ecomp_app_id = 1
+# Role settings
+sys_admin_role_id = 1
+account_admin_role_id = 999
+restricted_app_role_id = 900
+#sys_admin_role_function_delete_from_ui = true
+
+# Profile Search settings
+#profile_search_report_id=181
+#callable_profile_search_report_id=386
+
+
+# Home Page index html
+
+home_page          					= /index.html
+
+authentication_mechanism = DBAUTH
+
+login.error.hrid.empty = Login failed, please contact system administrator. 
+login.error.hrid.not-found = User not found, please contact system administrator.
+login.error.user.inactive = Account is disabled, please contact system administrator.
+
+#
+# Number of seconds to poll health (database operational, etc.)
+#
+health_poll_interval_seconds = 5
+#
+# If a component is down a log entry will be written that triggers an alert.  This parameter specifies how often this alert should be triggered  
+# if the component remains down.   For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes
+#
+health_fail_alert_every_x_intervals =  30
diff --git a/portal-BE/src/main/resources/application.properties b/portal-BE/src/main/resources/application.properties
index f79e2ab1..b99840d2 100644
--- a/portal-BE/src/main/resources/application.properties
+++ b/portal-BE/src/main/resources/application.properties
@@ -33,3 +33,5 @@ log4j.logger.org.hibernate.type.descriptor.sql=trace
 
 #PROPERTIES
 external_access_enable = false
+
+container.classpath = classpath: