Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 3 insertions, 22 deletions

diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
index c9e10a16b..caefb19c8 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE tiles-definitions PUBLIC
        "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<!-- This tiles definitions file is fusion/defs/definitions.xml. It maps 
-	tokens used by SDK-core controllers to JSP file paths. To minimize upgrade 
-	effort, this file should not be changed by on-boarding applications. -->
-
 <tiles-definitions>
 
 	<definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">
@@ -93,11 +88,6 @@
 			value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
 	</definition>
 
-	<!-- <definition extends="ebz_template" name="notebook">
-		<put-attribute name="body"
-			value="/WEB-INF/fusion/jsp/notebook.jsp"></put-attribute>
-	</definition> -->
-	
 	<definition name="notebook"
 		template="app/fusion/notebook-integration/scripts/view-models/notebook.htm" />
 		
@@ -138,18 +128,9 @@
 		</definition> -->
 	<definition name="collaboration"
 		template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp" />
-	<definition name="user_profile_list"
-		template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
-	<definition name="admin"
-		template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
-	<definition name="workflows"
-		template="/app/fusion/scripts/view-models/workflows/workflow-landing.html" />
-	<definition name="report_dashboard"
-		template="/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html" />
-	<definition name="samplePage"
-		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
-	<definition name="ds2_sample" template="/app/fusionapp/scripts/DS2-view-models/sampleDS2.html" /> 
-
+    <definition name="user_profile_list" template="/app/fusion/scripts/view-models/admin-page/profile.html"/>
+    <definition name="admin" template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
+    <definition name="workflows" template="/app/fusion/scripts/view-models/workflows/workflow-landing.html"/>
 
 	<definition extends="ebz_template" name="report_wizard">
 		<put-attribute name="body"