org.onap migration

Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@att.com>

1 files changed, 42 insertions, 21 deletions

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
index d0c36d47a..88131c593 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp
@@ -1,3 +1,4 @@
+<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiGetSubs.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubDetails.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubViewEdit.css" />

@@ -7,20 +8,22 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/angularjs-datetime-picker.css"></link>

-<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/common.css" />

+<link rel="stylesheet" type="text/css" href="app/vid/styles/messageViewer.css" />

 

 	

 	<script>

 	

 	var appDS2 = app;

 </script>

+

 	<script src="app/vid/scripts/controller/VidApp.js"></script>

 	

 <!-- Latest compiled and minified JavaScript -->

 

-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

+<script src="app/vid/external/bootstrap/js/bootstrap.min.js"></script>

 <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>

+<script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>

 

 <script src="app/vid/scripts/angular-ui-tree.js"></script>

 

@@ -33,40 +36,56 @@
 <script src="app/vid/scripts/filters/date.filter.js"></script>

 <script src="app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.controller.js"></script>

 <script src="app/vid/scripts/modals/new-change-management/new-change-management.controller.js"></script>

-<script src="app/vid/scripts/modals/new-scheduler/new-scheduler.controller.js"></script>

+

+<script src="app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js"></script>

+<script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script>

 <script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>

 <script src="app/vid/scripts/controller/creationDialogController.js"></script>

-<script src="app/vid/scripts/controller/deletionDialogController.js"></script>

+<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>

 <script src="app/vid/scripts/controller/detailsDialogController.js"></script>

 <script src="app/vid/scripts/controller/statusDialogController.js"></script>

 <script src="app/vid/scripts/controller/InstantiationController.js"></script>

 <script src="app/vid/scripts/controller/msoCommitController.js"></script>

+<script src="app/vid/scripts/controller/pnfSearchAssociationController.js"></script>

 <script src="app/vid/scripts/controller/ServiceModelController.js"></script>

 <script src="app/vid/scripts/controller/previousVersionDialogController.js"></script>

 <script src="app/vid/scripts/controller/previousVersionContoller.js"></script>

+<script src="app/vid/scripts/controller/AddNetworkNodeController.js"></script>

 <script src="app/vid/scripts/controller/change-management.controller.js"></script>

+<script src="app/vid/scripts/controller/testEnvironmentsController.js"></script>

+<script src="app/vid/scripts/modals/attach-test-env-manifest/attach-test-env-manifest.controller.js"></script>

+<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script>

 

 <script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script>

+<script src="app/vid/scripts/controller/msoCommitModalController.js"></script>

 

-

+<script src="app/vid/scripts/directives/messageViewer.js"></script>

 <script src="app/vid/scripts/directives/extensionsDirective.js"></script>

 <script src="app/vid/scripts/directives/parameterBlockDirective.js"></script>

 <script src="app/vid/scripts/directives/popupWindowDirective.js"></script>

 <script src="app/vid/scripts/directives/progressBarDirective.js"></script>

+<script src="app/vid/scripts/directives/serviceMetadata.js"></script>

+<script src="app/vid/scripts/directives/search.js"></script>

 <script src="app/vid/scripts/services/aaiService.js"></script>

 <script src="app/vid/scripts/services/schedulerService.js"></script>

 <script src="app/vid/scripts/services/asdcService.js"></script>

 <script src="app/vid/scripts/services/componentService.js"></script>

 <script src="app/vid/scripts/services/creationService.js"></script>

 <script src="app/vid/scripts/services/dataService.js"></script>

-<script src="app/vid/scripts/services/deletionService.js"></script>

+<script src="app/vid/scripts/services/deleteResumeService.js"></script>

 <script src="app/vid/scripts/services/detailsService.js"></script>

 <script src="app/vid/scripts/services/statusService.js"></script>

 <script src="app/vid/scripts/services/msoService.js"></script>

 <script src="app/vid/scripts/services/propertyService.js"></script>

 <script src="app/vid/scripts/services/utilityService.js"></script>

 <script src="app/vid/scripts/services/vnfService.js"></script>

+<script src="app/vid/scripts/services/pnfService.js"></script>

 <script src="app/vid/scripts/services/change-management.service.js"></script>

+<script src="app/vid/scripts/modals/cancel-pending-workflow/cancel-pending-workflow.controller.js"></script>

+<script src="app/vid/scripts/services/OwningEntityService.js"></script>

+<script src="app/vid/scripts/services/testEnvironmentsService.js"></script>

+

+

 

 <%@ page import="org.openecomp.vid.mso.*"%>

 <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

@@ -81,18 +100,20 @@
 	<div ng-view></div>

 </div>

 <!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

+<div class="temporary-solution">

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+</div>