From: Christopher Lott (cl778h) Date: Fri, 18 Aug 2017 14:09:01 +0000 (-0400) Subject: Rename to OOM (no more ecd) X-Git-Tag: 1.1.0~37 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e8c966373f25bc769fae4512bccc44903bf7309b;p=ccsdk%2Fdashboard.git Rename to OOM (no more ecd) - Change to OOM Dashboard (no more ECOMP Controller) - Rework some exception handling Issue: CCSDK-61 Change-Id: Id5379e8b272b651373c79f46b20da1d32de013ed Signed-off-by: Christopher Lott (cl778h) --- diff --git a/README.md b/README.md index b01124c..b6f8e86 100755 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This is the web UI for the ONAP Operations Manager, also known as the OOM Dashboard. It consists of the following Maven projects: -- ecd-app-common: Java classes that run in a web container like Tomcat -- ecd-app-overlay: CSS, HTML and Javascript resources for the web application -- ecd-app-os: Web application project with featurers for ONAP use +- oom-app-common: Java classes that run in a web container like Tomcat +- oom-app-overlay: CSS, HTML and Javascript resources for the web application +- oom-app-os: Web application project with featurers for ONAP use ### Prerequites diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java b/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java deleted file mode 100644 index 5fac7c5..0000000 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.onap.oom.dashboard.exception; - -/** - * A little something to placate the Sonar code-analysis tool. - */ -public class OOMDashboardException extends Exception { - - private static final long serialVersionUID = -1373841666122351816L; - - public OOMDashboardException() { - super(); - } - - public OOMDashboardException(String message) { - super(message); - } - - public OOMDashboardException(String message, Throwable cause) { - super(message, cause); - } - - public OOMDashboardException(Throwable cause) { - super(cause); - } - -} diff --git a/ecd-app-common/.gitignore b/oom-app-common/.gitignore similarity index 100% rename from ecd-app-common/.gitignore rename to oom-app-common/.gitignore diff --git a/ecd-app-common/README.md b/oom-app-common/README.md similarity index 72% rename from ecd-app-common/README.md rename to oom-app-common/README.md index 3bb1a66..fa3eb19 100644 --- a/ecd-app-common/README.md +++ b/oom-app-common/README.md @@ -6,5 +6,4 @@ The ONAP Operations Manager Dashboard provides a front-end GUI to view and manage executions (virtual machines) inside the ONAP Operations Manager (OOM). This application is based on the ONAP Portal SDK. Use Apache Maven to build -and package this webapp for deployment. See the file ecd-app-deployment-guide.txt -for complete details. +and package this webapp for deployment. diff --git a/ecd-app-common/db-scripts/README.md b/oom-app-common/db-scripts/README.md similarity index 73% rename from ecd-app-common/db-scripts/README.md rename to oom-app-common/db-scripts/README.md index 474e438..dc9379d 100644 --- a/ecd-app-common/db-scripts/README.md +++ b/oom-app-common/db-scripts/README.md @@ -1,7 +1,7 @@ -# ECOMP-C Dashboard Database Scripts +# ONAP Operations Manager Dashboard Database Scripts This directory has a DDL to create tables and and DML scripts to populate tables -in Postgresql for the ECOMP-C Dashboard web application. +in Postgresql for the ONAP Operations Manager Dashboard web application. ## Internal deployments @@ -20,4 +20,4 @@ To create a database for ONAP use: Set default schema for user: ALTER USER SET search_path to ; - (the above statement is not needed for version 9.4 and above) \ No newline at end of file + (the above statement is not needed for version 9.4 and above) diff --git a/ecd-app-common/db-scripts/ecd-ddl-postgres-1707-common.sql b/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql similarity index 98% rename from ecd-app-common/db-scripts/ecd-ddl-postgres-1707-common.sql rename to oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql index c9f9e42..c42eb0f 100644 --- a/ecd-app-common/db-scripts/ecd-ddl-postgres-1707-common.sql +++ b/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql @@ -1,10 +1,11 @@ -- --------------------------------------------------------------------------------------------------------------- --- This script creates tables for the ECOMP Controller Dashboard web app. --- in the 1707 release, same tables for both internal and external use. +-- This script creates tables for the ONAP Operations Manager Dashboard web app. +-- Same tables for both internal and external use. -- ------------------------------------------------------------------------------------------------------------------ -CREATE SCHEMA (schema name); -SET SEARCH_PATH = (schema name); +-- Assumes no schema name for maximum flexibility +-- CREATE SCHEMA (schema name); +-- SET SEARCH_PATH = (schema name); create table fn_lu_timezone ( timezone_id serial primary key, diff --git a/ecd-app-common/db-scripts/ecd-dml-postgres-1707-common.sql b/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql similarity index 99% rename from ecd-app-common/db-scripts/ecd-dml-postgres-1707-common.sql rename to oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql index 865248d..4503531 100644 --- a/ecd-app-common/db-scripts/ecd-dml-postgres-1707-common.sql +++ b/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql @@ -1,9 +1,9 @@ -- --------------------------------------------------------------------------------------------------------------- --- This script populates tables for the ECOMP Controller Dashboard web app. --- in the 1707 release with data for all versions. +-- This script populates tables for the ONAP Operations Manager Dashboard web app. -- --------------------------------------------------------------------------------------------------------------- -SET SEARCH_PATH = (schema name); +-- Assumes no schema for maximum flexibility +-- SET SEARCH_PATH = (schema name); -- fn_lu_activity Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role','add_role'); diff --git a/ecd-app-common/pom.xml b/oom-app-common/pom.xml similarity index 86% rename from ecd-app-common/pom.xml rename to oom-app-common/pom.xml index 07aea5d..fa61c01 100644 --- a/ecd-app-common/pom.xml +++ b/oom-app-common/pom.xml @@ -1,23 +1,11 @@ - - 4.0.0 org.onap.oom.dashboard - ecd-app-common - 1707.4.1-SNAPSHOT + oom-app-common + 1.1.0-SNAPSHOT jar ONAP Operations Manager Dashboard common OOM Dashboard common Java code diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/model/Result.java b/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/fusionapp/model/Result.java rename to oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java rename to oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java b/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java rename to oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java similarity index 95% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java index ed2c903..241a8cf 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java @@ -31,7 +31,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.onap.oom.dashboard.exception.OOMDashboardException; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.onap.oom.dashboard.model.CloudifyBlueprint; import org.onap.oom.dashboard.model.CloudifyBlueprintUpload; import org.onap.oom.dashboard.model.CloudifyDeployment; @@ -124,12 +124,12 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param pageSize * Number of items per browser page * @return JSON block as String, see above. - * @throws OOMDashboardException + * @throws DashboardControllerException * On any error; e.g., Network failure. */ @SuppressWarnings({ "rawtypes", "unchecked" }) private String getItemListForPage(long userId, CloudifyDataItem option, int pageNum, int pageSize) - throws Exception { + throws DashboardControllerException, JsonProcessingException { IControllerRestClient restClient = getControllerRestClient(userId); List itemList = null; switch (option) { @@ -142,7 +142,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { Collections.sort(itemList, deploymentComparator); break; default: - throw new OOMDashboardException("getItemListForPage failed: unimplemented case: " + option.name()); + throw new DashboardControllerException("getItemListForPage failed: unimplemented case: " + option.name()); } // Shrink if needed @@ -170,7 +170,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { try { User appUser = UserUtils.getUserSession(request); if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0) - throw new OOMDashboardException("getItemListForPageWrapper: Failed to get application user"); + throw new DashboardControllerException("getItemListForPageWrapper: Failed to get application user"); int pageNum = getRequestPageNumber(request); int pageSize = getRequestPageSize(request); outboundJson = getItemListForPage(appUser.getId(), option, pageNum, pageSize); @@ -235,13 +235,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return Blueprint as JSON; or error. - * @throws Exception + * @throws JsonProcessingException * on serialization error * */ @RequestMapping(value = { BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getBlueprintById(@PathVariable("id") String id, HttpServletRequest request) throws Exception { + public String getBlueprintById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -266,14 +266,14 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return Blueprint as YAML; or error. - * @throws Exception + * @throws JsonProcessingException * on serialization error * */ @RequestMapping(value = { VIEW_BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/yaml") @ResponseBody - public String viewBlueprintContentById(@PathVariable("id") String id, HttpServletRequest request) throws Exception { + public String viewBlueprintContentById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -298,13 +298,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param blueprint * Cloudify blueprint * @return Blueprint as uploaded; or error. - * @throws Exception + * @throws JsonProcessingException * on serialization error */ @RequestMapping(value = { BLUEPRINTS_PATH }, method = RequestMethod.POST, produces = "application/json") @ResponseBody public String uploadBlueprint(HttpServletRequest request, @RequestBody CloudifyBlueprintUpload blueprint) - throws Exception { + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -331,13 +331,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param response * HttpServletResponse * @return No content on success; error on failure. - * @throws Exception + * @throws JsonProcessingException * On serialization failure */ @RequestMapping(value = { BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.DELETE, produces = "application/json") @ResponseBody public String deleteBlueprint(@PathVariable("id") String id, HttpServletRequest request, - HttpServletResponse response) throws Exception { + HttpServletResponse response) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -366,13 +366,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return Deployment for the specified ID; error on failure. - * @throws Exception + * @throws JsonProcessingException * On serialization failure * */ @RequestMapping(value = { DEPLOYMENTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getDeploymentById(@PathVariable("id") String id, HttpServletRequest request) throws Exception { + public String getDeploymentById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -397,13 +397,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param deployment * Deployment to upload * @return Body of deployment; error on failure - * @throws Exception + * @throws JsonProcessingException * On serialization failure */ @RequestMapping(value = { DEPLOYMENTS_PATH }, method = RequestMethod.POST, produces = "application/json") @ResponseBody public String createDeployment(HttpServletRequest request, @RequestBody CloudifyDeploymentRequest deployment) - throws Exception { + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -434,7 +434,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { * HttpServletResponse * @return Passes thru HTTP status code from remote endpoint; no body on * success - * @throws Exception + * @throws JsonProcessingException * on serialization failure */ @RequestMapping(value = { @@ -442,7 +442,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { @ResponseBody public String deleteDeployment(@PathVariable("id") String id, @RequestParam(value = "ignore_live_nodes", required = false) Boolean ignoreLiveNodes, - HttpServletRequest request, HttpServletResponse response) throws Exception { + HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -484,7 +484,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { * Optional request parameter; if found, only executions with * that status are returned. * @return List of CloudifyExecution objects - * @throws Exception + * @throws JsonProcessingException * on serialization failure */ @SuppressWarnings("unchecked") @@ -492,7 +492,7 @@ public class CloudifyController extends DashboardRestrictedBaseController { @ResponseBody public String getExecutionsByPage(HttpServletRequest request, @RequestParam(value = "deployment_id", required = false) String deployment_id, - @RequestParam(value = "status", required = false) String status) throws Exception { + @RequestParam(value = "status", required = false) String status) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -551,13 +551,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return CloudifyExecutionList - * @throws Exception + * @throws JsonProcessingException * on serialization failure */ @RequestMapping(value = { EXECUTIONS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody public String getExecutionByIdAndDeploymentId(@PathVariable("id") String execution_id, - @RequestParam("deployment_id") String deployment_id, HttpServletRequest request) throws Exception { + @RequestParam("deployment_id") String deployment_id, HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -582,13 +582,13 @@ public class CloudifyController extends DashboardRestrictedBaseController { * @param execution * Execution model * @return Information about the execution - * @throws Exception + * @throws JsonProcessingException * on serialization failure */ @RequestMapping(value = { EXECUTIONS_PATH }, method = RequestMethod.POST, produces = "application/json") @ResponseBody public String startExecution(HttpServletRequest request, @RequestBody CloudifyExecutionRequest execution) - throws Exception { + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -618,16 +618,15 @@ public class CloudifyController extends DashboardRestrictedBaseController { * HttpServletRequest * @param response * HttpServletRequest - * @return Passes thru HTTP status code from remote endpoint; no body on - * success - * @throws Exception + * @return Passes thru HTTP status code from remote endpoint; no body on success + * @throws JsonProcessingException * on serialization failure */ @RequestMapping(value = { EXECUTIONS_PATH + "/{id}" }, method = RequestMethod.DELETE, produces = "application/json") @ResponseBody public String cancelExecution(@PathVariable("id") String id, @RequestParam(value = "deployment_id") String deploymentId, @RequestParam(value = "action") String action, - HttpServletRequest request, HttpServletResponse response) throws Exception { + HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java similarity index 92% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java index 5d75759..6c2cfb0 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java @@ -31,7 +31,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.onap.oom.dashboard.exception.OOMDashboardException; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration; import org.onap.oom.dashboard.model.ConsulNodeInfo; import org.onap.oom.dashboard.model.ConsulServiceHealth; @@ -109,8 +109,8 @@ public class ConsulController extends DashboardRestrictedBaseController { }; /** - * Gets one page of objects and supporting information via the REST client. - * On success, returns a page of objects as String. + * Gets one page of objects and supporting information via the REST client. On + * success, returns a page of objects as String. * * @param option * Specifies which item type to get @@ -119,11 +119,12 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param pageSize * Number of items per browser page * @return JSON block as String, see above. - * @throws Exception - * On any error; e.g., Network failure. + * @throws DashboardControllerException, + * JsonProcessingException On any error; e.g., Network failure. */ @SuppressWarnings({ "unchecked", "rawtypes" }) - private String getItemListForPage(long userId, ConsulDataItem option, int pageNum, int pageSize) throws Exception { + private String getItemListForPage(long userId, ConsulDataItem option, int pageNum, int pageSize) + throws DashboardControllerException, JsonProcessingException { IControllerRestClient restClient = getControllerRestClient(userId); List itemList = null; switch (option) { @@ -135,7 +136,7 @@ public class ConsulController extends DashboardRestrictedBaseController { itemList = restClient.getDatacenters(); break; default: - throw new OOMDashboardException("getItemListForPage failed: unimplemented case: " + option.name()); + throw new DashboardControllerException("getItemListForPage failed: unimplemented case: " + option.name()); } // Shrink if needed @@ -162,7 +163,7 @@ public class ConsulController extends DashboardRestrictedBaseController { try { User appUser = UserUtils.getUserSession(request); if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0) - throw new OOMDashboardException("getItemListForPageWrapper: Failed to get application user"); + throw new DashboardControllerException("getItemListForPageWrapper: Failed to get application user"); int pageNum = getRequestPageNumber(request); int pageSize = getRequestPageSize(request); outboundJson = getItemListForPage(appUser.getId(), option, pageNum, pageSize); @@ -186,12 +187,12 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return List of ConsulServiceInfo objects, as JSON - * @throws Exception + * @throws JsonProcessingException * if serialization fails */ @RequestMapping(value = { SERVICES_PATH }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getServices(HttpServletRequest request) throws Exception { + public String getServices(HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); Object result = null; @@ -216,13 +217,14 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param serviceId * Service ID * @return List of ConsulServiceHealth objects as JSON - * @throws Exception + * @throws JsonProcessingException * if serialization fails */ @RequestMapping(value = { SERVICES_PATH + "/{serviceId}" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getServiceHealthDetails(HttpServletRequest request, @PathVariable String serviceId) throws Exception { + public String getServiceHealthDetails(HttpServletRequest request, @PathVariable String serviceId) + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); Object result = null; @@ -251,7 +253,7 @@ public class ConsulController extends DashboardRestrictedBaseController { * Latest date-time as an ISO 8061 value, such as * 2007-12-03T10:15:30+01:00 * @return List of ConsulServiceHealth objects as JSON - * @throws Exception + * @throws JsonProcessingException * if serialization fails */ @RequestMapping(value = { "/svchist/{serviceName}" }, method = RequestMethod.GET, produces = "application/json") @@ -259,7 +261,7 @@ public class ConsulController extends DashboardRestrictedBaseController { public String getServiceHealthHistory(HttpServletRequest request, // @PathVariable String serviceName, // @RequestParam String start, // - @RequestParam String end) throws Exception { + @RequestParam String end) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); Object result = null; @@ -273,7 +275,7 @@ public class ConsulController extends DashboardRestrictedBaseController { result = new RestResponseError(e.getResponseBodyAsString()); } catch (Throwable t) { // Work around the hack to report no-match. - result = new RestResponseError("getServiceHealthHistory failed: " + t.getMessage()); + result = new RestResponseError("getServiceHealthHistory failed: " + t.getMessage()); } MDC.put(SystemProperties.AUDITLOG_END_TIMESTAMP, logDateFormat.format(new Date())); logger.info(EELFLoggerDelegate.auditLogger, request.getMethod() + request.getRequestURI()); @@ -281,8 +283,8 @@ public class ConsulController extends DashboardRestrictedBaseController { } /** - * Serves one page of service health information by getting all service - * names, then iterating over them to get the health of each service. + * Serves one page of service health information by getting all service names, + * then iterating over them to get the health of each service. * * ECOMP-C does NOT provide an API to get the health of all services in one * request. @@ -290,13 +292,13 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param request * HttpServletRequest * @return List of ConsulServiceHealth objects, as JSON - * @throws Exception + * @throws JsonProcessingException * on serialization exception */ @SuppressWarnings("unchecked") @RequestMapping(value = { "/serviceshealth" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getServicesHealth(HttpServletRequest request) throws Exception { + public String getServicesHealth(HttpServletRequest request) throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -352,12 +354,13 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param nodeName * Node name * @return List of ConsulServiceHealth objects as JSON - * @throws Exception + * @throws JsonProcessingException * if serialization fails */ @RequestMapping(value = { NODES_PATH + "/{nodeName}" }, method = RequestMethod.GET, produces = "application/json") @ResponseBody - public String getNodeServicesHealth(HttpServletRequest request, @PathVariable String nodeName) throws Exception { + public String getNodeServicesHealth(HttpServletRequest request, @PathVariable String nodeName) + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); Object result = null; @@ -398,13 +401,13 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param registration * Consul service registration * @return URI of the newly registered resource - * @throws Exception + * @throws JsonProcessingException * on serialization error */ @RequestMapping(value = { "/register" }, method = RequestMethod.POST, produces = "application/json") @ResponseBody public String registerService(HttpServletRequest request, @RequestBody ConsulHealthServiceRegistration registration) - throws Exception { + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; @@ -430,13 +433,14 @@ public class ConsulController extends DashboardRestrictedBaseController { * @param serviceName * Consul service name to deregister * @return Success or error indicator - * @throws Exception + * @throws JsonProcessingException * on serialization error */ - @RequestMapping(value = { "/deregister" + "/{serviceName}" }, method = RequestMethod.POST, produces = "application/json") + @RequestMapping(value = { + "/deregister" + "/{serviceName}" }, method = RequestMethod.POST, produces = "application/json") @ResponseBody - public String deregisterService(HttpServletRequest request, - @PathVariable String serviceName) throws Exception { + public String deregisterService(HttpServletRequest request, @PathVariable String serviceName) + throws JsonProcessingException { MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date())); logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); ECTransportModel result = null; diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java similarity index 87% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java index a0c521d..bebf0dd 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; import org.onap.oom.dashboard.domain.ControllerEndpoint; -import org.onap.oom.dashboard.exception.OOMDashboardException; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.onap.oom.dashboard.model.ControllerEndpointCredentials; import org.onap.oom.dashboard.model.ControllerEndpointTransport; import org.onap.oom.dashboard.model.RestResponseError; @@ -44,16 +44,22 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; /** - * This controller maps requests for the application's landing page, which is - * an Angular single-page application. + * This controller maps requests for the application's landing page, which is an + * Angular single-page application. */ @Controller @RequestMapping("/") public class DashboardHomeController extends DashboardRestrictedBaseController { + /** + * This path is embedded in the database, so it's nontrivial to change. + */ + public static final String APP_CONTEXT_PATH = "/ecd"; + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DashboardHomeController.class); @Autowired @@ -67,8 +73,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController { private static final String CONTROLLERS_PATH = "controllers"; /** - * Never forget that Spring autowires fields AFTER the constructor is - * called. + * Spring autowires fields AFTER the constructor is called. */ public DashboardHomeController() { mapper = new ObjectMapper(); @@ -80,10 +85,10 @@ public class DashboardHomeController extends DashboardRestrictedBaseController { * @return View name key, which is resolved to a file using an Apache tiles * "definitions.xml" file. */ - @RequestMapping(value = { "/ecd" }, method = RequestMethod.GET) + @RequestMapping(value = { APP_CONTEXT_PATH }, method = RequestMethod.GET) public ModelAndView dbcDefaultController() { // a model is only useful for JSP; this app is angular. - return new ModelAndView("ecd_home_tdkey"); + return new ModelAndView("oom_home_tdkey"); } /** @@ -91,10 +96,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController { * * @param request * HttpServletRequest - * @return List of ControllerEndpointTransport objects, or an error on - * failure - * @throws Exception - * if application user is not found + * @return List of ControllerEndpointTransport objects, or an error on failure */ @RequestMapping(value = { CONTROLLERS_PATH }, method = RequestMethod.GET, produces = "application/json") @ResponseBody @@ -107,7 +109,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController { try { User appUser = UserUtils.getUserSession(request); if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0) - throw new OOMDashboardException("getControllers: Failed to get application user"); + throw new DashboardControllerException("getControllers: Failed to get application user"); ControllerEndpointCredentials selectedInDb = getOrSetControllerEndpointSelection(appUser.getId()); // Built result from properties ArrayList list = new ArrayList<>(); @@ -136,19 +138,21 @@ public class DashboardHomeController extends DashboardRestrictedBaseController { * @param endpoint * Body with endpoint details * @return Result indicating success or failure - * @throws Exception + * @throws DashboardControllerException, * if application user is not found + * @throws JsonProcessingException + * If serialization fails */ @RequestMapping(value = { CONTROLLERS_PATH }, method = RequestMethod.POST, produces = "application/json") @ResponseBody public String setControllerSelection(HttpServletRequest request, @RequestBody ControllerEndpointTransport endpoint) - throws Exception { + throws DashboardControllerException, JsonProcessingException { logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME); logger.info(EELFLoggerDelegate.auditLogger, request.getMethod() + request.getRequestURI()); String outboundJson = null; User appUser = UserUtils.getUserSession(request); if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0) - throw new OOMDashboardException("setControllerSelection: Failed to get application user"); + throw new DashboardControllerException("setControllerSelection: Failed to get application user"); ControllerEndpoint dbEntry = new ControllerEndpoint(appUser.getId(), endpoint.getName(), endpoint.getUrl()); controllerEndpointService.updateControllerEndpointSelection(dbEntry); RestResponseSuccess success = new RestResponseSuccess("Updated selection to " + endpoint.getName()); diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java similarity index 94% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java index 28b336c..cdf0f0e 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java @@ -28,7 +28,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import org.onap.oom.dashboard.domain.ControllerEndpoint; -import org.onap.oom.dashboard.exception.OOMDashboardException; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.onap.oom.dashboard.model.ControllerEndpointCredentials; import org.onap.oom.dashboard.rest.ControllerRestClientImpl; import org.onap.oom.dashboard.rest.ControllerRestClientMockImpl; @@ -234,11 +234,12 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController * @param request * HttpServletRequest * @return REST client appropriate for the user + * @throws DashboardControllerException */ - protected IControllerRestClient getControllerRestClient(HttpServletRequest request) throws Exception { + protected IControllerRestClient getControllerRestClient(HttpServletRequest request) throws DashboardControllerException { User appUser = UserUtils.getUserSession(request); if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0) - throw new OOMDashboardException("getControllerRestClient: Failed to get application user"); + throw new DashboardControllerException("getControllerRestClient: Failed to get application user"); return getControllerRestClient(appUser.getId()); } @@ -247,8 +248,9 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController * client with appropriate credentials from properties. * * @return REST client. + * @throws DashboardControllerException on any failure; e.g., if the password cannot be decrypted. */ - protected IControllerRestClient getControllerRestClient(long userId) throws Exception { + protected IControllerRestClient getControllerRestClient(long userId) throws DashboardControllerException { IControllerRestClient result = null; // Be robust to missing development-only property boolean mock = false; @@ -257,9 +259,15 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController if (mock) { result = new ControllerRestClientMockImpl(); } else { + try { ControllerEndpointCredentials details = getOrSetControllerEndpointSelection(userId); final String clearText = details.getEncryptedPassword() ? details.decryptPassword() : details.getPassword(); result = new ControllerRestClientImpl(details.getUrl(), details.getUsername(), clearText); + } + catch (Exception ex) { + logger.error("getControllerRestClient failed", ex); + throw new DashboardControllerException(ex); + } } return result; } diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java similarity index 86% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java index 499cb73..0e0f096 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java @@ -1,5 +1,7 @@ package org.onap.oom.dashboard.controller; +import java.io.UnsupportedEncodingException; + /*- * ================================================================================ * ECOMP Portal SDK @@ -30,12 +32,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.openecomp.portalsdk.core.auth.LoginStrategy; import org.openecomp.portalsdk.core.command.LoginBean; import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.menu.MenuProperties; +import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler; import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants; import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties; @@ -75,19 +79,24 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { private String welcomeView; /** - * Handles requests directed to the single sign-on page by the session - * timeout interceptor. + * Handles requests directed to the single sign-on page by the session timeout + * interceptor. * * @param request * HttpServletRequest * @param response * HttpServletResponse * @return Redirect to an appropriate address - * @throws Exception - * On any failure + * @throws DashboardControllerException + * User not found + * @throws PortalAPIException + * User ID can't be fetched + * @throws UnsupportedEncodingException + * Encoding fails */ @RequestMapping(value = { "/single_signon.htm" }, method = RequestMethod.GET) - public ModelAndView singleSignOnLogin(HttpServletRequest request, HttpServletResponse response) throws Exception { + public ModelAndView singleSignOnLogin(HttpServletRequest request, HttpServletResponse response) + throws DashboardControllerException, PortalAPIException, UnsupportedEncodingException { Map model = new HashMap(); HashMap additionalParamsMap = new HashMap(); @@ -106,9 +115,14 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { final String authMech = SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM); String userId = loginStrategy.getUserId(request); commandBean.setUserid(userId); - commandBean = getLoginService().findUser(commandBean, - (String) request.getAttribute(MenuProperties.MENU_PROPERTIES_FILENAME_KEY), - additionalParamsMap); + try { + commandBean = getLoginService().findUser(commandBean, + (String) request.getAttribute(MenuProperties.MENU_PROPERTIES_FILENAME_KEY), + additionalParamsMap); + } catch (Exception ex) { + logger.error("singleSignOnLogin failed", ex); + throw new DashboardControllerException(ex); + } if (commandBean.getUser() == null) { String loginErrorMessage = (commandBean.getLoginErrorMessage() != null) ? commandBean.getLoginErrorMessage() @@ -146,20 +160,17 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { } } else { /* - * Login cookie not found, or redirect-to-portal parameter was - * found. + * Login cookie not found, or redirect-to-portal parameter was found. */ if (isPortalAvailable()) { /* - * Redirect the user to the portal with a suitable return URL. - * The forwardURL parameter that arrives as a parameter is a - * partial (not absolute) request path for a page in the - * application. The challenge here is to compute the correct - * absolute path for the original request so the portal can - * redirect the user back to the right place. If the application - * sits behind WebJunction, or if separate FE-BE hosts are used, - * then the URL yielded by the request has a host name that is - * not reachable by the user. + * Redirect the user to the portal with a suitable return URL. The forwardURL + * parameter that arrives as a parameter is a partial (not absolute) request + * path for a page in the application. The challenge here is to compute the + * correct absolute path for the original request so the portal can redirect the + * user back to the right place. If the application sits behind WebJunction, or + * if separate FE-BE hosts are used, then the URL yielded by the request has a + * host name that is not reachable by the user. */ String returnToAppUrl = null; if (SystemProperties.containsProperty(SystemProperties.APP_BASE_URL)) { @@ -171,10 +182,9 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { "singleSignOnLogin: using app base URL {} and redirectURL {}", appUrl, returnToAppUrl); } else { /** - * Be backward compatible with applications that don't need - * this feature. This is the controller for the - * single_signon.htm page, so the replace should always find - * the specified token. + * Be backward compatible with applications that don't need this feature. This + * is the controller for the single_signon.htm page, so the replace should + * always find the specified token. */ returnToAppUrl = ((HttpServletRequest) request).getRequestURL().toString() .replace("single_signon.htm", forwardURL); @@ -196,8 +206,8 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { else { /* - * Portal is not available. Redirect user to the login page, - * ignoring the forwardURL parameter. + * Portal is not available. Redirect user to the login page, ignoring the + * forwardURL parameter. */ return new ModelAndView("redirect:login.htm"); } @@ -206,8 +216,8 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { } /** - * Discover if the portal is available by GET-ing a resource from the REST - * URL specified in portal.properties, using a very short timeout. + * Discover if the portal is available by GET-ing a resource from the REST URL + * specified in portal.properties, using a very short timeout. * * @return True if the portal answers, otherwise false. */ diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java new file mode 100644 index 0000000..ce2d169 --- /dev/null +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java @@ -0,0 +1,26 @@ +package org.onap.oom.dashboard.exception; + +/** + * A little something to placate the Sonar code-analysis tool. + */ +public class DashboardControllerException extends Exception { + + private static final long serialVersionUID = -1373841666122351816L; + + public DashboardControllerException() { + super(); + } + + public DashboardControllerException(String message) { + super(message); + } + + public DashboardControllerException(String message, Throwable cause) { + super(message, cause); + } + + public DashboardControllerException(Throwable cause) { + super(cause); + } + +} diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java similarity index 76% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java index caa8aa7..1d5c1d4 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java @@ -21,6 +21,8 @@ *******************************************************************************/ package org.onap.oom.dashboard.model; +import org.onap.oom.dashboard.exception.DashboardControllerException; +import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; /** @@ -29,6 +31,8 @@ import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; */ public class ControllerEndpointCredentials extends ControllerEndpointTransport { + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ControllerEndpointCredentials.class); + public String username; public String password; public boolean isEncryptedPass; @@ -75,17 +79,22 @@ public class ControllerEndpointCredentials extends ControllerEndpointTransport { } /** - * Accepts clear text and stores an encrypted value; as a side effect, sets - * the encrypted flag to true. + * Accepts clear text and stores an encrypted value; as a side effect, sets the + * encrypted flag to true. * * @param plainText * Clear-text password - * @throws Exception + * @throws DashboardControllerException * If encryption fails */ - public void encryptPassword(final String plainText) throws Exception { - this.password = CipherUtil.encrypt(plainText); - this.isEncryptedPass = true; + public void encryptPassword(final String plainText) throws DashboardControllerException { + try { + this.password = CipherUtil.encrypt(plainText); + this.isEncryptedPass = true; + } catch (Exception ex) { + logger.error("encryptPassword failed", ex); + throw new DashboardControllerException(ex); + } } /** @@ -93,10 +102,15 @@ public class ControllerEndpointCredentials extends ControllerEndpointTransport { * true. * * @return Clear-text password. - * @throws Exception + * @throws DashboardControllerException * If decryption fails */ - public String decryptPassword() throws Exception { - return CipherUtil.decrypt(password); + public String decryptPassword() throws DashboardControllerException { + try { + return CipherUtil.decrypt(password); + } catch (Exception ex) { + logger.error("decryptPassword failed", ex); + throw new DashboardControllerException(ex); + } } } \ No newline at end of file diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java similarity index 99% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java index 13889b2..858ed5a 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java @@ -402,10 +402,10 @@ public class ControllerRestClientImpl implements IControllerRestClient { * * @param args * blueprint ID - * @throws Exception - * On any failure + * @throws IllegalArgumentException + * On bad arguments */ - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws IllegalArgumentException { if (args.length != 1) throw new IllegalArgumentException("Single argument expected: blueprint-id"); ControllerRestClientImpl client = new ControllerRestClientImpl("http://localhost:8081/controller", "dbus_user", diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java similarity index 97% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java index b8f5d77..217f878 100644 --- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java +++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Scanner; -import org.onap.oom.dashboard.exception.OOMDashboardException; +import org.onap.oom.dashboard.exception.DashboardControllerException; import org.onap.oom.dashboard.model.CloudifyBlueprintContent; import org.onap.oom.dashboard.model.CloudifyBlueprintList; import org.onap.oom.dashboard.model.CloudifyBlueprintUpload; @@ -74,7 +74,7 @@ public class ControllerRestClientMockImpl implements IControllerRestClient { try { InputStream is = getClass().getResourceAsStream(path); if (is == null) - throw new OOMDashboardException("Failed to find resource at path " + path); + throw new DashboardControllerException("Failed to find resource at path " + path); Scanner scanner = new Scanner(is, "UTF-8"); result = scanner.useDelimiter("\\A").next(); scanner.close(); @@ -287,10 +287,10 @@ public class ControllerRestClientMockImpl implements IControllerRestClient { * * @param args * blueprint ID - * @throws Exception + * @throws DashboardControllerException * On any failure */ - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws DashboardControllerException { System.out.println("Testing paths and parsing mock data"); ControllerRestClientMockImpl client = new ControllerRestClientMockImpl(); CloudifyBlueprintList list1 = client.getBlueprints(); @@ -304,7 +304,7 @@ public class ControllerRestClientMockImpl implements IControllerRestClient { List list9 = client.getServiceHealthHistory("mock", Instant.now(), Instant.now()); if (list1 == null || list2 == null || list3 == null || list4 == null || list5 == null || list6 == null || list7 == null || list8 == null || list9 == null) - throw new OOMDashboardException("Failed"); + throw new DashboardControllerException("Failed"); System.out.println("Pass."); } diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java similarity index 100% rename from ecd-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java rename to oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java diff --git a/ecd-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java similarity index 100% rename from ecd-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java rename to oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java diff --git a/ecd-app-common/src/test/java/org/onap/fusionapp/SanityTest.java b/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java similarity index 100% rename from ecd-app-common/src/test/java/org/onap/fusionapp/SanityTest.java rename to oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java diff --git a/ecd-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java similarity index 100% rename from ecd-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java rename to oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java diff --git a/ecd-app-os/.gitignore b/oom-app-os/.gitignore similarity index 100% rename from ecd-app-os/.gitignore rename to oom-app-os/.gitignore diff --git a/ecd-app-os/README.md b/oom-app-os/README.md similarity index 100% rename from ecd-app-os/README.md rename to oom-app-os/README.md diff --git a/ecd-app-os/pom.xml b/oom-app-os/pom.xml similarity index 79% rename from ecd-app-os/pom.xml rename to oom-app-os/pom.xml index 12368b1..29ef713 100644 --- a/ecd-app-os/pom.xml +++ b/oom-app-os/pom.xml @@ -1,23 +1,11 @@ - - 4.0.0 org.onap.oom.dashboard - ecd-app-os - 1707.4.1-SNAPSHOT + oom-app-os + 1.1.0-SNAPSHOT war ONAP Operations Manager Dashboard app OOM Dashboard Web Application for external release @@ -27,7 +15,7 @@ 4.2.0.RELEASE 4.3.11.Final 1.1.0 - 1707.4.1-SNAPSHOT + 1.1.0-SNAPSHOT https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -86,7 +74,7 @@ org.onap.oom.dashboard - ecd-app-overlay + oom-app-overlay org.openecomp.ecompsdkos @@ -122,15 +110,15 @@ org.onap.oom.dashboard - ecd-app-overlay - ${ecd.version} + oom-app-overlay + ${oom.version} war org.onap.oom.dashboard - ecd-app-common - ${ecd.version} + oom-app-common + ${oom.version} diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java similarity index 99% rename from ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java rename to oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index ae8c2ac..e532b5f 100644 --- a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -118,7 +118,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable { List definitions = new ArrayList(); // DBC does not need the sample page: // definitions.add("/WEB-INF/defs/definitions.xml"); - definitions.add("/WEB-INF/ecd-app-definitions.xml"); + definitions.add("/WEB-INF/oom-app-definitions.xml"); if (logger.isDebugEnabled()) logger.debug(EELFLoggerDelegate.debugLogger, "addTileDefinitions: list is " + definitions); return definitions; diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java similarity index 100% rename from ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java rename to oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java similarity index 97% rename from ecd-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java rename to oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index bcc7f04..6432478 100644 --- a/ecd-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -44,7 +44,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { // new ClassPathResource("../fusion/orm/Fusion.hbm.xml"), // This is a COPY to work around a bug in the 1.1.0 release. new ClassPathResource("../fusion-110-copy.hbm.xml"), - new ClassPathResource("../ecd-app.hbm.xml") + new ClassPathResource("../oom-app.hbm.xml") }; } diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java similarity index 100% rename from ecd-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java rename to oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java similarity index 100% rename from ecd-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java rename to oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java similarity index 100% rename from ecd-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java rename to oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java diff --git a/ecd-app-os/src/main/resources/logback.xml b/oom-app-os/src/main/resources/logback.xml similarity index 99% rename from ecd-app-os/src/main/resources/logback.xml rename to oom-app-os/src/main/resources/logback.xml index aefffa4..474dd7c 100644 --- a/ecd-app-os/src/main/resources/logback.xml +++ b/oom-app-os/src/main/resources/logback.xml @@ -31,7 +31,7 @@ - + diff --git a/ecd-app-os/src/main/resources/portal.properties b/oom-app-os/src/main/resources/portal.properties similarity index 100% rename from ecd-app-os/src/main/resources/portal.properties rename to oom-app-os/src/main/resources/portal.properties diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/.gitignore b/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore similarity index 100% rename from ecd-app-os/src/main/webapp/WEB-INF/conf/.gitignore rename to oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties similarity index 100% rename from ecd-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties rename to oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/sql.properties b/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties similarity index 100% rename from ecd-app-os/src/main/webapp/WEB-INF/conf/sql.properties rename to oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template similarity index 98% rename from ecd-app-os/src/main/webapp/WEB-INF/conf/system.properties.template rename to oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template index 387dbee..a4e0d5d 100644 --- a/ecd-app-os/src/main/webapp/WEB-INF/conf/system.properties.template +++ b/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template @@ -70,4 +70,4 @@ contact_us_link = https://www.onap.org/ instance_uuid = 12345678-90ab-cdef-1234-567890abcdef # Application base URL is a proper prefix of the on-boarded URL. -app_base_url = http://www.oom.onap.org:8080/ecd-app-os/ +app_base_url = http://www.oom.onap.org:8080/oom-app-os/ diff --git a/ecd-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties similarity index 100% rename from ecd-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties rename to oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties diff --git a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login.jsp b/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp similarity index 100% rename from ecd-app-os/src/main/webapp/WEB-INF/jsp/login.jsp rename to oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp diff --git a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp similarity index 97% rename from ecd-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp rename to oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp index 7aa7f5e..935c6aa 100644 --- a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ b/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp @@ -77,7 +77,7 @@