diff options
Diffstat (limited to 'catalog-fe/src/main')
4 files changed, 14 insertions, 8 deletions
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/Constants.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/Constants.java index a9f5c1294e..a64ba08d69 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/Constants.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/Constants.java @@ -24,6 +24,7 @@ public class Constants { public static String HTTP_IV_USER = "HTTP_IV_USER"; public static String USER_ID = "USER_ID"; + public static String ECOMP_PORTAL_COOKIE = "UserId"; public static String HTTP_CSP_FIRSTNAME = "HTTP_CSP_FIRSTNAME"; public static String HTTP_CSP_LASTNAME = "HTTP_CSP_LASTNAME"; public static String HTTP_IV_REMOTE_ADDRESS = "HTTP_IV_REMOTE_ADDRESS"; diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/HealthCheckService.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/HealthCheckService.java index b7fce8d912..4ef7c4974e 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/HealthCheckService.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/HealthCheckService.java @@ -199,9 +199,10 @@ public class HealthCheckService { healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.FE, HealthCheckStatus.UP, ExternalConfiguration.getAppVersion(), "OK")); healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.BE, HealthCheckStatus.DOWN, null, null)); - healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.ES, HealthCheckStatus.UNKNOWN, null, null)); healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.TITAN, HealthCheckStatus.UNKNOWN, null, null)); + healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.CASSANDRA, HealthCheckStatus.UNKNOWN, null, null)); healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.DE, HealthCheckStatus.UNKNOWN, null, null)); + healthCheckInfos.add(new HealthCheckInfo(HealthCheckComponent.ON_BOARDING, HealthCheckStatus.UNKNOWN, null, null)); HealthCheckWrapper hcWrapper = new HealthCheckWrapper(healthCheckInfos, "UNKNOWN", "UNKNOWN"); return hcWrapper; } diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java index a743f98b18..53fbd04a43 100644 --- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java +++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java @@ -283,7 +283,7 @@ public class PortalServlet extends HttpServlet { Cookie userIdcookie = null; if (cookies != null) for (Cookie cookie : cookies) - if (cookie.getName().equals(Constants.USER_ID)) + if (cookie.getName().equals(Constants.ECOMP_PORTAL_COOKIE)) userIdcookie = cookie; if (userIdcookie != null) { userId = CipherUtil.decrypt(userIdcookie.getValue(), diff --git a/catalog-fe/src/main/webapp/WEB-INF/web.xml b/catalog-fe/src/main/webapp/WEB-INF/web.xml index c2127dcdca..9c81055652 100644 --- a/catalog-fe/src/main/webapp/WEB-INF/web.xml +++ b/catalog-fe/src/main/webapp/WEB-INF/web.xml @@ -79,27 +79,31 @@ <url-pattern>/kibanaProxy/*</url-pattern> </servlet-mapping> -<!-- + <filter> <filter-name>GzipFilter</filter-name> <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class> <async-supported>true</async-supported> <init-param> - <param-name></param-name> - <param-value>text/html,text/plain,text/css,application/javascript,application/json</param-value> + <param-name>mimeTypes</param-name> + <param-value>*/*</param-value> </init-param> <init-param> <param-name>methods</param-name> - <param-value>get,post</param-value> + <param-value>GET,POST,PUT,DELETE</param-value> + </init-param> + <init-param> + <param-name>excludePaths</param-name> + <param-value>/sdc1/feProxy/*</param-value> </init-param> </filter> <filter-mapping> <filter-name>GzipFilter</filter-name> - <url-pattern>/sdc2/*</url-pattern> + <url-pattern>/sdc1/*</url-pattern> </filter-mapping> ---> + <listener> <listener-class>org.openecomp.sdc.fe.listen.FEAppContextListener</listener-class> |