X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Ffusion%2Fdefs%2Fdefinitions.xml;h=4749dbb37da6c867eaa98e326738239ec2cd1a00;hb=627badaf69987c01811c477219fd943757a635f5;hp=433fec8ac61f9e8f05a1c64cc930b6729bef8cae;hpb=ba838f2e13f1e8050c75e68bd3733d56d8f416d5;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
index 433fec8a..4749dbb3 100644
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
+++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -1,203 +1,189 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ================================================================================
-  ECOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ================================================================================
-  -->
-
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
-       "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-<tiles-definitions>
-
-    <definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">  
-      <put-attribute name="title" value=""></put-attribute>  
-      <put-attribute name="header" value="/WEB-INF/fusion/jsp/ebz/ebz_header.jsp"></put-attribute>  
-      <put-attribute name="body" value=""></put-attribute>
-      <put-attribute name="footer" value="/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp"></put-attribute>  
-    </definition>
-    
-    <definition name="ebz_template_raptor" template="/WEB-INF/fusion/jsp/ebz_template_raptor.jsp">  
-      <put-attribute name="title" value=""></put-attribute>  
-      <put-attribute name="header" value="/WEB-INF/fusion/jsp/ebz/ebz_header_raptor.jsp"></put-attribute>  
-      <put-attribute name="body" value=""></put-attribute>
-      <put-attribute name="footer" value="/WEB-INF/fusion/jsp/ebz/ebz_footer_raptor.jsp"></put-attribute>  
-    </definition>
-
-    <definition name="ebz_template_noheader_nofooter" template="/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp">  
-      <put-attribute name="body" value=""></put-attribute>
-    </definition>  
-
-      <definition name="ebz_template_report_embedded"
-    template="/WEB-INF/fusion/jsp/ebz/ebz_template_report_embedded.jsp">
-    <put-attribute name="body" value=""></put-attribute>
-  </definition>
-      
-     <definition extends="ebz_template" name="user_profile">  
-     	<put-attribute name="body" value="/WEB-INF/jsp/user_profile.jsp"></put-attribute>
-    </definition>  
-    
-    <definition extends="ebz_template" name="profile_search">   
-     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile_search.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="profile_search"></put-attribute>  
-    </definition>
-    
-    <definition extends="ebz_template" name="profile">   
-     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="profile"></put-attribute>  
-    </definition>   
-    
-	<definition extends="ebz_template" name="menu">   
-     	<put-attribute name="body" value="/WEB-INF/jsp/menu.jsp"></put-attribute>
-     	<put-attribute name="viewName" value="menu"></put-attribute>  
-    </definition>  
-    
-    
-    <definition extends="ebz_template" name="welcome">   
-       <put-attribute name="body" value="/WEB-INF/jsp/welcome.jsp"></put-attribute>
-       <put-attribute name="viewName" value="welcome"></put-attribute>  
-    </definition>  
-    
-    <definition extends="ebz_template" name="role_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role_list"></put-attribute>  
-    </definition> 
-    
-    <definition extends="ebz_template" name="role">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role"></put-attribute>  
-    </definition>    
-     
-    <definition extends="ebz_template" name="role_function_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_function_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="role_function_list"></put-attribute>  
-    </definition>     
-     
-    <definition extends="ebz_template" name="post_search">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/post_search.jsp"></put-attribute>
-       <put-attribute name="viewName" value="post_search"></put-attribute>  
-    </definition> 
-    
-     <definition extends="ebz_template" name="error">   
-       <put-attribute name="body" value="/WEB-INF/jsp/error.jsp"></put-attribute>
-       <put-attribute name="viewName" value="error"></put-attribute>  
-    </definition> 
-    
-     <definition extends="ebz_template_raptor" name="report">
-		<put-attribute name="body"
-			value="/WEB-INF/fusion/raptor/report_ebz.jsp"></put-attribute>
-		<put-attribute name="viewName"
-			value="report"></put-attribute>
-	</definition> 
-	
-	<definition extends="ebz_template" name="report_wizard">
-		<put-attribute name="body"
-			value="/WEB-INF/fusion/raptor/report_wizard.jsp"></put-attribute>
-		<put-attribute name="viewName" value="report_wizard"></put-attribute>
-	</definition>
-
-  <definition extends="ebz_template_report_embedded" name="report_embedded">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/report_ebz_embedded.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template" name="report_sample">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/report_sample.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="test_run_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/test_run_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="date_start_field_run_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="date_end_field_run_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="test_field_run_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/test_field_run_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="default_field_run_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/default_field_run_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_testrun_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_testrun_sql.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_semaphore">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_semaphore.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_import_semaphore">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_import_semaphore.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_table_cols">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_table_cols.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_drill_down_report">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_drill_down_report.jsp"></put-attribute>
-  </definition>
-  <definition extends="ebz_template_noheader_nofooter" name="popup_sql">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/popup_sql.jsp"></put-attribute>
-  </definition>
-  
-  <definition name="raptor/error_page.jsp"   template="/WEB-INF/fusion/raptor/error_page.jsp"/>   
-
-    <definition extends="ebz_template_raptor" name="wizard_schedule_only">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/wizard_schedule_only.jsp"></put-attribute>
-    <put-attribute name="viewName" value="wizard_schedule_only"></put-attribute>
-  </definition>
-
-  <definition extends="ebz_template" name="report_import">
-    <put-attribute name="body"
-      value="/WEB-INF/fusion/raptor/report_import.jsp"></put-attribute>
-    <put-attribute name="viewName" value="report_import"></put-attribute>
-  </definition>
-
-  <definition name="data_out" template="/WEB-INF/fusion/jsp/data_out.jsp" />
-    <definition extends="ebz_template" name="collaborate_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
-    </definition> 
-    
-
-    <definition extends="ebz_template" name="jcs_admin">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/jcs_admin.jsp"></put-attribute>
-       <put-attribute name="viewName" value="jcs_admin"></put-attribute> 
-    </definition>
-    
-    <definition extends="ebz_template" name="usage_list">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/usage_list.jsp"></put-attribute>
-       <put-attribute name="viewName" value="usage_list"></put-attribute> 
-    </definition>
-    <!-- 
-    <definition extends="ebz_template_noheader_nofooter" name="collaboration">   
-       <put-attribute name="body" value="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"></put-attribute>
-    </definition>
-    -->
-    <definition name="collaboration" template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"/>
-    
-       
-</tiles-definitions>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ================================================================================
+  ECOMP Portal
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ================================================================================
+  -->
+
+<!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+       "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
+<tiles-definitions>
+
+    <definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">  
+      <put-attribute name="title" value=""></put-attribute>  
+      <put-attribute name="header" value="/WEB-INF/fusion/jsp/ebz/ebz_header.jsp"></put-attribute>  
+      <put-attribute name="body" value=""></put-attribute>
+      <put-attribute name="footer" value="/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp"></put-attribute>  
+    </definition>
+    
+    <definition name="ebz_template_raptor" template="/WEB-INF/fusion/jsp/ebz_template_raptor.jsp">  
+      <put-attribute name="title" value=""></put-attribute>  
+      <put-attribute name="header" value="/WEB-INF/fusion/jsp/ebz/ebz_header_raptor.jsp"></put-attribute>  
+      <put-attribute name="body" value=""></put-attribute>
+      <put-attribute name="footer" value="/WEB-INF/fusion/jsp/ebz/ebz_footer_raptor.jsp"></put-attribute>  
+    </definition>
+
+    <definition name="ebz_template_noheader_nofooter" template="/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp">  
+      <put-attribute name="body" value=""></put-attribute>
+    </definition>  
+
+      <definition name="ebz_template_report_embedded"
+    template="/WEB-INF/fusion/jsp/ebz/ebz_template_report_embedded.jsp">
+    <put-attribute name="body" value=""></put-attribute>
+  </definition>
+      
+     <definition extends="ebz_template" name="user_profile">  
+     	<put-attribute name="body" value="/WEB-INF/jsp/user_profile.jsp"></put-attribute>
+    </definition>  
+    
+    <definition extends="ebz_template" name="profile_search">   
+     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile_search.jsp"></put-attribute>
+     	<put-attribute name="viewName" value="profile_search"></put-attribute>  
+    </definition>
+    
+    <definition extends="ebz_template" name="profile">   
+     	<put-attribute name="body" value="/WEB-INF/fusion/jsp/profile.jsp"></put-attribute>
+     	<put-attribute name="viewName" value="profile"></put-attribute>  
+    </definition>   
+    
+	<definition extends="ebz_template" name="menu">   
+     	<put-attribute name="body" value="/WEB-INF/jsp/menu.jsp"></put-attribute>
+     	<put-attribute name="viewName" value="menu"></put-attribute>  
+    </definition>  
+    
+    
+    <definition extends="ebz_template" name="welcome">   
+       <put-attribute name="body" value="/WEB-INF/jsp/welcome.jsp"></put-attribute>
+       <put-attribute name="viewName" value="welcome"></put-attribute>  
+    </definition>  
+    
+    <definition extends="ebz_template" name="role_list">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_list.jsp"></put-attribute>
+       <put-attribute name="viewName" value="role_list"></put-attribute>  
+    </definition> 
+    
+    <definition extends="ebz_template" name="role">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role.jsp"></put-attribute>
+       <put-attribute name="viewName" value="role"></put-attribute>  
+    </definition>    
+     
+    <definition extends="ebz_template" name="role_function_list">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/role_function_list.jsp"></put-attribute>
+       <put-attribute name="viewName" value="role_function_list"></put-attribute>  
+    </definition>     
+     
+    <definition extends="ebz_template" name="post_search">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/post_search.jsp"></put-attribute>
+       <put-attribute name="viewName" value="post_search"></put-attribute>  
+    </definition> 
+    
+    <definition name="error" template="/WEB-INF/jsp/error.jsp"/>
+    
+	<definition name="report" template="/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html" />
+	
+	<definition extends="ebz_template" name="report_wizard">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/raptor/report_wizard.jsp"></put-attribute>
+		<put-attribute name="viewName" value="report_wizard"></put-attribute>
+	</definition>
+
+  <definition extends="ebz_template_report_embedded" name="report_embedded">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/report_ebz_embedded.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template" name="report_sample">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/report_sample.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="test_run_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/test_run_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="date_start_field_run_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="date_end_field_run_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="test_field_run_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/test_field_run_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="default_field_run_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/default_field_run_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_testrun_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_testrun_sql.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_semaphore">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_semaphore.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_import_semaphore">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_import_semaphore.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_table_cols">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_table_cols.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_drill_down_report">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_drill_down_report.jsp"></put-attribute>
+  </definition>
+  <definition extends="ebz_template_noheader_nofooter" name="popup_sql">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/popup_sql.jsp"></put-attribute>
+  </definition>
+  
+  <definition name="raptor/error_page.jsp"   template="/WEB-INF/fusion/raptor/error_page.jsp"/>   
+
+    <definition extends="ebz_template_raptor" name="wizard_schedule_only">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/wizard_schedule_only.jsp"></put-attribute>
+    <put-attribute name="viewName" value="wizard_schedule_only"></put-attribute>
+  </definition>
+
+  <definition extends="ebz_template" name="report_import">
+    <put-attribute name="body"
+      value="/WEB-INF/fusion/raptor/report_import.jsp"></put-attribute>
+    <put-attribute name="viewName" value="report_import"></put-attribute>
+  </definition>
+
+  <definition name="data_out" template="/WEB-INF/fusion/jsp/data_out.jsp" />
+    <definition extends="ebz_template" name="collaborate_list">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
+    </definition> 
+    
+    <definition extends="ebz_template" name="jcs_admin">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/jcs_admin.jsp"></put-attribute>
+       <put-attribute name="viewName" value="jcs_admin"></put-attribute> 
+    </definition>
+    
+    <definition extends="ebz_template" name="usage_list">   
+       <put-attribute name="body" value="/WEB-INF/fusion/jsp/usage_list.jsp"></put-attribute>
+       <put-attribute name="viewName" value="usage_list"></put-attribute> 
+    </definition>
+
+    <definition name="collaboration" template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp"/>    
+       
+</tiles-definitions>