Bootstrapping hybrid app (Angular v1 and v6)

Issue-ID: PORTAL-356

Change-Id: I1ee7f6a51eb71dff2128a112afdefff5776f2ffe

Change-Id: I1ee7f6a51eb71dff2128a112afdefff5776f2ffe
Signed-off-by: Saravanan, Madheswaran <msaravanan@in.ibm.com>

1 files changed, 40 insertions, 3 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
index 05556d27..90ccf9b7 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -57,9 +57,13 @@
 	
 	<!--  <definition name="nbooktest"
 		template="app/fusion/notebook-integration/scripts/view-models/notebook-frame.html"/>
-	 -->
-				<definition name="nbooktest"
+
+	 <definition name="nbooktest"
 		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html"/>
+
+	-->
+	 <definition name="nbooktest"
+		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html"/>
 		
 	<definition extends="ebz_template" name="broadcast_list">
 		<put-attribute name="body"
@@ -81,28 +85,57 @@
 	<definition name="collaboration"
 		template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp" />
 	<!-- <definition name="user_profile_list" template="/app/fusion/scripts/view-models/admin-page/profile.html" 
-		/> -->
+		/> 
+		
 	<definition name="user_profile_list"
 		template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
+	-->
+		
+	<definition name="user_profile_list"
+		template="/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html" />
+	
 
 	<!-- <definition name="admin" template="/app/fusion/scripts/view-models/admin-page/admin.html" 
 		/> -->
 	<definition name="openCollaboration"
 		template="/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html" />
+				
+	<!--
 	<definition name="workflows"
 		template="/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html" />
+	-->
+
+	<definition name="workflows"
+		template="/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html" />
+
 	<definition name="report_dashboard"
 		template="/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html" />
 
 	<definition name="ds2_sample"
 		template="/app/fusionapp/scripts/DS2-view-models/sampleDS2.html" />
 
+	<!-- 
 	<definition name="admin"
 		template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
+	 -->
+	 
+	<definition name="admin"
+		template="/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html" />		
+		
+	<!-- 
 	<definition name="samplePage"
 		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
+	 -->
+	<definition name="samplePage"
+		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html" />
+
+	<!-- 
 	<definition name="welcome"
 		template="/app/fusion/scripts/DS2-view-models/welcome.html" />
+	 -->
+	 
+	<definition name="welcome"
+		template="/app/ngapp/ngwelcome.html" />
 
 	<definition name="bootstrap_sample"
 		template="/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html" />
@@ -124,8 +157,12 @@
 		<put-attribute name="viewName" value="report_import"></put-attribute>
 	</definition>
 
+	<!--
 	<definition name="report"
 		template="/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html" />
+	-->
+	<definition name="report"
+		template="/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html" />
 
 	<definition extends="ebz_template" name="reportDS1">
 		<put-attribute name="body"