From c19189718469498377b194eea2f9a247bb79c4f9 Mon Sep 17 00:00:00 2001 From: Nicolas Hu Date: Fri, 6 Oct 2017 10:28:45 -0400 Subject: [PATCH] Refactor CCSDK/Dashboard project Change-Id: I34451fbebbe7bbaaf1cd23aed5cef0f9a9ba37b7 Issues-Id: CCSDK-111 Signed-off-by: Nicolas Hu --- {oom-app-common => ccsdk-app-common}/README.md | 0 .../db-scripts/README.md | 0 .../db-scripts/oom-ddl-postgres-1707-common.sql | 0 .../db-scripts/oom-dml-postgres-1707-common.sql | 0 {oom-app-common => ccsdk-app-common}/pom.xml | 6 ++-- .../dashboard/controller/CloudifyController.java | 28 ++++++++--------- .../dashboard/controller/ConsulController.java | 22 ++++++------- .../controller/DashboardHomeController.java | 16 +++++----- .../DashboardRestrictedBaseController.java | 18 +++++------ .../controller/ECDSingleSignOnController.java | 4 +-- .../controller/HealthCheckController.java | 4 +-- .../dashboard/domain/ControllerEndpoint.java | 2 +- .../exception/DashboardControllerException.java | 2 +- .../ccsdk}/dashboard/model/CloudifyBlueprint.java | 2 +- .../dashboard/model/CloudifyBlueprintContent.java | 2 +- .../dashboard/model/CloudifyBlueprintList.java | 2 +- .../dashboard/model/CloudifyBlueprintUpload.java | 2 +- .../ccsdk}/dashboard/model/CloudifyDeployment.java | 2 +- .../dashboard/model/CloudifyDeploymentList.java | 2 +- .../dashboard/model/CloudifyDeploymentRequest.java | 2 +- .../ccsdk}/dashboard/model/CloudifyExecution.java | 2 +- .../dashboard/model/CloudifyExecutionList.java | 2 +- .../dashboard/model/CloudifyExecutionRequest.java | 2 +- .../ccsdk}/dashboard/model/ConsulDatacenter.java | 2 +- .../model/ConsulHealthServiceRegistration.java | 2 +- .../ccsdk}/dashboard/model/ConsulNodeInfo.java | 2 +- .../dashboard/model/ConsulServiceHealth.java | 2 +- .../model/ConsulServiceHealthHistory.java | 2 +- .../ccsdk}/dashboard/model/ConsulServiceInfo.java | 2 +- .../model/ControllerEndpointCredentials.java | 4 +-- .../model/ControllerEndpointTransport.java | 2 +- .../ccsdk}/dashboard/model/ECTransportModel.java | 2 +- .../onap/ccsdk}/dashboard/model/HealthStatus.java | 2 +- .../ccsdk}/dashboard/model/RestResponseError.java | 2 +- .../ccsdk}/dashboard/model/RestResponsePage.java | 2 +- .../dashboard/model/RestResponseSuccess.java | 2 +- .../dashboard/rest/ControllerRestClientImpl.java | 30 +++++++++--------- .../rest/ControllerRestClientMockImpl.java | 34 ++++++++++----------- ...omponentsClientHttpRequestFactoryBasicAuth.java | 2 +- .../dashboard/rest/IControllerRestClient.java | 31 ++++++++++--------- .../service/ControllerEndpointService.java | 4 +-- .../service/ControllerEndpointServiceImpl.java | 4 +-- .../ccsdk}/dashboard/util/DashboardProperties.java | 2 +- .../main/java/org/onap/fusionapp/model/Result.java | 0 .../onap/fusionapp/service/AdminAuthExtension.java | 0 .../onap/fusionapp/util/CustomLoggingFilter.java | 0 .../core/MockApplicationContextTestSuite.java | 0 .../test/java/org/onap/fusionapp/SanityTest.java | 0 .../onap/fusionapp/service/ProfileServiceTest.java | 0 {oom-app-os => ccsdk-app-os}/README.md | 0 {oom-app-os => ccsdk-app-os}/pom.xml | 24 +++++++-------- .../org/onap/portalapp/conf/ExternalAppConfig.java | 0 .../portalapp/conf/ExternalAppInitializer.java | 0 .../portalapp/conf/HibernateMappingLocations.java | 0 .../portalapp/lm/FusionLicenseManagerImpl.java | 0 .../onap/portalapp/login/LoginStrategyImpl.java | 0 .../onap/portalapp/service/AdminAuthExtension.java | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/portal.properties | 0 .../main/webapp/WEB-INF/conf/dashboard.properties | 0 .../src/main/webapp/WEB-INF/conf/sql.properties | 0 .../webapp/WEB-INF/conf/system.properties.template | 0 .../webapp/WEB-INF/fusion/conf/fusion.properties | 0 .../src/main/webapp/WEB-INF/jsp/login.jsp | 0 .../src/main/webapp/WEB-INF/jsp/login_external.jsp | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../external/b2b/css/b2b-angular/font_icons.css | 0 .../ds2/css/digital-ng-library/ecomp-ionicons.css | 0 .../ds2/css/digital-ng-library/ionicons.css | 0 .../app/fusion/external/ds2/css/fonts/ionicons.eot | Bin .../app/fusion/external/ds2/css/fonts/ionicons.svg | 0 .../app/fusion/external/ds2/css/fonts/ionicons.ttf | Bin .../fusion/external/ds2/css/fonts/ionicons.woff | Bin .../DS2-controllers/ds-profile/post-controller.js | 0 .../app/fusion/scripts/DS2-services/postSearch.js | 0 .../ds2-profile/profile_searchDS2.html | 0 .../DS2-view-models/ds2-profile/self_profile.html | 0 .../app/fusion/scripts/DS2-view-models/footer.html | 0 {oom-app-overlay => ccsdk-app-overlay}/README.md | 0 {oom-app-overlay => ccsdk-app-overlay}/pom.xml | 6 ++-- .../main/webapp/WEB-INF/fusion-110-copy.hbm.xml | 0 .../src/main/webapp/WEB-INF/jsp/error.jsp | 0 .../main/webapp/WEB-INF/oom-app-definitions.xml | 0 .../src/main/webapp/WEB-INF/oom-app.hbm.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../app/ccsdk}/cloudify/blueprint-controllers.js | 0 .../app/ccsdk}/cloudify/blueprint-service.js | 0 .../app/ccsdk}/cloudify/blueprint_popups.html | 0 .../app/ccsdk}/cloudify/blueprint_table.html | 0 .../app/ccsdk}/cloudify/deployment-controllers.js | 0 .../app/ccsdk}/cloudify/deployment-service.js | 0 .../app/ccsdk}/cloudify/deployment_popups.html | 0 .../app/ccsdk}/cloudify/deployment_table.html | 0 .../app/ccsdk}/cloudify/execution-service.js | 0 .../ccsdk}/cloudify/execution-table-controller.js | 0 .../app/ccsdk}/cloudify/execution_table.html | 0 .../app/ccsdk}/cloudify/tosca-table-controller.js | 0 .../webapp/app/ccsdk}/cloudify/tosca_table.html | 0 .../app/ccsdk}/consul/datacenter-health-service.js | 0 .../ccsdk}/consul/datacenter-table-controller.js | 0 .../webapp/app/ccsdk}/consul/datacenter_table.html | 0 .../app/ccsdk}/consul/node-health-service.js | 0 .../app/ccsdk}/consul/node-services-controller.js | 0 .../app/ccsdk}/consul/node-table-controller.js | 0 .../main/webapp/app/ccsdk}/consul/node_popups.html | 0 .../main/webapp/app/ccsdk}/consul/node_table.html | 0 .../app/ccsdk}/consul/service-controllers.js | 0 .../app/ccsdk}/consul/service-health-service.js | 0 .../app/ccsdk}/consul/service_health_table.html | 0 .../webapp/app/ccsdk}/consul/service_popups.html | 0 .../webapp/app/ccsdk}/external/bootstrap.min.css | 0 .../app/ccsdk}/external/bootstrap.min.css.map | 0 .../webapp/app/ccsdk}/external/bootstrap.min.js | 0 .../src/main/webapp/app/ccsdk}/external/yaml.js | 0 .../src/main/webapp/app/ccsdk}/home/appDS2.js | 0 .../webapp/app/ccsdk}/home/controller-service.js | 0 .../webapp/app/ccsdk}/home/controller_table.html | 0 .../app/ccsdk}/home/executions-view-controller.js | 0 .../webapp/app/ccsdk}/home/executions_view.html | 0 .../main/webapp/app/ccsdk}/home/modal-service.js | 0 .../app/ccsdk}/home/oom-instances-controller.js | 0 .../src/main/webapp/app/ccsdk}/home/oom-router.js | 0 .../src/main/webapp/app/ccsdk}/home/oom-style.css | 0 .../app/ccsdk}/home/oom_instances_popup.html | 0 .../app/ccsdk}/home/oom_popup_templates.html | 0 .../src/main/webapp/app/ccsdk}/home/oom_spa.html | 0 .../webapp/app/ccsdk}/home/tree-view-controller.js | 0 .../webapp/app/ccsdk}/home/tree-view-directive.js | 0 .../webapp/app/ccsdk}/home/tree-view-style.css | 0 .../src/main/webapp/app/ccsdk}/home/tree_view.html | 0 .../app/ccsdk}/images/ecomp-login-550x360.jpg | Bin .../src/main/webapp/app/ccsdk}/images/ecomp.png | Bin .../main/webapp/app/ccsdk}/images/onap_16x16.ico | Bin .../main/webapp/app/ccsdk}/images/onap_32x32.ico | Bin .../app/ccsdk}/images/onap_logo_2257x496.png | Bin .../fusion/scripts/DS2-view-models/welcome.html | 0 .../src/main/webapp/index.jsp | 0 .../src/main/webapp/manifest.jsp | 0 oom-app-common/.gitignore | 8 ----- oom-app-os/.gitignore | 6 ---- oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore | 1 - oom-app-overlay/.gitignore | 6 ---- pom.xml | 10 +++--- 143 files changed, 149 insertions(+), 169 deletions(-) rename {oom-app-common => ccsdk-app-common}/README.md (100%) rename {oom-app-common => ccsdk-app-common}/db-scripts/README.md (100%) rename {oom-app-common => ccsdk-app-common}/db-scripts/oom-ddl-postgres-1707-common.sql (100%) rename {oom-app-common => ccsdk-app-common}/db-scripts/oom-dml-postgres-1707-common.sql (100%) rename {oom-app-common => ccsdk-app-common}/pom.xml (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/CloudifyController.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/ConsulController.java (96%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/DashboardHomeController.java (93%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/DashboardRestrictedBaseController.java (94%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/ECDSingleSignOnController.java (99%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/controller/HealthCheckController.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/domain/ControllerEndpoint.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/exception/DashboardControllerException.java (92%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyBlueprint.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyBlueprintContent.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyBlueprintList.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyBlueprintUpload.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyDeployment.java (99%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyDeploymentList.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyDeploymentRequest.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyExecution.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyExecutionList.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/CloudifyExecutionRequest.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulDatacenter.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulHealthServiceRegistration.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulNodeInfo.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulServiceHealth.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulServiceHealthHistory.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ConsulServiceInfo.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ControllerEndpointCredentials.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ControllerEndpointTransport.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/ECTransportModel.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/HealthStatus.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/RestResponseError.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/RestResponsePage.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/model/RestResponseSuccess.java (97%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/rest/ControllerRestClientImpl.java (94%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/rest/ControllerRestClientMockImpl.java (91%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java (98%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/rest/IControllerRestClient.java (88%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/service/ControllerEndpointService.java (95%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/service/ControllerEndpointServiceImpl.java (96%) rename {oom-app-common/src/main/java/org/onap/oom => ccsdk-app-common/src/main/java/org/onap/ccsdk}/dashboard/util/DashboardProperties.java (99%) rename {oom-app-common => ccsdk-app-common}/src/main/java/org/onap/fusionapp/model/Result.java (100%) rename {oom-app-common => ccsdk-app-common}/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java (100%) rename {oom-app-common => ccsdk-app-common}/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java (100%) rename {oom-app-common => ccsdk-app-common}/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java (100%) rename {oom-app-common => ccsdk-app-common}/src/test/java/org/onap/fusionapp/SanityTest.java (100%) rename {oom-app-common => ccsdk-app-common}/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java (100%) rename {oom-app-os => ccsdk-app-os}/README.md (100%) rename {oom-app-os => ccsdk-app-os}/pom.xml (89%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java (100%) rename {oom-app-os => ccsdk-app-os}/src/main/resources/logback.xml (100%) rename {oom-app-os => ccsdk-app-os}/src/main/resources/portal.properties (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/conf/dashboard.properties (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/conf/sql.properties (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/conf/system.properties.template (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/fusion/conf/fusion.properties (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/jsp/login.jsp (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/jsp/login_external.jsp (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/WEB-INF/web.xml (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html (100%) rename {oom-app-os => ccsdk-app-os}/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html (100%) rename {oom-app-overlay => ccsdk-app-overlay}/README.md (100%) rename {oom-app-overlay => ccsdk-app-overlay}/pom.xml (91%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/WEB-INF/jsp/error.jsp (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/WEB-INF/oom-app-definitions.xml (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/WEB-INF/oom-app.hbm.xml (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/WEB-INF/web.xml (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/blueprint-controllers.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/blueprint-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/blueprint_popups.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/blueprint_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/deployment-controllers.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/deployment-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/deployment_popups.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/deployment_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/execution-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/execution-table-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/execution_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/tosca-table-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/cloudify/tosca_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/datacenter-health-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/datacenter-table-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/datacenter_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/node-health-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/node-services-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/node-table-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/node_popups.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/node_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/service-controllers.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/service-health-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/service_health_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/consul/service_popups.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/external/bootstrap.min.css (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/external/bootstrap.min.css.map (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/external/bootstrap.min.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/external/yaml.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/appDS2.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/controller-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/controller_table.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/executions-view-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/executions_view.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/modal-service.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom-instances-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom-router.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom-style.css (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom_instances_popup.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom_popup_templates.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/oom_spa.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/tree-view-controller.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/tree-view-directive.js (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/tree-view-style.css (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/home/tree_view.html (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/images/ecomp-login-550x360.jpg (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/images/ecomp.png (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/images/onap_16x16.ico (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/images/onap_32x32.ico (100%) rename {oom-app-overlay/src/main/webapp/app/oom => ccsdk-app-overlay/src/main/webapp/app/ccsdk}/images/onap_logo_2257x496.png (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/index.jsp (100%) rename {oom-app-overlay => ccsdk-app-overlay}/src/main/webapp/manifest.jsp (100%) delete mode 100644 oom-app-common/.gitignore delete mode 100644 oom-app-os/.gitignore delete mode 100644 oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore delete mode 100644 oom-app-overlay/.gitignore diff --git a/oom-app-common/README.md b/ccsdk-app-common/README.md similarity index 100% rename from oom-app-common/README.md rename to ccsdk-app-common/README.md diff --git a/oom-app-common/db-scripts/README.md b/ccsdk-app-common/db-scripts/README.md similarity index 100% rename from oom-app-common/db-scripts/README.md rename to ccsdk-app-common/db-scripts/README.md diff --git a/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql b/ccsdk-app-common/db-scripts/oom-ddl-postgres-1707-common.sql similarity index 100% rename from oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql rename to ccsdk-app-common/db-scripts/oom-ddl-postgres-1707-common.sql diff --git a/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql b/ccsdk-app-common/db-scripts/oom-dml-postgres-1707-common.sql similarity index 100% rename from oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql rename to ccsdk-app-common/db-scripts/oom-dml-postgres-1707-common.sql diff --git a/oom-app-common/pom.xml b/ccsdk-app-common/pom.xml similarity index 97% rename from oom-app-common/pom.xml rename to ccsdk-app-common/pom.xml index fa61c01..b28b292 100644 --- a/oom-app-common/pom.xml +++ b/ccsdk-app-common/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.oom.dashboard - oom-app-common + org.onap.ccsdk.dashboard + ccsdk-app-common 1.1.0-SNAPSHOT jar ONAP Operations Manager Dashboard common - OOM Dashboard common Java code + CCSDK Dashboard common Java code UTF-8 diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/CloudifyController.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/CloudifyController.java index f3e136c..1962c4f 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/CloudifyController.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import com.fasterxml.jackson.core.JsonProcessingException; import java.util.ArrayList; @@ -29,19 +29,19 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -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; -import org.onap.oom.dashboard.model.CloudifyDeploymentList; -import org.onap.oom.dashboard.model.CloudifyDeploymentRequest; -import org.onap.oom.dashboard.model.CloudifyExecution; -import org.onap.oom.dashboard.model.CloudifyExecutionList; -import org.onap.oom.dashboard.model.CloudifyExecutionRequest; -import org.onap.oom.dashboard.model.ECTransportModel; -import org.onap.oom.dashboard.model.RestResponseError; -import org.onap.oom.dashboard.model.RestResponsePage; -import org.onap.oom.dashboard.rest.IControllerRestClient; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprint; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload; +import org.onap.ccsdk.dashboard.model.CloudifyDeployment; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest; +import org.onap.ccsdk.dashboard.model.CloudifyExecution; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionList; +import org.onap.ccsdk.dashboard.model.ECTransportModel; +import org.onap.ccsdk.dashboard.model.RestResponseError; +import org.onap.ccsdk.dashboard.model.RestResponsePage; +import org.onap.ccsdk.dashboard.rest.IControllerRestClient; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.util.SystemProperties; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ConsulController.java similarity index 96% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ConsulController.java index 03e956c..9f22456 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ConsulController.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import com.fasterxml.jackson.core.JsonProcessingException; import java.net.URI; @@ -30,16 +30,16 @@ import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletRequest; -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; -import org.onap.oom.dashboard.model.ConsulServiceInfo; -import org.onap.oom.dashboard.model.ECTransportModel; -import org.onap.oom.dashboard.model.RestResponseError; -import org.onap.oom.dashboard.model.RestResponsePage; -import org.onap.oom.dashboard.model.RestResponseSuccess; -import org.onap.oom.dashboard.rest.IControllerRestClient; +import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration; +import org.onap.ccsdk.dashboard.model.ConsulNodeInfo; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealth; +import org.onap.ccsdk.dashboard.model.RestResponsePage; +import org.onap.ccsdk.dashboard.rest.IControllerRestClient; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.model.ConsulServiceInfo; +import org.onap.ccsdk.dashboard.model.ECTransportModel; +import org.onap.ccsdk.dashboard.model.RestResponseError; +import org.onap.ccsdk.dashboard.model.RestResponseSuccess; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.util.SystemProperties; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardHomeController.java similarity index 93% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardHomeController.java index bebf0dd..618e84d 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardHomeController.java @@ -19,19 +19,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import java.util.ArrayList; import javax.servlet.http.HttpServletRequest; -import org.onap.oom.dashboard.domain.ControllerEndpoint; -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; -import org.onap.oom.dashboard.model.RestResponseSuccess; -import org.onap.oom.dashboard.service.ControllerEndpointService; +import org.onap.ccsdk.dashboard.domain.ControllerEndpoint; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.model.ControllerEndpointCredentials; +import org.onap.ccsdk.dashboard.model.ControllerEndpointTransport; +import org.onap.ccsdk.dashboard.model.RestResponseError; +import org.onap.ccsdk.dashboard.model.RestResponseSuccess; +import org.onap.ccsdk.dashboard.service.ControllerEndpointService; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.web.support.UserUtils; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardRestrictedBaseController.java similarity index 94% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardRestrictedBaseController.java index 622acea..6f80d22 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/DashboardRestrictedBaseController.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -27,14 +27,14 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.onap.oom.dashboard.domain.ControllerEndpoint; -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; -import org.onap.oom.dashboard.rest.IControllerRestClient; -import org.onap.oom.dashboard.service.ControllerEndpointService; -import org.onap.oom.dashboard.util.DashboardProperties; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.rest.ControllerRestClientMockImpl; +import org.onap.ccsdk.dashboard.service.ControllerEndpointService; +import org.onap.ccsdk.dashboard.domain.ControllerEndpoint; +import org.onap.ccsdk.dashboard.rest.IControllerRestClient; +import org.onap.ccsdk.dashboard.util.DashboardProperties; +import org.onap.ccsdk.dashboard.model.ControllerEndpointCredentials; +import org.onap.ccsdk.dashboard.rest.ControllerRestClientImpl; import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.openecomp.portalsdk.core.domain.User; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java similarity index 99% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java index e877890..953adff 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java @@ -18,7 +18,7 @@ * ================================================================================ */ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import java.io.UnsupportedEncodingException; @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.onap.oom.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; import org.openecomp.portalsdk.core.auth.LoginStrategy; import org.openecomp.portalsdk.core.command.LoginBean; import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/HealthCheckController.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/HealthCheckController.java index 7ed3fbe..3393236 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/HealthCheckController.java @@ -19,13 +19,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.controller; +package org.onap.ccsdk.dashboard.controller; import java.util.List; import javax.servlet.http.HttpServletRequest; -import org.onap.oom.dashboard.model.HealthStatus; +import org.onap.ccsdk.dashboard.model.HealthStatus; import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController; import org.openecomp.portalsdk.core.domain.App; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/domain/ControllerEndpoint.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/domain/ControllerEndpoint.java index 33a22d0..1e74611 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/domain/ControllerEndpoint.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.domain; +package org.onap.ccsdk.dashboard.domain; import org.openecomp.portalsdk.core.domain.support.DomainVo; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/exception/DashboardControllerException.java similarity index 92% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/exception/DashboardControllerException.java index ce2d169..f288741 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/exception/DashboardControllerException.java @@ -1,4 +1,4 @@ -package org.onap.oom.dashboard.exception; +package org.onap.ccsdk.dashboard.exception; /** * A little something to placate the Sonar code-analysis tool. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprint.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprint.java index df02cc2..f66a072 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprint.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintContent.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintContent.java index 89c3c38..6b95eaa 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintContent.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintList.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintList.java index 933d0d3..a9a98a1 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintList.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintUpload.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintUpload.java index 2d63d92..70e093b 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyBlueprintUpload.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeployment.java similarity index 99% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeployment.java index b4dc65c..126fe9c 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeployment.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentList.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentList.java index f57784f..51b6169 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentList.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentRequest.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentRequest.java index 0bc7b44..32c7199 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyDeploymentRequest.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecution.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecution.java index d580ef0..071ef57 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecution.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionList.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionList.java index 6d97c94..5909c62 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionList.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java index 13b6826..d787fec 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulDatacenter.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulDatacenter.java index 93eb224..7b610b5 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulDatacenter.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulHealthServiceRegistration.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulHealthServiceRegistration.java index 1385de9..f899a8d 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulHealthServiceRegistration.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulNodeInfo.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulNodeInfo.java index 4235cd9..b3ba4ae 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulNodeInfo.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.Map; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealth.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealth.java index 5d019cf..b609b78 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealth.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealthHistory.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealthHistory.java index 4ad75e6..f80b506 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceHealthHistory.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceInfo.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceInfo.java index 3b4ad40..edeb029 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ConsulServiceInfo.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import java.util.List; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java index 1d5c1d4..02c892f 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java @@ -19,9 +19,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; -import org.onap.oom.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.onboarding.util.CipherUtil; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointTransport.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointTransport.java index 94a88f8..0a2f529 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointTransport.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; /** * Model for message passed by backend to frontend about ECOMP-C Endpoints. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ECTransportModel.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ECTransportModel.java index 1c498eb..3e0baa1 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ECTransportModel.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/HealthStatus.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/HealthStatus.java index 6d6a0e4..93d072f 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/HealthStatus.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; /** * Model for JSON response with health-check results. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseError.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseError.java index 0b4f5b8..64e0d71 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseError.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponsePage.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponsePage.java index 1fe8e29..0902fb0 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponsePage.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; /** * Model for a response with count of items available, count of pages required diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseSuccess.java similarity index 97% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseSuccess.java index 655fcf0..145c1cd 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/RestResponseSuccess.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.model; +package org.onap.ccsdk.dashboard.model; /** * Trivial model for carrying a message indicating success. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientImpl.java similarity index 94% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientImpl.java index e6d3d54..bb79c9f 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientImpl.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.rest; +package org.onap.ccsdk.dashboard.rest; import java.net.MalformedURLException; import java.net.URI; @@ -36,20 +36,20 @@ import org.apache.http.client.CredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.onap.oom.dashboard.model.CloudifyBlueprintContent; -import org.onap.oom.dashboard.model.CloudifyBlueprintList; -import org.onap.oom.dashboard.model.CloudifyBlueprintUpload; -import org.onap.oom.dashboard.model.CloudifyDeploymentList; -import org.onap.oom.dashboard.model.CloudifyDeploymentRequest; -import org.onap.oom.dashboard.model.CloudifyExecution; -import org.onap.oom.dashboard.model.CloudifyExecutionList; -import org.onap.oom.dashboard.model.CloudifyExecutionRequest; -import org.onap.oom.dashboard.model.ConsulDatacenter; -import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration; -import org.onap.oom.dashboard.model.ConsulNodeInfo; -import org.onap.oom.dashboard.model.ConsulServiceHealth; -import org.onap.oom.dashboard.model.ConsulServiceHealthHistory; -import org.onap.oom.dashboard.model.ConsulServiceInfo; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest; +import org.onap.ccsdk.dashboard.model.CloudifyExecution; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionList; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest; +import org.onap.ccsdk.dashboard.model.ConsulDatacenter; +import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration; +import org.onap.ccsdk.dashboard.model.ConsulNodeInfo; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealth; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory; +import org.onap.ccsdk.dashboard.model.ConsulServiceInfo; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientMockImpl.java similarity index 91% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientMockImpl.java index 67a46c1..2523538 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/ControllerRestClientMockImpl.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.rest; +package org.onap.ccsdk.dashboard.rest; import java.io.InputStream; import java.net.URI; @@ -30,22 +30,22 @@ import java.util.List; import java.util.Map; import java.util.Scanner; -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; -import org.onap.oom.dashboard.model.CloudifyDeploymentList; -import org.onap.oom.dashboard.model.CloudifyDeploymentRequest; -import org.onap.oom.dashboard.model.CloudifyExecution; -import org.onap.oom.dashboard.model.CloudifyExecutionList; -import org.onap.oom.dashboard.model.CloudifyExecutionRequest; -import org.onap.oom.dashboard.model.ConsulDatacenter; -import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration; -import org.onap.oom.dashboard.model.ConsulNodeInfo; -import org.onap.oom.dashboard.model.ConsulServiceHealth; -import org.onap.oom.dashboard.model.ConsulServiceHealthHistory; -import org.onap.oom.dashboard.model.ConsulServiceInfo; -import org.onap.oom.dashboard.model.ECTransportModel; +import org.onap.ccsdk.dashboard.exception.DashboardControllerException; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest; +import org.onap.ccsdk.dashboard.model.CloudifyExecution; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionList; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest; +import org.onap.ccsdk.dashboard.model.ConsulDatacenter; +import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration; +import org.onap.ccsdk.dashboard.model.ConsulNodeInfo; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealth; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory; +import org.onap.ccsdk.dashboard.model.ConsulServiceInfo; +import org.onap.ccsdk.dashboard.model.ECTransportModel; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java similarity index 98% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java index 2779df5..77ccda0 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.rest; +package org.onap.ccsdk.dashboard.rest; import java.net.URI; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/IControllerRestClient.java similarity index 88% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/IControllerRestClient.java index 0150bbb..5e060e9 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/rest/IControllerRestClient.java @@ -19,25 +19,26 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.rest; +package org.onap.ccsdk.dashboard.rest; import java.net.URI; import java.time.Instant; import java.util.List; -import org.onap.oom.dashboard.model.CloudifyBlueprintContent; -import org.onap.oom.dashboard.model.CloudifyBlueprintList; -import org.onap.oom.dashboard.model.CloudifyBlueprintUpload; -import org.onap.oom.dashboard.model.CloudifyDeploymentList; -import org.onap.oom.dashboard.model.CloudifyDeploymentRequest; -import org.onap.oom.dashboard.model.CloudifyExecution; -import org.onap.oom.dashboard.model.CloudifyExecutionList; -import org.onap.oom.dashboard.model.CloudifyExecutionRequest; -import org.onap.oom.dashboard.model.ConsulDatacenter; -import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration; -import org.onap.oom.dashboard.model.ConsulNodeInfo; -import org.onap.oom.dashboard.model.ConsulServiceHealth; -import org.onap.oom.dashboard.model.ConsulServiceHealthHistory; -import org.onap.oom.dashboard.model.ConsulServiceInfo; + +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintContent; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintList; +import org.onap.ccsdk.dashboard.model.CloudifyBlueprintUpload; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentList; +import org.onap.ccsdk.dashboard.model.CloudifyDeploymentRequest; +import org.onap.ccsdk.dashboard.model.CloudifyExecution; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionList; +import org.onap.ccsdk.dashboard.model.CloudifyExecutionRequest; +import org.onap.ccsdk.dashboard.model.ConsulDatacenter; +import org.onap.ccsdk.dashboard.model.ConsulHealthServiceRegistration; +import org.onap.ccsdk.dashboard.model.ConsulNodeInfo; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealth; +import org.onap.ccsdk.dashboard.model.ConsulServiceHealthHistory; +import org.onap.ccsdk.dashboard.model.ConsulServiceInfo; /** * Defines the interface of the Controller REST client. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointService.java similarity index 95% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointService.java index 5cec49d..621de95 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointService.java @@ -19,9 +19,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.service; +package org.onap.ccsdk.dashboard.service; -import org.onap.oom.dashboard.domain.ControllerEndpoint; +import org.onap.ccsdk.dashboard.domain.ControllerEndpoint; /** * Provides methods for managing the user's selection of controller endpoint. diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointServiceImpl.java similarity index 96% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointServiceImpl.java index 6b657e1..b1c64b5 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/service/ControllerEndpointServiceImpl.java @@ -19,9 +19,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.service; +package org.onap.ccsdk.dashboard.service; -import org.onap.oom.dashboard.domain.ControllerEndpoint; +import org.onap.ccsdk.dashboard.domain.ControllerEndpoint; import org.openecomp.portalsdk.core.service.DataAccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java similarity index 99% rename from oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java rename to ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java index 2dbd103..717be11 100644 --- a/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java @@ -19,7 +19,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. *******************************************************************************/ -package org.onap.oom.dashboard.util; +package org.onap.ccsdk.dashboard.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java similarity index 100% rename from oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java rename to ccsdk-app-common/src/main/java/org/onap/fusionapp/model/Result.java diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java similarity index 100% rename from oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java rename to ccsdk-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java diff --git a/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java b/ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java similarity index 100% rename from oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java rename to ccsdk-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java diff --git a/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java similarity index 100% rename from oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java rename to ccsdk-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java diff --git a/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java b/ccsdk-app-common/src/test/java/org/onap/fusionapp/SanityTest.java similarity index 100% rename from oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java rename to ccsdk-app-common/src/test/java/org/onap/fusionapp/SanityTest.java diff --git a/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java similarity index 100% rename from oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java rename to ccsdk-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java diff --git a/oom-app-os/README.md b/ccsdk-app-os/README.md similarity index 100% rename from oom-app-os/README.md rename to ccsdk-app-os/README.md diff --git a/oom-app-os/pom.xml b/ccsdk-app-os/pom.xml similarity index 89% rename from oom-app-os/pom.xml rename to ccsdk-app-os/pom.xml index 38303cf..4d8975d 100644 --- a/oom-app-os/pom.xml +++ b/ccsdk-app-os/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.oom.dashboard - oom-app-os + org.onap.ccsdk.dashboard + ccsdk-app-os 1.1.0-SNAPSHOT war ONAP Operations Manager Dashboard app - OOM Dashboard Web Application for external release + CCSDK Dashboard Web Application for external release UTF-8 4.2.0.RELEASE 4.3.11.Final 1.1.0 - 1.1.0-SNAPSHOT + 1.1.0-SNAPSHOT https://nexus.onap.org /content/repositories/snapshots/ /content/repositories/releases/ @@ -73,8 +73,8 @@ - org.onap.oom.dashboard - oom-app-overlay + org.onap.ccsdk.dashboard + ccsdk-app-overlay org.openecomp.ecompsdkos @@ -111,16 +111,16 @@ - org.onap.oom.dashboard - oom-app-overlay - ${oom.version} + org.onap.ccsdk.dashboard + ccsdk-app-overlay + ${ccsdk.version} war - org.onap.oom.dashboard - oom-app-common - ${oom.version} + org.onap.ccsdk.dashboard + ccsdk-app-common + ${ccsdk.version} diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java diff --git a/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java diff --git a/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java diff --git a/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java diff --git a/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java similarity index 100% rename from oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java rename to ccsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java diff --git a/oom-app-os/src/main/resources/logback.xml b/ccsdk-app-os/src/main/resources/logback.xml similarity index 100% rename from oom-app-os/src/main/resources/logback.xml rename to ccsdk-app-os/src/main/resources/logback.xml diff --git a/oom-app-os/src/main/resources/portal.properties b/ccsdk-app-os/src/main/resources/portal.properties similarity index 100% rename from oom-app-os/src/main/resources/portal.properties rename to ccsdk-app-os/src/main/resources/portal.properties diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties rename to ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/sql.properties similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties rename to ccsdk-app-os/src/main/webapp/WEB-INF/conf/sql.properties diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template rename to ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template diff --git a/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties rename to ccsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties diff --git a/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp rename to ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp diff --git a/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp rename to ccsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp diff --git a/oom-app-os/src/main/webapp/WEB-INF/web.xml b/ccsdk-app-os/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from oom-app-os/src/main/webapp/WEB-INF/web.xml rename to ccsdk-app-os/src/main/webapp/WEB-INF/web.xml diff --git a/oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css rename to ccsdk-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf diff --git a/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff b/ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff rename to ccsdk-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html diff --git a/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html similarity index 100% rename from oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html rename to ccsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html diff --git a/oom-app-overlay/README.md b/ccsdk-app-overlay/README.md similarity index 100% rename from oom-app-overlay/README.md rename to ccsdk-app-overlay/README.md diff --git a/oom-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml similarity index 91% rename from oom-app-overlay/pom.xml rename to ccsdk-app-overlay/pom.xml index fe0ee5c..8efb201 100644 --- a/oom-app-overlay/pom.xml +++ b/ccsdk-app-overlay/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.oom.dashboard - oom-app-overlay + org.onap.ccsdk.dashboard + ccsdk-app-overlay 1.1.0-SNAPSHOT war ONAP Operations Manager Dashboard overlay - OOM Dashboard web resources + CCSDK Dashboard web resources UTF-8 diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml similarity index 100% rename from oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml rename to ccsdk-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp b/ccsdk-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp similarity index 100% rename from oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp rename to ccsdk-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml similarity index 100% rename from oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml rename to ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml similarity index 100% rename from oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml rename to ccsdk-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml diff --git a/oom-app-overlay/src/main/webapp/WEB-INF/web.xml b/ccsdk-app-overlay/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from oom-app-overlay/src/main/webapp/WEB-INF/web.xml rename to ccsdk-app-overlay/src/main/webapp/WEB-INF/web.xml diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-controllers.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-controllers.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_popups.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_popups.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/blueprint_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-controllers.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-controllers.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_popups.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_popups.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/deployment_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-table-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution-table-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/execution_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca-table-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca-table-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/cloudify/tosca_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-health-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-health-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-table-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter-table-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/datacenter_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-health-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-services-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-services-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-table-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node-table-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_popups.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_popups.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/node_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-controllers.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-controllers.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-health-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service-health-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_health_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_health_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_popups.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/consul/service_popups.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css.map similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.css.map diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/bootstrap.min.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/external/yaml.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/yaml.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/external/yaml.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/external/yaml.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/appDS2.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/appDS2.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller_table.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/controller_table.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions-view-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions-view-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions_view.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/executions_view.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/modal-service.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/modal-service.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-instances-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-instances-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-router.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-style.css similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom-style.css diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_instances_popup.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_instances_popup.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_popup_templates.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_popup_templates.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_spa.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/oom_spa.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-controller.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-controller.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-directive.js similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-directive.js diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-style.css similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree-view-style.css diff --git a/oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree_view.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/home/tree_view.html diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp-login-550x360.jpg similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp-login-550x360.jpg diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp.png similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/ecomp.png diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_16x16.ico similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_16x16.ico diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_32x32.ico similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_32x32.ico diff --git a/oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png b/ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_logo_2257x496.png similarity index 100% rename from oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png rename to ccsdk-app-overlay/src/main/webapp/app/ccsdk/images/onap_logo_2257x496.png diff --git a/oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html similarity index 100% rename from oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html rename to ccsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html diff --git a/oom-app-overlay/src/main/webapp/index.jsp b/ccsdk-app-overlay/src/main/webapp/index.jsp similarity index 100% rename from oom-app-overlay/src/main/webapp/index.jsp rename to ccsdk-app-overlay/src/main/webapp/index.jsp diff --git a/oom-app-overlay/src/main/webapp/manifest.jsp b/ccsdk-app-overlay/src/main/webapp/manifest.jsp similarity index 100% rename from oom-app-overlay/src/main/webapp/manifest.jsp rename to ccsdk-app-overlay/src/main/webapp/manifest.jsp diff --git a/oom-app-common/.gitignore b/oom-app-common/.gitignore deleted file mode 100644 index 6a47a7c..0000000 --- a/oom-app-common/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.classpath -.project -.settings/ -/bin/ -/target/ -/catalina.base_IS_UNDEFINED/ -/debug-logs/ -/logs/ diff --git a/oom-app-os/.gitignore b/oom-app-os/.gitignore deleted file mode 100644 index 0a897e3..0000000 --- a/oom-app-os/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.classpath -.project -.settings/ -/bin/ -/target/ -/catalina.base_IS_UNDEFINED/ diff --git a/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore b/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore deleted file mode 100644 index 2dc7bb0..0000000 --- a/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -system.properties diff --git a/oom-app-overlay/.gitignore b/oom-app-overlay/.gitignore deleted file mode 100644 index 0a897e3..0000000 --- a/oom-app-overlay/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.classpath -.project -.settings/ -/bin/ -/target/ -/catalina.base_IS_UNDEFINED/ diff --git a/pom.xml b/pom.xml index d50abe3..571eeb7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,16 +10,16 @@ 1.0.0-SNAPSHOT - org.onap.oom.dashboard - oom-app-parent + org.onap.ccsdk.dashboard + ccsdk-app-parent 0 pom ccsdk-dashboard - oom-app-common - oom-app-overlay - oom-app-os + ccsdk-app-common + ccsdk-app-overlay + ccsdk-app-os -- 2.16.6