Upload Usecase-UI project structure code

Change-Id: Iac0da235df9fdf075d6ea6e368cebf58695fc796 Issue-Id: USECASEUI-6 Signed-off-by: shentao <shentao@chinamobile.com>
author: shentao <shentao@chinamobile.com> 2017-08-31 23:40:50 +0800
committer: shentao <shentao@chinamobile.com> 2017-08-31 23:40:58 +0800
commit: 4ff32341a0af1972b44a7410e76e9b231131e7ab (patch)
tree: e12d231d9204183e288cd2c39100b796d0c3365c /usecaseui-common/src/main
parent: 47b0a0f5957fab266d8c02d0fb09ac6bba343cbd (diff)
39 files changed, 4924 insertions, 0 deletions
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/quartz.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/quartz.properties
new file mode 100644
index 00000000..9472ce70
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/quartz.properties
@@ -0,0 +1,29 @@
+#################################################################################
+# Quartz configurations for Quantum Work Flow									#
+#################################################################################
+
+org.quartz.scheduler.instanceId = AUTO
+
+#################################################################################
+# Main configurations
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount = 30
+
+============================================================================
+# Configure JobStore  
+#============================================================================
+
+org.quartz.jobStore.misfireThreshold = 60000
+
+org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreTX
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+org.quartz.jobStore.useProperties = false
+#org.quartz.jobStore.dataSource = myDS
+org.quartz.jobStore.tablePrefix = FN_QZ_
+
+org.quartz.jobStore.isClustered = true
+org.quartz.jobStore.clusterCheckinInterval = 20000
+
+#============================================================================
+# Configure Datasources  
+#============================================================================
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor.properties
new file mode 100644
index 00000000..1491e4ad
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor.properties
@@ -0,0 +1,169 @@
+##C## Mention the name of the framework. At present RAPTOR supports FUSION
+system=fusion
+##C## Determines the priority for the debug message.
+debug_level=5
+##C## Determines the number of records can be downloaded in excel when you select "download all" option.
+download_limit=65000
+csv_download_limit=10
+##C## Determines the number of records to be displayed in a single page.
+default_page_size=50
+##C## Determines the list size in the form field.
+form_fields_list_size=99000
+##C## Determines the scheduler interval
+#scheduler_interval=0 => disabled
+scheduler_interval=0
+##C## System Name
+system_name=RAPTOR
+##C## This is used for Bread crumbs.
+base_title=ANALYSIS
+##C## whether to allow SQL-based report definition (security risk); super users are always allowed to create SQL-based reports
+allow_sql_based_reports=yes
+##C## Determines whether to include disclaimer page at the bottom of each screen
+show_disclaimer=yes
+disclaimer_positioned_top_in_csvexcel=yes
+##C## Determines whether to display the form page as a separate page before running the report
+display_form_before_run=yes
+##C## Determines whether to include the form page on the report data page
+include_form_with_data=yes
+##C## Determines whether to cache chart data in the session => faster re-display if the data volume does not get too large
+cache_chart_data=yes
+##C## Determines whether to cache report data for the currently displayed page in the session => faster re-display
+	##C## if the data volume does not get too large
+cache_cur_page_data=yes
+##C## Determines Chart width
+default_chart_width=700
+##C## Determines Chart height
+default_chart_height=420
+##C## Determines whether to permit report deletion only by report owner or by everyone with "write" access
+delete_only_by_owner=no
+##C## Determines whether to log each report execution and update time and user ID
+enable_report_log=yes
+##C## Determines whether to cache user roles info in memory (saves many DB reads, but does not account for roles
+	##C## assigned after the cache was loaded)
+cache_user_roles=yes
+##C## Determines whether to convert month formats (e.g. MM/YYYY) to the last day of the month (true) or
+        ##C## first day (false) - like 12/2003 is converted to either 12/31/2003 or 12/01/2003
+month_format_use_last_day=no
+##C## Determines whether to print the report title in the download files
+print_title_in_download=yes
+##C## Determines whether to show report description when the report is run and in the quick links
+show_descr_at_runtime=no
+##C## Determines whether to skip labels on the Line chart axis when they overlap
+#DEPRECATED skip_chart_labels_to_fit=no
+##C## Determines whether to show chart types that are purpose and/or data specific
+show_nonstandard_charts=yes
+##C## Determines whether to allow the user to change the chart type at runtime
+allow_runtime_chart_sel=yes
+##C## Determines whether to display the report title as chart title as well
+display_chart_title=yes
+##C## Determines whether to merge/blank multi-level row headings in cross-tab report
+merge_crosstab_row_headings=yes
+##C## Determines whether to display chart when displaying the report at first or just a "Show Chart" button
+display_chart_by_default=yes
+##C## Determines whether to print the form field values in the download files
+print_params_in_download=yes
+##C## Determines the limitation to the characters in chart label.
+skip_chart_labels_limit=30
+##C## Determines whether to users with read-only rights for a report can copy it
+can_copy_on_read_only=yes
+##C## Determines the no of decimals to be displayed in Totals column
+#max_decimals_on_totals=-1 => don't truncate, display all decimal digits
+max_decimals_on_totals=2
+# Added this restriction so that heavily used system which contain
+# more than 1000 users can enable this feature not to display whole
+# users in the drop down menu
+display_all_users=yes
+##Sheet name
+sheet_name=raptor
+#shell_script_name=/home/XXXX/test.sh
+#download_query_folder=/XXXXXX/raptor/dwnld/query/
+## this directory is mentioned if the flat file is downloaded using shell script
+shell_script_dir=/titan/PROJECT3/RAPTOR/raptor/dwnld/
+flat_file_lower_limit=1
+flat_file_upper_limit=200000
+## whatever request mentioned here would be parsed in sql and request parameter would be filled
+request_get_params=isEmbedded
+print_footer_in_download=yes
+## footer mentioned here appears in downloaded excel
+footer_first_line=footer message 1
+footer_second_line=footer message 2
+## to run report in popup window
+report_in_popup_window=yes
+## to run each report in new popup window if the above is selected
+popup_in_new_window=yes
+## "Yes" allows the request param to be passed to the drill down report
+pass_request_param_in_drilldown=yes
+## Show PDF download icon
+show_pdf_download=yes
+# Show Folder Tree
+show_folder_tree=no
+#Show folder tree only for Admin Users
+show_folder_tree_only_to_admin_users=no
+#folder tree should be minimized
+folder_tree_minimized=yes
+## whatever session mentioned here would be parsed in sql and session parameter would be filled
+session_params=login_id
+display_formfield_info=yes
+customize_formfield_info=yes
+#schedule limit for end users
+schedule_limit=10
+# customized query if you need any restrictions for schedule and security tab for fusion
+#schedule_custom_query_for_users=getAllUsersByCustomer
+#schedule_custom_query_for_roles=getAllRolesByCustomer
+# customized query if you need any restrictions for schedule and security tab for prisms example
+#schedule_custom_query_for_users=SELECT au.user_id, au.first_name||' '||au.last_name user_name FROM app_user au order by 2
+schedule_custom_query_for_users=SELECT au.user_id id, concat(au.first_name,' ',au.last_name) name FROM fn_user au order by 2
+#schedule_custom_query_for_roles=SELECT ar.role_id, ar.descr role_name FROM app_role ar order by 2
+schedule_date_pattern=MM/dd/yyyy hh:mm:ss a
+## This is used to display in right format in chart timestamp axis as we give in the sql
+#chart_yearly_format=yyyy
+#chart_monthly_format=MMM-yyyy
+chart_daily_format=MM/dd/yyyy
+chart_hourly_format=MM/dd HH
+#chart_minute_format=HH:mm
+chart_minute_format=MM-dd-yyyy-HH:mm
+#chart_second_format=HH:mm:ss
+chart_second_format=MM-dd-yyyy
+#chart_millisecond_format=HH:mm:ss.S
+schedule_help_text=This form is used to schedule a specific Reporting Platform report to be delivered to one or more email addresses associated with your Company's Business Direct user logins.  Note that report output delivered via email does not include the capability to drill down/back up to additional data levels.  So, select the appropriate data level report for the scheduled report.  View the status of scheduled report requests in the My Schedules menu item.
+use_loginid_in_schedYN=Y
+session_params_for_scheduling=login_id
+session_date_formfield_auto_incr=yes
+display_session_param_pdfexcel=login_id;Login Id
+session_params_for_displaying_in_scheduling=login_id;Login Id
+application_server=tomcat
+#gmap properties
+gmap_key=XXXXXXXXXXXXXXXXXXXX
+PROJECT-FOLDER=/Users/sundar/git/st_quantum/quantum/target/quantum-1.0
+# 
+MARKET-SHAPEFILE-FOLDER=resources/files
+# output folder for files generated on server side
+OUTPUT-FOLDER=resources/temp
+# tile size in pixel
+TILE-SIZE=256
+#check if map is disabled or not
+map_allowed=Y
+max_drilldown_level=2
+admin_role_equiv_to_super_role=N
+show_loading_during_formfield_chain=Y
+show_print_icon=N
+globally_nowrap=N
+calendar_output_date_format=MM/dd/yyyy
+memory_threshold_percentage=99
+print_params_in_csv_download=yes
+notitle_in_dashboard=yes
+generate_store_sched_reports=yes
+show_excel_2007_download=yes
+print_excel_in_landscape=yes
+show_animated_chart_option=yes
+show_animated_chart_only=no
+adjust_content_based_on_height=yes
+custom_submit_button_text=Run Button
+customize_formfield_layout=yes
+#db_type=postgresql
+#### ORACLE #### 
+#db_type=oracle
+#time_format=MM/DD/YYYY HH:MI:SS AM
+#### MARIADB ####
+db_type=mysql
+time_format=%m/%d/%Y %h:%i:%s %p
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
new file mode 100644
index 00000000..33ae0572
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
@@ -0,0 +1,20 @@
+temp_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/temp/
+upload_folder_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/
+excel_template_path=/demeter/WebApps/dev/ECOMP_PORTAL/files/raptor_template/
+temp_folder_url=temp/
+upload_folder_url=upload/
+smtp_server=todo.smtp.com
+default_email_sender=email-name@email.com
+error_page=error_page
+jsp_context_path=raptor/
+img_folder_url=static/fusion/raptor/images/
+base_folder_url=static/fusion/raptor/
+direct_access_url=http://localhost:8080/quantum/raptor_email_attachment.htm?action=raptor&source_page=report_run&display_content=y
+#base_action_url=report.htm#/report_run/
+drill_action_url=report.htm#/report_run/c_master=
+base_action_url=report_wizard.htm?action=
+base_action_url_ng=report#/
+base_action_param=c_master=
+super_role_id=1
+admin_role_ids=1
+quick_links_menu_ids=HOME,CUSTOMER,REPORTS
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_pdf.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
new file mode 100644
index 00000000..d7f8249c
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
@@ -0,0 +1,30 @@
+## pdf file specific properties
+pdf_data_font_size=9
+pdf_data_font_family=Arial
+#reduce the font size from html config
+pdf_data_font_size_offset=2
+pdf_data_alternate_color=true
+#data row background(white), alternate(light light blue/gray)
+pdf_data_background_alternate_hex_code=#EDEDED
+pdf_data_default_background_hex_code=#FFFFFF
+#header font (white)  background (gray)
+pdf_data_table_header_font_hex_code=#FFFFFF
+pdf_data_table_header_background_hex_code=#8A9BB3
+#footer header
+pdf_footer_font_size=9
+pdf_footer_font_family=Arial
+pdf_footer=footer message
+pdf_footer_font_size=7
+pdf_date_timezone=GMT
+pdf_date_pattern=MM/dd/yyyy hh:mm:ss a
+##page number position at 1 - footer middle, 0 -- header right, 2 - both
+pdf_page_number_position=1
+pdf_word_before_page_number=Page
+pdf_word_after_page_number=
+pdf_coverpage_firstcolumn_size=0.3
+pdf_image_auto_rotate=false
+display_create_owner_info=true
+#session_info=customer,customerId
+display_loginid_for_downloaded_by=false
+# please use false if you want landscape to be default.
+is_default_orientation_portrait=true
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties b/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties
new file mode 100644
index 00000000..c643bb97
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties
@@ -0,0 +1,305 @@
+#SQL Statements for PostgreSQL
+
+#ReportLoader.java
+
+load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=?
+
+# need to copy to oracle
+load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE  FROM dual union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a  where schema_id <> 'local' order by schema_id
+load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a where schema_id = '[schema_id]'
+#formfield rendering
+
+formfield.id.name.sql.prefix=SELECT id, name FROM (
+formfield.id.name.sql=SELECT id, name
+
+formfield.id.name.sql.suffix=
+
+report.security.create= SELECT coalesce(cr.owner_id, cr.create_id) AS owner_id, cr.create_id,  DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, maint_id,  DATE_FORMAT(cr.maint_date, '%m/%d/%Y')  update_date, cr.public_yn FROM cr_report cr WHERE cr.rep_id = [rw.getReportID()]
+
+db.update.report.xml.mysql=UPDATE cr_report SET report_xml=? WHERE rep_id=?
+db.update.report.xml.mysql.select=SELECT rep_id,report_xml FROM cr_report where rep_id = ?
+db.update.report.xml = SELECT cr.rep_id, cr.report_xml FROM cr_report cr WHERE rep_id=? FOR UPDATE
+
+update.custom.report.rec = UPDATE cr_report SET title='[Utils.oracleSafe(rw.getReportName())]', descr='[Utils.oracleSafe(rw.getReportDescr())]', public_yn='[(rw.isPublic()]', menu_id='[rw.getMenuID()]', menu_approved_yn='[(rw.isMenuApproved()]', owner_id=[rw.getOwnerID()], maint_id=[rw.getUpdateID()], maint_date=STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getTimeFormat()]'), dashboard_type_yn='[(rw.isDashboardType()]', dashboard_yn= '[(rw.getReportType().equals(AppConstants.RT_DASHBOARD)]' WHERE rep_id = [rw.getReportID()]
+
+is.report.already.scheduled = select rep_id from cr_report_schedule where rep_id = ?
+
+create.custom.report.rec = INSERT INTO cr_report(rep_id, title, descr, public_yn, menu_id, menu_approved_yn, report_xml, owner_id, create_id, create_date, maint_id, maint_date, dashboard_type_yn, dashboard_yn, folder_id) VALUES([rw.getReportID()], '[Utils.oracleSafe(rw.getReportName())]', '[Utils.oracleSafe(rw.getReportDescr())]', '[rw.isPublic()]', '[rw.getMenuID()]', '[rw.isMenuApproved()]', '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>', [rw.getOwnerID()], [rw.getCreateID()], STR_TO_DATE('[rw.getCreateDate()]', '[Globals.getTimeFormat()]'), [rw.getUpdateID()], STR_TO_DATE('[rw.getUpdateDate()]', '[Globals.getTimeFormat()]'), '[rw.isDashboardType()]', '[rw.getReportType().equals(AppConstants.RT_DASHBOARD)]',[rw.getFolderId()]) 
+
+get.user.report.names = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE coalesce(cr.owner_id, cr.create_id) = [userID]							
+								
+get.report.owner.id = SELECT coalesce(cr.owner_id, cr.create_id) AS owner FROM cr_report cr WHERE rep_id = ?						
+
+delete.report.record.log = DELETE FROM cr_report_log WHERE rep_id = [reportID]
+
+delete.report.record.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]
+
+delete.report.record.schedule = DELETE FROM cr_report_schedule WHERE rep_id = [reportID]
+
+delete.report.record.access = DELETE FROM cr_report_access WHERE rep_id = [reportID]
+
+delete.report.record.email = DELETE FROM cr_report_email_sent_log WHERE rep_id = [reportID]
+
+delete.report.record.favorite = DELETE FROM cr_favorite_reports WHERE rep_id = [reportID]
+
+delete.report.record.report = DELETE FROM cr_report WHERE rep_id = [reportID]
+																						
+load.quick.links =  select finalcr.rep_id, finalcr.title, finalcr.descr from (SELECT cr.rep_id, cr.title, cr.descr FROM (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra LEFT JOIN cr_report cr ON cr.rep_id = ra.rep_id WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND cr.menu_approved_yn = 'Y' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) UNION SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' or EXISTS (select * from fn_user_role where user_id=[userID] and role_id in (1)))) finalcr ORDER BY finalcr.title
+
+load.folder.reports = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'</a>') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN app_user au ON coalesce(cr.owner_id, cr.create_id) = au.user_id AND cr.folder_id= '[folderId]' LEFT JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL(SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id
+#If roleList.toString() is '' PostgreSQL returns an error - needs to be null instead of empty
+
+load.folder.reports.user = AND coalesce(cr.owner_id, cr.create_id) = [userID]	
+
+load.folder.reports.publicsql = AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.quick.download.links = SELECT a.file_name, b.title,DATE_FORMAT(a.dwnld_start_time, '%W %d-%m-%Y %H:%i:%s') as time, a.dwnld_start_time FROM cr_report_dwnld_log a, cr_report b where a.user_id = [userID] and a.rep_id = b.rep_id and (a.dwnld_start_time) >= STR_TO_DATE(DATE_FORMAT(now() -  INTERVAL 1 DAY, '%m/%d/%Y'), '%m/%d/%Y') and a.record_ready_time is not null order by a.dwnld_start_time
+
+load.reports.to.schedule = SELECT cr.rep_id, Initcap(cr.title), cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL or cr.owner_id = [userID] )ORDER BY Initcap(cr.title)
+		
+load.reports.to.add.in.dashboard = SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr LEFT OUTER JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id AND (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) AND (cr.dashboard_yn = 'N' or cr.dashboard_yn is null) ORDER BY cr.title
+
+load.my.recent.links = select rep_id, title, descr, form_fields from ( select rep_id, title, descr, form_fields from  (select cr.rep_id, cr.title, a.form_fields,  cr.descr, a.log_time, a.user_id, a.action, a.action_value from cr_report_log a, cr_report cr where user_id = [userID] AND action = 'Report Execution Time' and a.rep_id = cr.rep_id order by log_time desc) AS x) AS y where LIMIT 1, 6
+
+create.report.log.entry = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], now(), [userID], '[action]' , '[executionTime]', '[form_fields]')
+
+create.report.log.entry.exec.time = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], NOW() + INTERVAL 1 SECOND, [userID], '[action]' , '[executionTime]', '[formFields]')
+
+clear.report.log.entries = DELETE FROM cr_report_log WHERE rep_id = ? and user_id = ?
+
+load.report.log.entries = SELECT x.log_time, x.user_id, (CASE WHEN x.action = 'Report Execution Time' THEN  concat('<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master=',x.rep_id,'&',x.form_fields,'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\">',x.action,'</a>') ELSE x.action END) action, (CASE WHEN x.action = 'Report Execution Time' THEN  action_value  ELSE 'N/A' END) time_taken, (CASE WHEN x.action = 'Report Execution Time' THEN concat('<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master=',x.rep_id,'&',x.form_fields,'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\"><img src=\"[AppUtils.getImgFolderURL()]test_run.gif" width=\"12\" height=\"12\" border=0 alt=\"Run report\"/></a>') ELSE 'N/A' END) run_image, x.name FROM  (SELECT rl.rep_id, DATE_FORMAT(rl.log_time, '%m/%d/%Y %h:%i:%s %p') log_time, rl.action_value, concat(fuser.last_name ,', ',fuser.first_name) name, rl.user_id, rl.action, rl.form_fields FROM cr_report_log rl, fn_user fuser WHERE rl.rep_id = [nvls(reportId)] and rl.action != 'Report Run' and fuser.user_id = rl.user_id ORDER BY rl.log_time DESC) x  LIMIT 100
+
+does.user.can.schedule.report = select crs.sched_user_id, count(*) from cr_report_schedule crs where sched_user_id = [userId] group by crs.sched_user_id having count(*) >= [Globals.getScheduleLimit()]
+
+does.user.can.schedule = select crs.schedule_id from cr_report_schedule crs where schedule_id = [scheduleId]
+
+get.system.date.time = select DATE_FORMAT(now(),'%m/%d/%Y %H:%i:%s')
+
+get.next.day.date.time = select DATE_FORMAT(NOW() + INTERVAL 1 DAY,'%m/%d/%Y %H:%i:%s')
+
+get.next.fifteen.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 15 MINUTES,'%m/%d/%Y %H:%i:%s')
+
+get.next.thirty.minutes.date.time = select DATE_FORMAT(NOW() + INTERVAL 30 MINUTES,'%m/%d/%Y %H:%i:%s')
+
+get.template.file = select template_file from cr_report_template_map where report_id = [reportId]
+
+load.pdf.img.lookup = select image_id, image_loc from cr_raptor_pdf_img
+
+load.action.img.lookup = select image_id, image_loc from cr_raptor_action_img
+
+
+#ActionHandler.java
+
+report.values.map.def.a = SELECT x FROM (SELECT DISTINCT 
+
+report.values.map.def.b = TO_CHAR([colName], '[nvl(displayFormat, AppConstants.DEFAULT_DATE_FORMAT)]')
+
+report.values.map.def.c = [colName] 
+
+report.values.map.def.d =  x FROM [rdef.getTableById(tableId).getTableName()] WHERE [colName] IS NOT NULL ORDER BY 1) xx LIMIT <= [Globals.getDefaultPageSize()]
+
+test.sched.cond.popup = SELECT 1 WHERE EXISTS ([sql])
+
+download.all.email.sent = Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG where gen_key='[pdfAttachmentKey.trim()]' and log_id =[report_email_sent_log_id.trim()] and (now() - sent_date) < '1 day' limit 1
+
+download.all.gen.key = select schedule_id from cr_report_email_sent_log u where U.GEN_KEY = '[pdfAttachmentKey]'
+
+download.all.retrieve = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.run_date IS NOT NULL  AND rs.schedule_id = [scheduleId]) x, cr_report r, app_user au WHERE x.rep_id = r.rep_id  AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [scheduleId]  UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and  rsu2.schedule_id = [scheduleId]))
+
+download.all.insert = insert into cr_report_dwnld_log (user_id,rep_id,file_name,dwnld_start_time,filter_params) values (?,?,?,?,?)
+
+#ReportWrapper.java
+
+report.wrapper.format = SELECT coalesce(cr.owner_id, cr.create_id) owner_id, cr.create_id, DATE_FORMAT(cr.create_date, '[Globals.getTimeFormat()]') create_date, maint_id, DATE_FORMAT(cr.maint_date, '[Globals.getTimeFormat()]') update_date, cr.menu_id, cr.menu_approved_yn FROM cr_report cr WHERE cr.rep_id= [reportID]
+
+generate.subset.sql = SELECT [colNames.toString()] FROM (SELECT  [colNames.toString()] FROM ([reportSQL]) AS x ) AS y 
+
+report.sql.only.first.part = SELECT [colNames.toString()] FROM (SELECT [colNames.toString()] FROM (
+
+report.sql.only.second.part.a = [startRow] 
+
+report.sql.only.second.part.b = [pageSize]
+#MYSQL: LIMIT [startRow], [pageSize]
+#ORacle: rownum >= [startRow] and rownum <= ([startRow]+[pageSize])
+#Postgre: limit [pageSize] offset [startRow] 
+
+report.sql.only.second.part.b.noorderby =  LIMIT [startRow]
+
+generate.sql.visual.select = SELECT
+
+generate.sql.visual.count = COUNT(*) cnt
+
+generate.sql.visual.dual = 
+#No DUAL table in PostgreSQL so this is blank
+
+#ReportRuntime.java
+
+load.crosstab.report.data = SELECT  [colNames.toString()] FROM ( [reportSQL] 
+
+#RaptorRunHandler.java
+
+generate.sql.handler = SELECT  x.* from ([sql]) AS x LIMIT 2
+
+generate.sql.select = SELECT [colNames.toString()] FROM (SELECT  [colNames.toString()] FROM ([sql]) AS y) AS x 
+			
+#ReportSchedule.java
+
+load.schedule.data = SELECT rs.enabled_yn, DATE_FORMAT(rs.start_date, '%m/%d/%Y') start_date, DATE_FORMAT(rs.end_date, '%m/%d/%Y') end_date, DATE_FORMAT(rs.run_date, '%m/%d/%Y') run_date, coalesce(DATE_FORMAT(rs.run_date, '%h'), '12') run_hour, coalesce(DATE_FORMAT(rs.run_date, '%i'), '00') run_min, coalesce(DATE_FORMAT(rs.run_date, '%p'), 'AM') run_ampm, rs.recurrence, rs.conditional_yn, rs.notify_type, rs.max_row, rs.initial_formfields, rs.schedule_id, coalesce(DATE_FORMAT(rs.end_date, '%h'), '11') end_hour, coalesce(DATE_FORMAT(rs.end_date, '%i'), '45') end_min, coalesce(DATE_FORMAT(rs.end_date, '%p'), 'PM') end_ampm, encrypt_yn, attachment_yn FROM cr_report_schedule rs WHERE rs.rep_id = [reportID]
+
+load.schedule.getid = SELECT rsu.user_id, concat(fuser.last_name,', ',fuser.first_name), fuser.login_id FROM cr_report_schedule_users rsu, fn_user fuser WHERE rsu.rep_id = [reportID]  AND rsu.schedule_id = [getScheduleID()] and rsu.user_id IS NOT NULL and rsu.user_id = fuser.user_id
+
+load.schedule.users = SELECT rsu.role_id FROM cr_report_schedule_users rsu WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] AND rsu.role_id IS NOT NULL
+
+new.schedule.data = select coalesce(max(schedule_id),0)+1  AS sequence from cr_report_schedule
+
+new.report.data = select coalesce(max(rep_id),0)+1  AS rep_id from cr_report
+
+execute.update = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()]
+
+execute.update.users = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], [emailToUsers.get(i)).getId()], NULL, [(i + 1)])
+
+execute.update.roles = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], NULL, [emailToRoles.get(i)).getId()], [((emailToUsers.size() + i + 1)])
+
+execute.update.activity = INSERT into cr_schedule_activity_log (schedule_id, notes, run_time) values ([getScheduleID()],'Submitted:Schedule',TO_DATE('[getRunDate()] [getRunHour()]:[getRunMin()] [getRunAMPM()]', 'MM/DD/YYYY HH:MI AM'))
+ 
+delete.schedule.data = SELECT 1 FROM cr_report_schedule WHERE rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]  and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.id = DELETE FROM cr_report_schedule where rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+
+load.cond.sql = SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=?
+
+load.cond.sql.select = SELECT condition_sql FROM cr_report_schedule WHERE schedule_id = [scheduleId]
+
+persist.cond.sql.update = update cr_report_schedule set condition_large_sql = '' where  schedule_id = [scheduleId]
+#EMPTY CLOB() changed to ''
+
+persist.cond.sql.large = SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE
+
+persist.cond.sql.set = update cr_report_schedule set condition_sql = ? where schedule_id = [scheduleId]
+
+#DataCache.java
+
+get.data.view.actions = SELECT ts.web_view_action FROM cr_table_source ts WHERE ts.web_view_action IS NOT NULL
+
+get.public.report.id.names = SELECT rep_id, title FROM cr_report WHERE public_yn = 'Y' ORDER BY title
+
+get.private.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id not in (select rep_id from cr_report_access cra where user_id =  '[user_id]' 
+
+get.private.accessible.names.if =  OR role_id in (
+
+get.private.accessible.names.b =  ) AND public_yn = 'N' and cr.owner_id = '[user_id]' order by 2 
+
+get.group.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr  WHERE cr.rep_id  in (select rep_id from cr_report_access cra where user_id =  '[user_id]'
+
+get.group.accessible.names.b =  )  AND public_yn = 'N' order by 2 
+
+get.report.table.sources.a = SELECT table_name, display_name, pk_fields, web_view_action, large_data_source_yn, filter_sql FROM cr_table_source 
+
+get.report.table.sources.where =  where SOURCE_DB= '[dBInfo]'
+
+get.report.table.sources.if =  where SOURCE_DB is null or SOURCE_DB = '[AppConstants.DB_LOCAL]'
+
+get.report.table.sources.else =  ORDER BY table_name
+
+grab.report.table.a = SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql FROM cr_table_source ts  WHERE 
+
+grab.report.table.if = ts.SOURCE_DB= '[dBInfo]'
+
+grab.report.table.else = (ts.SOURCE_DB is null or ts.SOURCE_DB = '[AppConstants.DB_LOCAL]')
+
+grab.report.table.b =  except SELECT ts.table_name, ts.display_name, ts.pk_fields,  ts.web_view_action,  ts.large_data_source_yn, ts.filter_sql from cr_table_source ts where table_name in (select table_name from  cr_table_role where role_id not IN [sb.toString()]) and 
+
+grab.report.table.c =  ORDER BY 1 
+
+get.report.table.crjoin = SELECT src_table_name, dest_table_name, join_expr FROM cr_table_join
+
+get.report.table.joins = SELECT tj.src_table_name, tj.dest_table_name, tj.join_expr FROM cr_table_join tj WHERE ((EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name AND trs.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name))) AND ((EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name AND trd.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name)))
+
+generate.report.table.col = SELECT a.table_name, a.column_name, a.data_type, a.label FROM user_column_def a WHERE a.table_name = '[tableName.toUpperCase()]' ORDER BY a.column_id
+
+generate.db.user.sql.a = SELECT utc.table_name, utc.column_name, utc.data_type, 
+
+generate.db.user.sql.if = utc.column_name FROM user_tab_columns utc 
+
+generate.db.user.sql.else = coalesce(x.label, utc.column_name) FROM user_tab_columns utc 
+
+generate.db.user.sql.b = WHERE utc.table_name = '[tableName.toUpperCase()]' 
+
+generate.db.user.sql.c = AND utc.table_name = x.table_name AND utc.column_name = x.column_name 
+
+generate.db.user.sql.d = ORDER BY utc.column_id 
+
+#SearchHandler.java
+
+load.report.search.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, DATE_FORMAT(cr.create_date, '%m/%d/%Y') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn, case when report_xml like '%<allowSchedule>N</allowSchedule>%' then 'N' when report_xml like '%<allowSchedule>Y</allowSchedule>%' or 1 = (select distinct 1 from cr_report_schedule where rep_id = cr.rep_id) then 'Y' else 'N' end FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id [fReportID] [fReportName] LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
+
+load.report.search.instr = WHERE cr.menu_id LIKE '%[menuId]%'
+
+load.report.search.result.user = WHERE coalesce(cr.owner_id, cr.create_id) = [userID]
+
+load.report.search.result.public = WHERE (coalesce(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.report.search.result.fav =  WHERE cr.rep_id in (select rep_id from cr_favorite_reports where user_id = [userID]
+
+load.report.search.result.sort = ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN 'upper(concat(au.first_name,' ',au.last_name))' ELSE 'upper(cr.title)' END
+
+load.folder.report.result = SELECT cr.rep_id, cr.rep_id report_id, concat([rep_title_sql] , (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END),cr.title,'</a>') title, cr.descr, concat(au.first_name,' ',au.last_name) owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE coalesce(ra.read_only_yn, 'Y') END read_only_yn, CASE WHEN coalesce(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END user_is_owner_yn FROM cr_report cr JOIN fn_user au ON coalesce (cr.owner_id, cr.create_id) = au.user_id AND TO_CHAR(cr.rep_id, 'FM99999999') like coalesce('%[fReportID]%', TO_CHAR(cr.rep_id, 'FM99999999')) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
+
+load.folder.report.result.sort =  ORDER BY CASE coalesce(cr.owner_id, cr.create_id) WHEN [userID] THEN ' ' WHEN '(concat(au.first_name,' ',au.last_name))' ELSE 'cr.title' END
+
+#WizardProcessor.java
+
+process.filter.add.edit = '[argValue]'
+
+#ReportDefinition.java
+
+persist.report.adhoc = SELECT nextval('[Globals.getAdhocReportSequence()]') AS sequence
+
+#Globals.java
+
+initialize.roles = SELECT 1 WHERE EXISTS (SELECT 1 FROM cr_table_role)
+
+initialize.version = SELECT cr_raptor.get_version
+
+# scheduler
+
+
+scheduler.available.schedules = SELECT x.rep_id, x.schedule_id, x.conditional_yn, x.condition_large_sql, x.notify_type, x.max_row, x.initial_formfields, x.processed_formfields, r.title, x.user_id FROM ( SELECT rs.rep_id, rs.schedule_id, rs.sched_user_id user_id, rs.conditional_yn, rs.condition_large_sql, rs.notify_type, rs.max_row, rs.initial_formfields, rs.processed_formfields  FROM cr_report_schedule rs  WHERE rs.enabled_yn='Y'  AND rs.start_date <= [currentDate]  AND  (rs.end_date >= [currentDate] or rs.end_date is null )  AND rs.run_date IS NOT NULL  ) x, cr_report r  WHERE x.rep_id = r.rep_id
+
+random.string = select ( concat('Z' , round(random() * 1000000000000) ) )
+
+
+scheduler.user.emails = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= now() AND rs.end_date  >= now() AND rs.run_date IS NOT NULL AND rs.schedule_id = [p_schedule_id] ) x, cr_report r, fn_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [p_schedule_id] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [p_schedule_id]))  
+
+
+# my logins
+
+app.query = SELECT APP_ID, ML_APP_NAME, MOTS_ID from fn_app
+
+user.log.query = SELECT DISTINCT  IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"',IFNULL(SBCID, ''),'"') APPLICATIONUSERID,  CONCAT('"',IFNULL(FIRST_NAME, ''),'"') FIRST_NAME, CONCAT('"',substr(IFNULL(MIDDLE_NAME, ''), 0, 1),'"') MIDDLE_INITIAL, CONCAT('"',IFNULL(LAST_NAME, ''),'"') LAST_NAME, IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, DATE_FORMAT(CREATED_DATE, '%Y/%m/%d') ACCOUNT_ACTIVATION_DATE, IFNULL(DATE_FORMAT(MODIFIED_DATE, '%Y/%m/%d'), '') LAST_DATE_ACCOUNT_MODIFIED,  '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"',IFNULL(FIRST_NAME, ''),' ',IFNULL(MIDDLE_NAME, ''),' ',IFNULL(LAST_NAME, ''),'"')  FULL_USER_NAME, '' NT_ID, IFNULL(EMAIL, '') EMAIL   FROM FN_USER FU, FN_USER_ROLE FUR WHERE FU.USER_ID \= FUR.USER_ID and FUR.app_id \= ? and ACTIVE_YN \= 'Y' and sbcid is not null order by 1
+
+profile.log.query = SELECT DISTINCT CONCAT('"' , ROLE_NAME , '"') PROFILE_NAME, '""' SECURITY_SETTINGS FROM FN_ROLE FR, FN_USER_ROLE FUR WHERE FUR.ROLE_ID \= FR.ROLE_ID and FR.ACTIVE_YN \= 'Y' and ((FUR.APP_ID \= 1 and FR.ROLE_NAME <> 'Standard User') or (FUR.APP_ID \= ? and FUR.APP_ID <> 1))  ORDER BY 1
+
+user.profile.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, '' AWID, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , CONCAT('"' , ROLE_NAME , '"')  PROFILE_NAME  FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND A.ACTIVE_YN \= 'Y' AND C.ACTIVE_YN \= 'Y' AND a.sbcid is not null  AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1
+
+all.accounts.log.query = SELECT DISTINCT IFNULL(SBCID, '') CUID, (case when A.ACTIVE_YN\='Y' then 'ACTIVE' else 'INACTIVE' end) ACTIVE_YN, CONCAT('"' , IFNULL(SBCID, '') , '"') APPLICATIONUSERID , IFNULL(DATE_FORMAT(LAST_LOGIN_DATE, '%Y/%m/%d'), '') LAST_LOGON_DATE, '' LAST_PASSWORD_CHANGE_DATE, CONCAT('"' , ROLE_NAME , '"')  PROFILE_NAME  FROM FN_USER A, FN_USER_ROLE B, FN_ROLE C WHERE A.USER_ID \= B.USER_ID AND B.ROLE_ID \= C.ROLE_ID AND a.sbcid is not null  AND ((B.APP_ID \= 1 and C.ROLE_NAME <> 'Standard User') or (B.APP_ID \= ? and B.APP_ID <> 1)) ORDER BY 1
+
+# basic sql
+
+seq.next.val = SELECT nextval('[sequenceName]') AS id
+
+current.date = now()
+
+nvl = IFNULL
+
+# report security
+report.user.access = SELECT ra.role_id, ra.user_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.rep_id = [reportID]
+add.user.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, NULL, [userID], '[readOnlyAccess]')
+update.user.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND user_id=[userID]
+remove.user.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND user_id=[userID]
+add.role.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, [roleID], NULL, '[readOnlyAccess]')
+update.role.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND role_id=[roleID]
+remove.role.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND role_id=[roleID]
+
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties.oracle b/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties.oracle
new file mode 100644
index 00000000..2c5af5e9
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/conf/sql.properties.oracle
@@ -0,0 +1,282 @@
+#SQL Statements for OracleSQL
+
+#ReportLoader.java
+
+load.custom.report.xml = SELECT cr.report_xml FROM cr_report cr WHERE rep_id=?
+
+# need to copy to oracle
+load.remoteDB.schema = SELECT 'local' SCHEMA_ID, 'local' SCHEMA_DESC, null DATASOURCE_TYPE  FROM DUAL  union SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE FROM SCHEMA_INFO a  where schema_id <> 'local' order by schema_id
+load.remoteDB.schema.where = SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE  FROM SCHEMA_INFO a where schema_id = '[schema_id]'
+#formfield rendering
+
+formfield.id.name.sql.prefix=SELECT id, name FROM (
+formfield.id.name.sql=SELECT id, name
+
+formfield.id.name.sql.suffix=
+
+report.security.create= SELECT nvl(cr.owner_id, cr.create_id) AS owner_id, cr.create_id,  TO_CHAR(cr.create_date, 'MM/dd/YYYY') create_date, maint_id,  TO_CHAR(cr.maint_date, 'MM/dd/YYYY')  update_date, cr.public_yn FROM cr_report cr WHERE cr.rep_id = [rw.getReportID()]
+
+db.update.report.xml = SELECT cr.rep_id, cr.report_xml FROM cr_report cr WHERE rep_id=? FOR UPDATE
+
+update.custom.report.rec = UPDATE cr_report SET title='[Utils.oracleSafe(rw.getReportName())]', descr='[Utils.oracleSafe(rw.getReportDescr())]', public_yn='[(rw.isPublic()]', menu_id='[rw.getMenuID()]', menu_approved_yn='[(rw.isMenuApproved()]', owner_id=[rw.getOwnerID()], maint_id=[rw.getUpdateID()], maint_date=TO_DATE('[rw.getUpdateDate()]', '[Globals.getTimeFormat()]'), dashboard_type_yn='[(rw.isDashboardType()]', dashboard_yn= '[(rw.getReportType().equals(AppConstants.RT_DASHBOARD)]' WHERE rep_id = [rw.getReportID()]
+
+is.report.already.scheduled = select rep_id from cr_report_schedule where rep_id = ?
+
+create.custom.report.rec = INSERT INTO cr_report(rep_id, title, descr, public_yn, menu_id, menu_approved_yn, report_xml, owner_id, create_id, create_date, maint_id, maint_date, dashboard_type_yn, dashboard_yn, folder_id) VALUES([rw.getReportID()], '[Utils.oracleSafe(rw.getReportName())]', '[Utils.oracleSafe(rw.getReportDescr())]', '[rw.isPublic()]', '[rw.getMenuID()]', '[rw.isMenuApproved()]', '<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>', [rw.getOwnerID()], [rw.getCreateID()], TO_DATE('[rw.getCreateDate()]', '[Globals.getTimeFormat()]'), [rw.getUpdateID()], TO_DATE('[rw.getUpdateDate()]', '[Globals.getTimeFormat()]'), '[rw.isDashboardType()]', '[rw.getReportType().equals(AppConstants.RT_DASHBOARD)]',[rw.getFolderId()])
+
+get.user.report.names = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE nvl(cr.owner_id, cr.create_id) = [userID]
+
+get.report.owner.id = SELECT nvl(cr.owner_id, cr.create_id) owner FROM cr_report cr WHERE rep_id = ?
+
+delete.report.record.log = DELETE FROM cr_report_log WHERE rep_id = [reportID]
+
+delete.report.record.users = DELETE FROM cr_report_schedule_users WHERE rep_id = [reportID]
+
+delete.report.record.schedule = DELETE FROM cr_report_schedule WHERE rep_id = [reportID]
+
+delete.report.record.access = DELETE FROM cr_report_access WHERE rep_id = [reportID]
+
+delete.report.record.email = DELETE FROM cr_report_email_sent_log WHERE rep_id = [reportID]
+
+delete.report.record.favorite = DELETE FROM cr_favorite_reports WHERE rep_id = [reportID]
+
+delete.report.record.report = DELETE FROM cr_report WHERE rep_id = [reportID]
+
+load.quick.links =  select finalcr.rep_id, finalcr.title, finalcr.descr from (SELECT cr.rep_id, cr.title, cr.descr FROM (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra LEFT JOIN cr_report cr ON cr.rep_id = ra.rep_id WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND cr.menu_approved_yn = 'Y' AND (nvl(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL) UNION SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr WHERE cr.menu_id LIKE '%[nvls(menuId)]%' AND (nvl(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' or EXISTS (select * from fn_user_role where user_id=[userID] and role_id in (1)))) finalcr ORDER BY finalcr.title
+
+load.folder.reports = SELECT cr.rep_id, cr.rep_id report_id, ([rep_title_sql] || (CASE WHEN cr.public_yn = 'Y' THEN '' ELSE '[PRIVATE_ICON]' END)||cr.title||'</a>') title, cr.descr, (au.first_name||' '||au.last_name) owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, (CASE WHEN nvl(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE nvl(ra.read_only_yn, 'Y') END) read_only_yn, DECODE(NVL(cr.owner_id, cr.create_id), [userID], 'Y', 'N') user_is_owner_yn FROM cr_report cr JOIN app_user au ON nvl(cr.owner_id, cr.create_id) = au.user_id AND cr.folder_id= '[folderId]' LEFT JOIN (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL(SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON cr.rep_id = ra.rep_id
+
+load.folder.reports.user = AND nvl(cr.owner_id, cr.create_id) = [userID]
+
+load.folder.reports.publicsql = AND (nvl(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.quick.download.links = SELECT a.file_name, b.title,to_char(a.dwnld_start_time, 'Dy DD-Mon-YYYY HH24:MI:SS') as time, a.dwnld_start_time FROM cr_report_dwnld_log a, cr_report b where a.user_id = [userID] and a.rep_id = b.rep_id and (a.dwnld_start_time) >= to_date(to_char(sysdate-24/24, 'mm/dd/yyyy'), 'mm/dd/yyyy') and a.record_ready_time is not null order by a.dwnld_start_time desc
+
+load.reports.to.schedule = SELECT cr.rep_id, Initcap(cr.title), cr.descr FROM cr_report cr, (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra WHERE cr.rep_id = ra.rep_id (+) AND (cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL or cr.owner_id = [userID] ) ORDER BY Initcap(cr.title)
+
+load.reports.to.add.in.dashboard = SELECT cr.rep_id, cr.title, cr.descr FROM cr_report cr, (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra WHERE cr.rep_id = ra.rep_id (+) AND (nvl(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)  AND (cr.dashboard_yn = 'N' or cr.dashboard_yn is null) ORDER BY cr.title
+
+load.my.recent.links = select rep_id, title, descr, form_fields from ( select rownum, rep_id, title, descr, form_fields from (select cr.rep_id, cr.title, a.form_fields,  cr.descr, a.log_time, a.user_id, a.action, a.action_value  from cr_report_log a, cr_report cr where user_id = [userID]  and action = 'Report Execution Time' and a.rep_id = cr.rep_id order by log_time desc) x where rownum <= 6 ) y where rownum >= 1
+
+create.report.log.entry = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], SYSDATE, [userID], '[action]' , '[executionTime]', '[form_fields]')
+
+create.report.log.entry.exec.time = INSERT INTO cr_report_log (rep_id, log_time, user_id, action, action_value, form_fields) VALUES([reportID], sysdate+1/(24*60*60), [userID], '[action]' , '[executionTime]', '[formFields]')
+
+clear.report.log.entries = DELETE from cr_report_log WHERE rep_id = ? and user_id = ?
+
+load.report.log.entries = SELECT x.log_time, x.user_id, (CASE WHEN x.action = 'Report Execution Time' THEN  '<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master='||x.rep_id||'&'||x.form_fields||'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\">'||x.action||'</a>' ELSE x.action END) action,  (CASE WHEN x.action = 'Report Execution Time' THEN  action_value  ELSE 'N/A' END) time_taken,  (CASE WHEN x.action = 'Report Execution Time' THEN '<a href=\"[AppUtils.getRaptorActionURL()]report.run.container&c_master='||x.rep_id||'&'||x.form_fields||'&fromReportLog=Y&display_content=Y&noFormFields=Y&refresh=Y\"><img src=\"[AppUtils.getImgFolderURL()]test_run.gif\" width=\"12\" height=\"12\" border=0 alt=\"Run report\"/></a>' ELSE 'N/A' END) run_image,  x.name FROM  (SELECT rl.rep_id, TO_CHAR(rl.log_time, 'Month DD, YYYY HH:MI:SS AM') log_time, rl.action_value, fuser.last_name ||', '||fuser.first_name name,  rl.user_id, rl.action, rl.form_fields FROM cr_report_log rl, fn_user fuser WHERE rl.rep_id = [nvls(reportId)] and rl.action != 'Report Run' and fuser.user_id = rl.user_id ORDER BY rl.log_time DESC) x WHERE ROWNUM <= 100
+
+does.user.can.schedule.report = select crs.sched_user_id, count(*) from cr_report_schedule crs where sched_user_id = [userId] group by crs.sched_user_id having count(*) >= [Globals.getScheduleLimit()]
+
+does.user.can.schedule = select crs.schedule_id from cr_report_schedule crs where schedule_id = [scheduleId]
+
+get.system.date.time = select to_char(sysdate,'MM/dd/yyyy HH24:mi:ss') from dual
+
+get.next.day.date.time = select to_char(sysdate+1,'MM/dd/yyyy HH24:mi:ss') from dual
+
+get.next.fifteen.minutes.date.time = select to_char(sysdate+15/(24*60),'MM/dd/yyyy HH24:mi:ss') from dual
+
+get.next.thirty.minutes.date.time = select to_char(sysdate+30/(24*60),'MM/dd/yyyy HH24:mi:ss') from dual
+
+get.template.file = select template_file from cr_report_template_map where report_id = [reportId]
+
+load.pdf.img.lookup = select image_id, image_loc from cr_raptor_pdf_img
+
+load.action.img.lookup = select image_id, image_loc from cr_raptor_action_img
+
+#ActionHandler.java
+
+report.values.map.def.a = SELECT x FROM (SELECT DISTINCT 
+
+report.values.map.def.b = TO_CHAR([colName], '[nvl(displayFormat, AppConstants.DEFAULT_DATE_FORMAT)]')
+
+report.values.map.def.c = [colName] 
+
+report.values.map.def.d =  x FROM [rdef.getTableById(tableId).getTableName()] WHERE [colName] IS NOT NULL ORDER BY 1) xx WHERE <= [Globals.getDefaultPageSize()]
+
+test.sched.cond.popup = SELECT 1 FROM DUAL WHERE EXISTS ([sql])
+
+download.all.email.sent = Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG where rownum = 1 and gen_key='[pdfAttachmentKey.trim()]' and log_id =[report_email_sent_log_id.trim()] and (sysdate - sent_date) < 1
+
+download.all.gen.key = select schedule_id from cr_report_email_sent_log u where U.GEN_KEY = '[pdfAttachmentKey]'
+
+download.all.retrieve = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.run_date IS NOT NULL  AND rs.schedule_id = [scheduleId]) x, cr_report r, app_user au WHERE x.rep_id = r.rep_id  AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [scheduleId]  UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and  rsu2.schedule_id = [scheduleId]))
+
+download.all.insert = insert into cr_report_dwnld_log (user_id,rep_id,file_name,dwnld_start_time,filter_params) values (?,?,?,?,?)
+
+#ReportWrapper.java
+
+report.wrapper.format = SELECT NVL(cr.owner_id, cr.create_id) owner_id, cr.create_id, TO_CHAR(cr.create_date, '[Globals.getTimeFormat()]') create_date, maint_id, TO_CHAR(cr.maint_date, '[Globals.getTimeFormat()]') update_date, cr.menu_id, cr.menu_approved_yn FROM cr_report cr WHERE cr.rep_id=[reportID]
+
+generate.subset.sql = SELECT [colNames.toString()] FROM (SELECT ROWNUM rnum, [colNames.toString()] FROM ([reportSQL]) x ) y 
+
+report.sql.only.first.part = SELECT rnum,[colNames.toString()] FROM (SELECT ROWNUM rnum, [colNames.toString()] FROM (
+
+report.sql.only.second.part.a = WHERE ROWNUM <= [endRow] 
+
+report.sql.only.second.part.b = ) y WHERE rnum >= [startRow] and rownum <= ([startRow]+[pageSize]) ORDER BY rnum
+
+report.sql.only.second.part.b.noorderby =  AND rnum >= [startRow]
+
+generate.sql.visual.select = SELECT
+
+generate.sql.visual.count = COUNT(*) cnt
+
+generate.sql.visual.dual = FROM DUAL
+
+#ReportRuntime.java
+
+load.crosstab.report.data = SELECT ROWNUM rnum, [colNames.toString()]  FROM ([reportSQL]) 
+
+#RaptorRunHandler.java
+
+generate.sql.handler = select ROWNUM rnum, x.* from ([sql]) x where rownum <= 2
+
+generate.sql.select = SELECT [colNames.toString()] FROM (SELECT ROWNUM rnum, [colNames.toString()] FROM ([sql]) x 
+
+#ReportSchedule.java
+
+load.schedule.data = SELECT rs.enabled_yn, TO_CHAR(rs.start_date, 'MM/DD/YYYY') start_date, TO_CHAR(rs.end_date, 'MM/DD/YYYY') end_date, TO_CHAR(rs.run_date, 'MM/DD/YYYY') run_date, NVL(TO_CHAR(rs.run_date, 'HH'), '12') run_hour, NVL(TO_CHAR(rs.run_date, 'MI'), '00') run_min, NVL(TO_CHAR(rs.run_date, 'AM'), 'AM') run_ampm, rs.recurrence, rs.conditional_yn, rs.notify_type, rs.max_row, rs.initial_formfields, rs.schedule_id, NVL(TO_CHAR(rs.end_date, 'HH'), '11') end_hour, NVL(TO_CHAR(rs.end_date, 'MI'), '45') end_min, NVL(TO_CHAR(rs.end_date, 'AM'), 'PM') end_ampm, encrypt_yn, attachment_yn FROM cr_report_schedule rs WHERE rs.rep_id = [reportID]
+
+load.schedule.getid = SELECT rsu.user_id, fuser.last_name||', '||fuser.first_name, fuser.login_id FROM cr_report_schedule_users rsu, fn_user fuser WHERE rsu.rep_id = [reportID]  AND rsu.schedule_id = [getScheduleID()] and rsu.user_id IS NOT NULL and rsu.user_id = fuser.user_id
+
+load.schedule.users = SELECT rsu.role_id FROM cr_report_schedule_users rsu WHERE rsu.rep_id = [reportID] AND rsu.schedule_id = [getScheduleID()] AND rsu.role_id IS NOT NULL
+
+new.schedule.data = select SEQ_CR_REPORT_SCHEDULE.nextval from dual
+
+new.report.data = select SEQ_CR_REPORT.nextval from dual
+execute.update = DELETE cr_report_schedule_users WHERE rep_id = [reportID] and schedule_id = [getScheduleID()]
+
+execute.update.users = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], [emailToUsers.get(i)).getId()], NULL, [(i + 1)])
+
+execute.update.roles = INSERT INTO cr_report_schedule_users (schedule_id, rep_id, user_id, role_id, order_no) VALUES([getScheduleID()], [reportID], NULL, [emailToRoles.get(i)).getId()], [((emailToUsers.size() + i + 1)])
+
+execute.update.activity = INSERT into cr_schedule_activity_log (schedule_id, notes, run_time) values ([getScheduleID()],'Submitted:Schedule',TO_DATE('[getRunDate()] [getRunHour()]:[getRunMin()] [getRunAMPM()]', 'MM/DD/YYYY HH:MI AM'))
+ 
+delete.schedule.data = SELECT 1 FROM cr_report_schedule WHERE rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.users = DELETE from cr_report_schedule_users WHERE rep_id = [reportID]  and schedule_id = [getScheduleID()]
+ 
+delete.schedule.data.id = DELETE FROM cr_report_schedule where rep_id = [reportID] and sched_user_id = [getScheduleUserID()] and schedule_id = [getScheduleID()]
+
+load.cond.sql = SELECT condition_large_sql FROM cr_report_schedule WHERE schedule_id=?
+
+load.cond.sql.select = SELECT condition_sql FROM cr_report_schedule WHERE schedule_id = [scheduleId]
+
+persist.cond.sql.update = update cr_report_schedule set condition_large_sql = EMPTY_CLOB() where  schedule_id = [scheduleId]
+
+persist.cond.sql.large = SELECT condition_large_sql FROM cr_report_schedule cr WHERE schedule_id=? FOR UPDATE
+
+persist.cond.sql.set = update cr_report_schedule set condition_sql = ? where schedule_id = [scheduleId]
+
+#DataCache.java
+
+get.data.view.actions = SELECT ts.web_view_action FROM cr_table_source ts WHERE ts.web_view_action IS NOT NULL
+
+get.public.report.id.names = SELECT rep_id, title FROM cr_report WHERE public_yn = 'Y' ORDER BY title
+
+get.private.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr WHERE cr.rep_id not in (select rep_id from cr_report_access cra where user_id =  '[user_id]' 
+
+get.private.accessible.names.if =  OR role_id in (
+
+get.private.accessible.names.b =  ) AND public_yn = 'N' and cr.owner_id = '[user_id]' order by 2 
+
+get.group.accessible.names.a = SELECT cr.rep_id, cr.title FROM cr_report cr  WHERE cr.rep_id  in (select rep_id from cr_report_access cra where user_id =  '[user_id]'
+
+get.group.accessible.names.b =  )  AND public_yn = 'N' order by 2 
+
+get.report.table.sources.a = SELECT table_name, display_name, pk_fields, web_view_action, large_data_source_yn, filter_sql FROM cr_table_source 
+
+get.report.table.sources.where =  where SOURCE_DB= '[dBInfo]'
+
+get.report.table.sources.if =  where SOURCE_DB is null or SOURCE_DB = '[AppConstants.DB_LOCAL]'
+
+get.report.table.sources.else =  ORDER BY table_name
+
+grab.report.table.a = SELECT ts.table_name, ts.display_name, ts.pk_fields, ts.web_view_action, ts.large_data_source_yn, ts.filter_sql FROM cr_table_source ts  WHERE 
+
+grab.report.table.if = ts.SOURCE_DB= '[dBInfo]'
+
+grab.report.table.else = (ts.SOURCE_DB is null or ts.SOURCE_DB = '[AppConstants.DB_LOCAL]')
+
+grab.report.table.b =  minus SELECT ts.table_name, ts.display_name, ts.pk_fields,  ts.web_view_action,  ts.large_data_source_yn, ts.filter_sql from cr_table_source ts where table_name in (select table_name from  cr_table_role where role_id not IN [sb.toString()]) and 
+
+grab.report.table.c =  ORDER BY 1 
+
+get.report.table.crjoin = SELECT src_table_name, dest_table_name, join_expr FROM cr_table_join
+
+get.report.table.joins = SELECT tj.src_table_name, tj.dest_table_name, tj.join_expr FROM cr_table_join tj WHERE ((EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name AND trs.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trs WHERE trs.table_name=tj.src_table_name))) AND ((EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name AND trd.role_id IN [sb.toString()])) OR (NOT EXISTS (SELECT 1 FROM cr_table_role trd WHERE trd.table_name=tj.dest_table_name)))
+
+generate.report.table.col = SELECT a.table_name, a.column_name, a.data_type, a.label FROM user_column_def a WHERE a.table_name = '[tableName.toUpperCase()]' ORDER BY a.column_id
+
+generate.db.user.sql.a = SELECT utc.table_name, utc.column_name, utc.data_type, 
+
+generate.db.user.sql.if = utc.column_name label FROM user_tab_columns utc 
+
+generate.db.user.sql.else = nvl(x.label, utc.column_name) label FROM user_tab_columns utc 
+
+generate.db.user.sql.b = WHERE utc.table_name = '[tableName.toUpperCase()]' 
+
+generate.db.user.sql.c = AND utc.table_name = x.table_name AND utc.column_name = x.column_name 
+
+generate.db.user.sql.d = ORDER BY utc.column_id
+
+#SearchHandler.java
+
+load.report.search.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql] title, cr.descr, (au.first_name||' '||au.last_name) owner_name,  TO_CHAR(cr.create_date, 'MM/DD/YYYY'), (CASE WHEN nvl(cr.owner_id, cr.create_id) = [userID] THEN 'N' ELSE nvl(ra.read_only_yn, 'Y') END) read_only_yn, (CASE WHEN nvl(cr.owner_id, cr.create_id) = [userID] THEN 'Y' ELSE 'N' END) user_is_owner_yn, (case when report_xml like '%<allowSchedule>N</allowSchedule>%' then 'N' when report_xml like '%<allowSchedule>Y</allowSchedule>%' or 1 = (select distinct 1 from cr_report_schedule where rep_id = cr.rep_id) then 'Y' else 'N' end) FROM cr_report cr JOIN fn_user au ON nvl (cr.owner_id, cr.create_id) = au.user_id [fReportID] [fReportName] LEFT JOIN(SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra ON ra.rep_id = cr.rep_id
+
+load.report.search.rep_id_sql =  AND ROUND(cr.rep_id, 0) like nvl('%%', ROUND(cr.rep_id, 0)) 
+
+load.report.search.instr = AND INSTR('|'||cr.menu_id||'|', '|'||'[menuId]'||'|') > 0
+
+load.report.search.result.user = AND nvl(cr.owner_id, cr.create_id) = [userID]
+
+load.report.search.result.public = AND (nvl(cr.owner_id, cr.create_id) = [userID] OR cr.public_yn = 'Y' OR ra.read_only_yn IS NOT NULL)
+
+load.report.search.result.fav =  AND cr.rep_id in (select rep_id from cr_favorite_reports where user_id = [userID]
+
+load.report.search.result.sort =  ORDER BY DECODE(nvl(cr.owner_id, cr.create_id), [userID], ' ', upper(au.first_name||' '||au.last_name)), upper(cr.title)
+
+load.folder.report.result = SELECT cr.rep_id, cr.rep_id report_id, [rep_title_sql]||DECODE(cr.public_yn, 'Y', '', '[PRIVATE_ICON]')||cr.title||'</a>' title, cr.descr, au.first_name||' '||au.last_name owner_name, TO_CHAR(cr.create_date, 'MM/DD/YYYY') create_date, DECODE(NVL(cr.owner_id, cr.create_id), [userID], 'N', NVL(ra.read_only_yn, 'Y')) read_only_yn, DECODE(NVL(cr.owner_id, cr.create_id), [userID], 'Y', 'N') user_is_owner_yn FROM cr_report cr, app_user au, (SELECT rep_id, MIN(read_only_yn) read_only_yn FROM ((SELECT ua.rep_id, ua.read_only_yn FROM cr_report_access ua WHERE ua.user_id = [userID]) UNION ALL (SELECT ra.rep_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.role_id IN ([roleList.toString()]))) report_access GROUP BY rep_id) ra WHERE TO_CHAR(cr.rep_id) = nvl('[fReportID]', TO_CHAR(cr.rep_id)) AND UPPER(cr.title) LIKE UPPER('%[fReportName]%') AND nvl(cr.owner_id, cr.create_id) = au.user_id AND cr.rep_id = ra.rep_id (+)
+
+load.folder.report.result.sort = ORDER BY DECODE(nvl(cr.owner_id, cr.create_id), [userID], ' ', au.first_name||' '||au.last_name), cr.title
+
+#WizardProcessor.java
+
+process.filter.add.edit = '[argValue]' FROM dual
+
+#ReportDefinition.java
+
+persist.report.adhoc = SELECT [Globals.getAdhocReportSequence()].nextval FROM dual
+
+#Globals.java
+
+initialize.roles = SELECT 1 FROM dual WHERE EXISTS (SELECT 1 FROM cr_table_role)
+
+initialize.version = SELECT cr_raptor.get_version FROM dual
+
+# scheduler
+
+scheduler.available.schedules = SELECT x.rep_id, x.schedule_id, x.conditional_yn, x.condition_large_sql, x.notify_type, x.max_row, x.initial_formfields, x.processed_formfields, r.title, x.user_id FROM ( SELECT rs.rep_id, rs.schedule_id, rs.sched_user_id user_id, rs.conditional_yn, rs.condition_large_sql, rs.notify_type, rs.max_row, rs.initial_formfields, rs.processed_formfields  FROM cr_report_schedule rs  WHERE rs.enabled_yn='Y'  AND rs.start_date <= [currentDate]  AND  (rs.end_date >= [currentDate] or rs.end_date is null )  AND rs.run_date IS NOT NULL  ) x, cr_report r  WHERE x.rep_id = r.rep_id
+
+random.string = select DBMS_RANDOM.STRING('X',DBMS_RANDOM.VALUE(20,25)) random from dual
+
+scheduler.user.emails = SELECT au.user_id FROM (SELECT rs.schedule_id, rs.rep_id FROM cr_report_schedule rs WHERE rs.enabled_yn='Y' AND rs.start_date <= sysdate AND trunc(rs.end_date+1)-1/86400 >= sysdate AND rs.run_date IS NOT NULL AND rs.schedule_id = [p_schedule_id] ) x, cr_report r, fn_user au WHERE x.rep_id = r.rep_id AND au.user_id IN (SELECT rsu.user_id FROM cr_report_schedule_users rsu WHERE rsu.schedule_id = x.schedule_id and rsu.schedule_id = [p_schedule_id] UNION SELECT ur.user_id FROM fn_user_role ur WHERE ur.role_id IN (SELECT rsu2.role_id FROM cr_report_schedule_users rsu2 WHERE rsu2.schedule_id = x.schedule_id and rsu2.schedule_id = [p_schedule_id]))  
+
+# basic sql
+
+convert.to.raw = utl_raw.cast_to_raw
+
+seq.next.val = SELECT [sequenceName].nextval as ID FROM dual
+
+current.date.string = sysdate
+
+# report security
+report.user.access = SELECT ra.role_id, ra.user_id, ra.read_only_yn FROM cr_report_access ra WHERE ra.rep_id = [reportID]
+add.user.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, NULL, [userID], '[readOnlyAccess]')
+update.user.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND user_id=[userID]
+remove.user.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND user_id=[userID]
+add.role.access = INSERT INTO cr_report_access (rep_id, order_no, role_id, user_id, read_only_yn) VALUES([reportID], IFNULL((select order_no from (SELECT MAX(order_no) AS order_no FROM cr_report_access WHERE rep_id=[reportID]) AS temp), 0)+1, [roleID], NULL, '[readOnlyAccess]')
+update.role.access = UPDATE cr_report_access SET read_only_yn='[readOnlyAccess]' WHERE rep_id=[reportID] AND role_id=[roleID]
+remove.role.access = DELETE FROM cr_report_access WHERE rep_id=[reportID] AND role_id=[roleID]
+
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/usecaseui-common/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
new file mode 100644
index 00000000..99b68cbf
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
@@ -0,0 +1,43 @@
+# validator settings
+#default_error_message = Default error message
+
+#login message
+login.error.hrid.empty = Login failed, please contact system administrator. 
+login.error.hrid.not-found = User not found, please contact system administrator.
+login.error.user.inactive = Account is disabled, please contact system administrator.
+
+authentication_mechanism = BOTH
+
+user_attribute_name      = user
+
+
+# Web Junction settings
+#web_junction_user_id_header_name = iv-user
+
+# User Session settings
+#user_attribute_name           = user
+roles_attribute_name          = roles
+role_functions_attribute_name = role_functions
+#client_device_attribute_name  = client_device
+#client_device_emulation       = false
+
+# menu settings
+menu_query_name                      = menuData
+#menu_properties_file_location        = /WEB-INF/fusion/menu/
+application_menu_set_name            = APP
+application_menu_attribute_name      = applicationMenuData
+#application_menu_properties_name     = menu.properties
+business_direct_menu_set_name        = BD
+#business_direct_menu_properties_name = bd.menu.properties
+business_direct_menu_attribute_name  = businessDirectMenuData
+
+# RAPTOR config settings
+#raptor_config_file_path = /WEB-INF/conf/
+
+# Role settings
+sys_admin_role_id = 1
+#sys_admin_role_function_delete_from_ui = true
+
+# Profile Search settings
+#profile_search_report_id=181
+#callable_profile_search_report_id=386
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml b/usecaseui-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
new file mode 100644
index 00000000..14a59ea5
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/defs/definitions.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+		<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="ds2_template" template="/WEB-INF/fusion/jsp/ds2/template.jsp">
+		<put-attribute name="title" value="report"></put-attribute>
+		<put-attribute name="header" value="/WEB-INF/fusion/jsp/ds2/header.jsp"></put-attribute>
+		<put-attribute name="body" value=""></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_template_report_embedded.jsp">
+		<put-attribute name="body" value=""></put-attribute>
+	</definition>
+
+	<definition extends="ebz_template" name="es_search_demo">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/jsp/es_search_demo.jsp"></put-attribute>
+		<put-attribute name="viewName" value="elastic_search"></put-attribute>
+	</definition>
+
+	<definition extends="ebz_template" name="es_suggest_demo">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/jsp/es_suggest_demo.jsp"></put-attribute>
+		<put-attribute name="viewName" value="elastic_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 name="notebook"
+		template="app/fusion/notebook-integration/scripts/view-models/notebook.htm" /> -->
+		
+	
+	<!--  <definition name="nbooktest"
+		template="app/fusion/notebook-integration/scripts/view-models/notebook-frame.html"/>
+	 -->
+				<definition name="nbooktest"
+		template="app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html"/>
+		
+	<definition extends="ebz_template" name="broadcast_list">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/jsp/broadcast_list.jsp"></put-attribute>
+		<put-attribute name="viewName" value="broadcast_list"></put-attribute>
+	</definition>
+	<definition extends="ebz_template" name="broadcast">
+		<put-attribute name="body" value="/WEB-INF/fusion/jsp/broadcast.jsp"></put-attribute>
+		<put-attribute name="viewName" value="broadcast"></put-attribute>
+	</definition>
+
+
+	<definition extends="ebz_template" name="chart_wizard">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/jsp/chart_wizard.jsp"></put-attribute>
+		<put-attribute name="viewName" value="chart_wizard"></put-attribute>
+	</definition>
+
+	<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="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="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="samplePage"
+		template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
+	<definition name="welcome"
+		template="/app/fusion/scripts/DS2-view-models/welcome.html" />
+
+	<definition name="bootstrap_sample"
+		template="/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html" />
+
+	<definition extends="ds2_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" 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="ds2_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="report"
+		template="/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html" />
+
+	<definition extends="ebz_template" name="reportDS1">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/raptor/report_ebz.jsp"></put-attribute>
+	</definition>
+
+	<definition extends="ebz_template_report_embedded" name="report_embedded">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/raptor/report_ebz.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 extends="ebz_template" name="error_page">
+		<put-attribute name="body"
+			value="/WEB-INF/fusion/raptor/error_page.jsp"></put-attribute>
+	</definition>
+	<definition name="data_out" template="/WEB-INF/fusion/jsp/data_out.jsp" />
+
+	<!-- <definition name="test_field_run_sql" template="/WEB-INF/fusion/raptor/test_field_run_sql.jsp"/> 
+		<definition name="popup_testrun_sql" template="/WEB-INF/fusion/raptor/popup_testrun_sql.jsp"/> -->
+
+</tiles-definitions>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/.gitignore b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/.gitignore
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp
new file mode 100644
index 00000000..0b700867
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp
@@ -0,0 +1,137 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ page import="org.openecomp.portalsdk.core.web.support.UserUtils" %>
+<%@ page import="org.openecomp.portalsdk.core.web.support.ControllerProperties" %>
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
+
+<%-- <%@ include file="/WEB-INF/fusion/jsp/include.jsp" %> --%>
+<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
+<link rel="stylesheet" type="text/css" href="static/fusion/css/jquery-ui.css">
+
+  <c:set var="clustered" value="<%=(\"true\".equals(SystemProperties.getProperty(SystemProperties.CLUSTERED)))%>"/>
+
+  <script src="static/fusion/js/moment.min.js"></script>
+  
+  <div class="pageTitle">
+   <h3>
+	<c:choose>
+		<c:when test="${!empty param.message_id}">
+			<h1 class="heading1" style="margin-top:20px;">Broadcast Message Edit</h1>
+		</c:when>
+		<c:otherwise>
+			<h1 class="heading1" style="margin-top:20px;">Broadcast Message Create</h1>
+		</c:otherwise>
+	</c:choose>
+   </h3>
+  </div>
+
+<div ng-controller="broadcastController" >    
+		 Please edit the broadcast message details below:&nbsp;<br><br>
+	<div class="fn-ebz-container" >
+	        <label class="fn-ebz-text-label"><sup><b>*</b></sup>Message Text:</label><BR>
+	        <textarea name="comment" ng-model="broadcastMessage.messageText" rows="5" cols="200" style="height:100px"></textarea>
+	</div>
+	<br>
+	<div class="fn-ebz-container" >
+	          <label class="fn-ebz-text-label"><sup><b>*</b></sup>Start Date:</label><BR>
+	          <input style="display:none" name="startDateHidden" ng-model="broadcastMessage.startDate">
+	          <input type="text" class="fn-ebz-text" id="startDatepicker" />
+	</div>
+	
+	<div class="fn-ebz-container" style="margin-left:3em" >
+	          <label class="fn-ebz-text-label"><sup><b>*</b></sup>End Date:</label><BR>
+	          <input style="display:none" name="endDateHidden" ng-model="broadcastMessage.endDate">
+	          <input type="text" class="fn-ebz-text" id="endDatepicker" />
+	</div>
+
+	<div class="fn-ebz-container" style="margin-left:3em"  >
+		<label class="fn-ebz-text-label"><sup><b>*</b></sup>Sort Order:</label><BR>
+		<input type="text" class="fn-ebz-text" ng-model="broadcastMessage.sortOrder"
+			maxlength="30" /> 
+	</div>
+	
+          <c:if test="${clustered}">
+          			<div class="fn-ebz-container" style="margin-left:1em" >	
+						<label  class="fn-ebz-text-label">Server:</label><BR>
+						<div class="form-field" att-select="broadcastSites" ng-model="broadcastMessage.siteCd"></div>
+					</div>
+          </c:if>
+		<br>
+	<div align="left" >
+		<button type="submit" ng-click="save();" att-button
+			btn-type="primary" size="small">Save</button>
+	</div>
+</div>
+<script>
+app.controller('broadcastController', function ($scope, modalService, $modal){
+	$scope.broadcastMessage=${broadcastMessage};
+	$scope.broadcastSites=${broadcastSites};
+	console.log($scope.broadcastMessage);
+	
+	$scope.save = function() {
+		  var uuu = "broadcast/save";
+		  var postData={broadcastMessage: $scope.broadcastMessage};
+	  	  $.ajax({
+	  		 type : 'POST',
+	  		 url : uuu,
+	  		 dataType: 'json',
+	  		 contentType: 'application/json',
+	  		 data: JSON.stringify(postData),
+	  		 success : function(data){
+	  			//console.log(data);
+	  			window.location.href = "broadcast_list";
+			 },
+			 error : function(data){
+				 alert("Error while saving.");
+			 }
+	  	  });
+	};
+	
+	$(function() {
+	    $( "#startDatepicker" ).datepicker();
+	    $( "#endDatepicker" ).datepicker();
+	    
+	    var startDateLong = $scope.broadcastMessage.startDate;
+		var tempStartDate = new Date(startDateLong);
+		tempStartDate = moment(tempStartDate).format('MM/DD/YY');//03 Jun 2013 04:15PM EDT
+		console.log(tempStartDate.toString());
+		$( "#startDatepicker" ).val(tempStartDate.toString());
+	    
+	    var endDateLong = $scope.broadcastMessage.endDate;
+		var tempendDate = new Date(endDateLong);
+		tempendDate = moment(tempendDate).format('MM/DD/YY');//03 Jun 2013 04:15PM EDT
+		console.log(tempendDate.toString());
+		$( "#endDatepicker" ).val(tempendDate.toString());
+		
+	    $( "#startDatepicker" ).change(function() {
+	    	var tempStartDate = moment($( "#startDatepicker" ).val()).format('YYYY-MM-DD hh:mm:ss.S');
+	    	$scope.broadcastMessage.startDate = new Date(tempStartDate.toString());
+	    });
+	    $( "#endDatepicker" ).change(function() {
+	    	var tempEndDate = moment($( "#endDatepicker" ).val()).format('YYYY-MM-DD hh:mm:ss.S');
+	    	$scope.broadcastMessage.endDate = new Date(tempEndDate.toString());
+	  	});
+	  });
+});
+
+
+</script>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
new file mode 100644
index 00000000..401f413b
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp
@@ -0,0 +1,201 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ page import="java.util.*" %>
+<%@ page import="com.fasterxml.jackson.databind.ObjectMapper" %>
+<%@ page import="org.json.JSONObject" %>
+<%@ page import="java.io.StringWriter" %>
+<%@ page import="org.openecomp.portalsdk.core.web.support.ControllerProperties" %>
+<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
+
+  <script src="static/fusion/raptor/dy3/js/moment.min.js"></script>
+  <script>
+    function editMessage(messageLocationId, messageLocation, messageId) {
+      window.location='broadcast.htm?message_location_id='+messageLocationId + '&message_location=' + messageLocation + ((messageId != null) ? '&message_id=' + messageId : '');
+    }
+  </script>
+
+  <div class="pageTitle">
+  <h3>
+    Broadcast Messages
+    </h3>
+  </div>
+
+  <%-- Display a table for the broadcast messages of each message location --%>
+<div ng-controller="broadcastListController" > 	
+
+	<div ng-repeat="location in messageLocations" >
+		{{location.label}} Messages
+		<div title="{{location.label}} Messages" >
+
+		  	<table att-table table-data="location.messages" current-page="1">
+			  	<thead att-table-row type="header">
+			  		<tr>
+			  			<th att-table-header sortable="false" width="10%">No.</th>
+			  			<th att-table-header sortable="false" width="30%">Message Text</th>
+			  			<th att-table-header sortable="false" width="10%">Start Date</th>
+			  			<th att-table-header sortable="false" width="10%">End Date</th>
+			  			<th att-table-header sortable="false" width="10%">Sort Order</th>
+			  			<th att-table-header sortable="false" width="10%">Server</th>
+			  			<th att-table-header sortable="false" width="10%">Active?</th>
+			  			<th att-table-header sortable="false" width="10%">Delete?</th>
+			  		</tr>
+			  	</thead>
+			  	<tbody att-table-row type="body" row-repeat="message in location.messages" style="max-height: 980px;" ><!-- background colors will alternate not properly with multiple tbody-->
+				  <tr>
+				   {{message.id}}
+				    <td width="10%"><a href="javascript:editMessage({{location.value}},'{{location.label}}',{{message.id}});">{{$index+1}}</a></td>
+				    <td width="30%">{{message.messageText}}</td>
+				    <td width="10%">
+				    	{{message.displayStartDate}}
+				    </td>
+				    <td width="10%">{{message.displayEndDate}}</td>
+				    <td width="10%">{{message.sortOrder}}</td>
+				    <td width="10%">{{message.siteCd}}</td>
+				    <td width="10%">
+				    	<div ng-click="toggleActive(message);">
+				    		<input type="checkbox" ng-model="message.active" att-toggle-main>
+				    	</div>
+				    </td>
+				     <td att-table-body width="10%">
+					    <div ng-click="remove(message);" style="font-size:20px;"><a href="javascript:void(0)" class="icon-trash"></a></div>
+				     </td>
+				  </tr>
+				 
+				</tbody>
+			</table>
+		</div>
+		<input att-button btn-type="primary" size="small" class="button" type="button" value="Add" ng-click="editMessage(location);"/>
+  	  <br/><br/><br/>
+	</div>
+</div>
+
+<script>
+app.controller('broadcastListController', function ($scope){
+	//$scope.model.messagesList=${model.messagesList};
+	var messagesMap = {};
+	<%
+		ObjectMapper mapper = new ObjectMapper();
+		HashMap hmMessages = new HashMap();
+	    
+		HashMap objModel = (HashMap)request.getAttribute("model");
+		
+	    Object objMessages = objModel.get("messagesList");
+	    //System.out.println("messagesList: "+objMessages);
+	    if((objMessages!=null) && (objMessages instanceof HashMap))
+	    {
+	    	hmMessages= (HashMap)objMessages;
+	      Iterator it = hmMessages.entrySet().iterator();
+	      while (it.hasNext()) {
+	          Map.Entry pair = (Map.Entry)it.next();
+	          //System.out.println(pair.getKey() + " = " + pair.getValue());
+	          String pairValue = mapper.writeValueAsString(pair.getValue());
+	          //System.out.println(pairValue);
+	          %>
+	          messagesMap['<%=pair.getKey()%>'] = '<%=pairValue%>'
+	          <%
+	      }
+	    }
+	    
+	    Object messageLocationsObject =  objModel.get("messageLocations");
+	    //System.out.println("messageLocations: "+messageLocationsObject);
+		String messageLocationsString = mapper.writeValueAsString(messageLocationsObject);
+		//System.out.println(messageLocationsString);
+	%>
+	$scope.messagesList=messagesMap;	
+	$scope.messageLocations=<%=messageLocationsString%>;
+	console.log($scope.messageLocations);
+	
+	$.each($scope.messageLocations, function(i, a){ 
+		//var result = [];
+	    angular.forEach($scope.messagesList, function(value, key) {
+	    	if (key+'' === a.value+'') {
+	    		var objsJSON = JSON.parse(value);
+	    		
+	    		$.each(objsJSON, function(i, a){ 
+	    			var startDateLong = a.startDate;
+	    			var tempStartDate = new Date(startDateLong);
+	    			tempStartDate = moment(tempStartDate).format('DD MMM YYYY');//03 Jun 2013 04:15PM EDT - 'DD MMM YYYY hh:mmA zz'
+	    			a.displayStartDate=tempStartDate.toString();
+	    			
+	    			var endDateLong = a.endDate;
+	    			var tempEndDate = new Date(endDateLong);
+	    			tempEndDate = moment(tempEndDate).format('DD MMM YYYY');//03 Jun 2013 04:15PM EDT
+	    			a.displayEndDate=tempEndDate.toString();
+	    		});
+	    		a.messages = objsJSON;
+	        }
+	    }); 
+	    console.log(a.messages);
+	});	
+	;
+	
+	$scope.editMessage = function(location) {
+		editMessage(location.value, location.label);
+	};
+	
+	$scope.toggleActive = function(broadcastMessage) {
+
+		//alert('deleted'+role.name);
+		var uuu = "broadcast_list/toggleActive";
+		  var postData={broadcastMessage:broadcastMessage};
+	  	  $.ajax({
+	  		 type : 'POST',
+	  		 url : uuu,
+	  		 dataType: 'json',
+	  		 contentType: 'application/json',
+	  		 data: JSON.stringify(postData),
+	  		 success : function(data){
+	  			//window.location.reload();  
+			 },
+			 error : function(data){
+				 console.log(data);
+				 alert("Error while toggling: "+ data.responseText);
+			 }
+	  	  });
+	
+	
+	};
+	
+	$scope.remove = function(broadcastMessage) {
+
+			//alert('deleted'+role.name);
+			var uuu = "broadcast_list/remove";
+			  var postData={broadcastMessage:broadcastMessage};
+		  	  $.ajax({
+		  		 type : 'POST',
+		  		 url : uuu,
+		  		 dataType: 'json',
+		  		 contentType: 'application/json',
+		  		 data: JSON.stringify(postData),
+		  		 success : function(data){
+		  			window.location.reload();  
+				 },
+				 error : function(data){
+					 console.log(data);
+					 alert("Error while deleting: "+ data.responseText);
+				 }
+		  	  });
+		
+		
+	};
+});
+</script>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
new file mode 100644
index 00000000..f3fb7a74
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp
@@ -0,0 +1,20 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+${model.output_string}
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp
new file mode 100644
index 00000000..ac210a3f
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp
@@ -0,0 +1,101 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+
+<!DOCTYPE html>
+<html>
+    <head>
+<%-- 		<%@ include file="/WEB-INF/fusion/jsp/ds2/meta.jsp" %>		 --%>
+	<!-- B2b Library -->	
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/b2b-angular.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/b2b/css/b2b-angular/font_icons.css">
+
+	<!-- icons in open source -->
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/ionicons.css">
+
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/angular-bootstrap/ui-bootstrap-csp.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
+	<!-- digital-design-library must be loaded late -->
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ds2/css/digital-ng-library/digital-design-library.css">
+	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
+
+
+	<!-- Common scripts -->	
+	<script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
+	<!-- Report Dashboard Specific items -->
+    <script src="app/fusion/ase/scripts/menus/bootstrap.min.js"></script>
+	<script src="app/fusion/ase/scripts/menus/jquery-ui.min.js"></script>
+    <script src="app/fusion/external/lodash/4.5.1/lodash.js"></script>
+    <script src="app/fusion/external/showdown/0.3.4/showdown.js"></script>
+	
+	<!--<script src="app/fusion/external/angular-1.5/angular.min.js"></script>
+	<script src="app/fusion/external/angular-1.5/angular-messages.js"></script>
+	<script src="app/fusion/external/angular-1.5/angular-touch.js"></script>
+	<script src="app/fusion/external/angular-1.5/angular-sanitize.js"></script>	
+	<script src="app/fusion/external/angular-1.5/angular-route.min.js"></script>
+	<script src="app/fusion/external/angular-1.5/angular-cookies.min.js"></script>-->
+	<script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>	
+	<script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
+	<script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+	<script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
+	<script src="app/fusion/external/ds2/js/digital-ng-library/digital-design-library.js"></script>	
+	<script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>
+	<script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+	<script src="app/fusion/external/angular-gridster/dist/angular-gridster.min.js"></script>
+	<script src="app/fusion/external/angular-gridster/dist/angular-gridster.min.js"></script>
+		
+	<!-- EPSDK App scripts and common services -->	
+	<script src="app/fusion/scripts/DS2-services/ds2-modal/modalService.js"></script>
+	<script src="app/fusion/external/ds2/js/appDS2.js"></script>
+			
+	<script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script>	 
+	<script src="app/fusion/scripts/DS2-services/headerServiceDS2.js"></script>
+	<script src="app/fusion/scripts/DS2-services/leftMenuServiceDS2.js"></script>
+	<script src="app/fusion/scripts/DS2-services/manifestService.js"></script>
+	
+	<script src="app/fusion/scripts/DS2-directives/footer.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/ds2Header.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/ds2LeftMenu.js"></script>
+	<script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> 
+	<script src= "app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script>
+	
+	</head>
+	<body class="appBody" ng-app="abs">
+ 		<div ds2-Header class="header-container" ></div>
+ 		<div ds2-menu id="menuContainer" class="menu-container" ></div>
+<%-- 			<div>
+				<tiles:insertAttribute name="header" />
+			</div> --%>
+
+		<div class="applicationWindow">
+			<br>
+			<div class="content" id="mContent">
+				<div class="body-content-jsp">
+					<tiles:insertAttribute name="body" />
+				</div>
+			</div>
+			<br>
+		<div ds2-Footer class="footer-container"></div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp
new file mode 100644
index 00000000..bd5206eb
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp
@@ -0,0 +1,41 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+
+
+
+<script src="app/fusion/external/ebz/js/footer.js"></script>
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/footer.css" >
+<div class="footerContainer" id="footerContainer">
+	<div class="footerWrapper" id="footerWrapper">
+		<div class="attFooterInfo" style="text-align: center;">
+			<div class="footerLastSection">
+					<div class="footerText">
+			            <p class="copyright-text">
+			            </p>
+			        </div>	
+			        <div class="displayInline">
+						<a href="#" class="footer-logo"> 
+						</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
new file mode 100644
index 00000000..1d3ba8e7
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
@@ -0,0 +1,747 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ page isELIgnored="false"%>
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
+<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties"%>
+<%@ page import="org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants"%>
+<%@ page import="org.openecomp.portalsdk.core.domain.MenuData"%>
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css">
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
+
+
+<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> 
+<script src= "app/fusion/external/ebz/angular_js/angular-route.min.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/angular-sanitize.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/angular-cookies.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/app.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/gestures.js"></script>
+<script src="static/js/jquery-1.10.2.js"></script>
+<script src="app/fusion/scripts/modalService.js"></script>
+<script src="static/js/jquery.mask.min.js" type="text/javascript"></script>
+<script src="static/js/jquery-ui.js" type="text/javascript"></script>
+<script src="app/fusion/external/ebz/sandbox/att-abs-tpls.js" type="text/javascript"></script>
+<script src="static/fusion/js/att_angular_gridster/ui-gridster-tpls.js"></script>
+<script src="static/fusion/js/att_angular_gridster/angular-gridster.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script>
+<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/0.10.0/lodash.min.js"></script>
+<script src="app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script>
+<script src="app/fusion/scripts/services/userInfoService.js"></script>
+<script src="app/fusion/scripts/services/leftMenuService.js"></script>
+
+
+<jsp:include page="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" ></jsp:include> 
+
+<c:set var="UserName"	value="<%= session.getAttribute(\"fullName\")%>" />
+<c:set var="UserFirstName"	value="<%= session.getAttribute(\"first_name\")%>" />
+
+<% 
+	String contactUsLink = SystemProperties.getProperty(SystemProperties.CONTACT_US_LINK);
+	String redirectUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL);
+	String portalUrl = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/process_csp";
+	String getAccessLink = redirectUrl.substring(0, redirectUrl.lastIndexOf('/')) + "/get_access";	
+%>
+<c:set var="returnPortalUrl" value="<%=portalUrl%>" />
+<c:set var="contactUsLink" value="<%=contactUsLink%>" />
+<c:set var="getAccessLink" value="<%=getAccessLink%>" />
+<style>
+.att-drawer{
+	z-index:997 !important;
+}
+
+.secondaryMenuContainer{
+	z-index:1000;
+}
+.megamenu-tabs .megamenu__item {
+	padding: 0 0;
+}
+.megamenu-tabs .megamenu__item span {
+    font-size: 18px;
+}
+
+.submenu-tabs {
+   line-height:50px;
+}
+.submenu-tabs .sub__menu{
+	top:54px;
+}
+
+.top-megamenu .megamenu-tabs ul{
+	width:98%;
+	list-style: none;
+}
+
+</style>
+<%@include  file="/WEB-INF/fusion/jsp/ebz/loginSnippet.html" %>
+
+<div style="position: relative; z-index: 999;">
+	<div ng-controller="headerController">
+	
+		 <div class="headerContainer" id="headerContainer" ng-cloak  ng-show="{{showHeader}}">
+			<div id="megaMenuContainer" class="megaMenuContainer" style="margin-top: 0; overflow: visible;">
+				<div>
+					<!--for mega Menu-->
+					<!-- Mega Menu parent-tab directive with three models menu-items, active-sub-menu, active-menu -->
+					<div id="topMenu" class="top-megamenu" ng-mouseleave="activeClickSubMenu.x.active=false; activeClickMenu.x.active=false">
+						<div style="float:left;width:100%;"parent-tab menu-items="megaMenuDataObject" active-sub-menu='activeClickSubMenu.x' active-menu='activeClickMenu.x'>
+			                <div parentmenu-tabs mega-menu="true" menu-items="megaMenuDataObject" style="height:55px;">
+								<div style="float:left">
+									<li class="megamenu__item" style="line-height:55px;" onclick="returnToPortal()">
+										<img src="app/fusion/external/ebz/images/logo.png" class="logo"   ></span>
+>										<strong	style="font-weight: 400 !important; font-family: Omnes-ECOMP-W02, Arial !important; font-size: 18px;" id='returnPortal' >ECOMP Portal</strong>
+									</li>										
+									<div menu-tabs mega-menu="true" tab-name="item.text" menu-item="item" active-menu="activeClickMenu.x" 
+									ng-repeat="item in megaMenuDataObject" style="font-size: 18px;" ng-mousedown="loadFavorites()" >
+				                        <div parentmenu-tabs sub-menu="true" ng-show="activeClickMenu.x.active && item.active" menu-items="activeClickMenu.x.children">
+							<!-- Second level menu -->
+									<div>
+										<div menu-tabs sub-menu="true" tab-name="subItem.text" 
+											tab-url="subItem.url"  menu-item="subItem" 
+											ng-repeat="subItem in activeClickMenu.x.children | orderBy : 'column'" active-menu="activeClickSubMenu.x" 
+											sub-item-active="{{subItem.active}}" style="float:left;" aria-label="{{subItem.text}}"
+	                                         ng-mouseenter="submenuLevelAction(subItem.text,subItem.column)"
+	                                         ng-mouseleave="submenuLevelAction(subItem.text,subItem.column)"
+                                        	ng-click="submenuLevelAction(subItem.text,subItem.column)"  >
+                                                <i ng-if="subItem.text=='Favorites'" id="favorite-star"
+                                                   class="icon-star favorites-icon-active">
+                                                </i>
+										</div>
+	                                                                                 	
+			                                <div class="sub__menu" ng-mouseleave="activeClickSubMenu.x.active=false" >
+			                                	<ul ng-show="activeClickSubMenu.x.active"  role="menubar" class="columns">
+			               <!-- Third level menu -->					                                	
+				                                    <div menu-tabs menu-item="subItem" 
+				                                    class="columns-div"
+				                                    ng-repeat="subItem in activeClickSubMenu.x.children | orderBy : 'column'" 
+				                                    ng-show="activeClickSubMenu.x.active">
+
+	                                                    <i id="favorite-selector-third-level"
+	                                                       ng-show="isUrlFavorite(subItem.menuId)==false"
+	                                                       class="icon-star favorites-icon-inactive"
+	                                                       ng-if="subItem.url.length > 1">
+	                                                    </i>					                                    
+	                                                    <i id="favorite-selector-third-level"
+	                                                       ng-show="isUrlFavorite(subItem.menuId)"
+	                                                       class="icon-star favorites-icon-active"
+	                                                       ng-if="subItem.url.length > 1">
+	                                                    </i>					                                    
+														<span class="title" aria-label="{{subItem.text}}" 
+														ng-click="goToUrl(subItem)">{{subItem.text}}</span>
+							<!-- Fourth level menus -->	
+				                                        <div att-links-list="">
+                                                            <i id="favorite-selector-fourth-level"
+                                                               class="icon-star favorites-icon-inactive"
+                                                               ng-show="isUrlFavorite(tabValue.menuId)==false"
+                                                               ng-if="tabValue.url.length > 1">
+
+                                                            </i>
+                                                            <i id="favorite-selector-fourth-level"
+                                                               class="icon-star favorites-icon-active"
+                                                               ng-show="isUrlFavorite(tabValue.menuId)"
+                                                               ng-if="tabValue.url.length > 1">
+
+                                                            </i>
+				                                            <span role="menuitem" att-links-list-item="" 
+				                                            ng-repeat="tabValue in subItem.children" 
+				                                            ng-click="goToUrl(tabValue)" 
+				                                            att-accessibility-click="13,32" 
+				                                            ng-class="{'disabled': tabValue.disabled}">{{tabValue.text}}</span>
+				                                        </div>
+				                                        <hr ng-show="!$last"/>
+				                                        
+				                                    </div>
+				                                 </ul>
+			           <!-- Favorites level menu -->
+												<div class="favorites-window" ng-show='favoritesWindow' ng-mouseleave="hideFavoritesWindow()">
+													<div id="favorites-menu-items" ng-show="showFavorites">
+														<div ng-repeat="subItem in favoritesMenuItems" att-links-list="" style='display: inline'>
+																<i id="favorite-selector-favorites-list" class="icon-star favorites-icon-active">
+																</i>
+																<a id="favorites-list" aria-label="{{subItem.text}}"
+																   ng-click="goToUrl(subItem)" 
+																   style="margin-left: 3px; margin-right: 20px; text-decoration: none;  color: #666666;">
+																   {{subItem.text}}
+																</a>
+														</div>
+														<div>
+															<br>
+															<p style='font-weight: 400; font-family: Omnes-ECOMP-W02, Arial !important;
+															font-size: 18px; text-align: center; background-color: lightgray;
+															width: 400px; margin-left: 25%; margin-right: 25%;'>
+																Manage favorites on ECOMP Portal.
+															</p>
+														</div>
+													</div>
+								  <!-- Favorites when empty -->
+														<div id="favorites-empty" ng-show='favoritesWindow' ng-show="emptyFavorites">
+			                                                <div id="favorites-empty" ng-show="emptyFavorites" class="favorites-window-empty">
+			                                                    <div>
+			                                                        <img src="app/fusion/external/ebz/images/no_favorites_star.png">
+			                                                        <p class='favoritesLargeText'>No Favorites</p>
+																	<p class='favoritesNormalText'>Manage favorites on ECOMP Portal.</p>
+			                                                    </div>
+			                                                </div>
+														</div>
+													</div>
+					                                
+				                                </div>
+				                            </div>
+				                        </div> 
+				                    </div >
+				                    <li class="megamenu__item" style="line-height:55px;" ng-if="loadMenufail">
+										<strong	style="font-weight: 400 !important; font-family: Omnes-ECOMP-W02, Arial !important; font-size: 18px;" >Unable to load menus</strong>
+									</li>
+<!-- 										<li class="megamenu__item" style="width: 20%;">&nbsp;</li>
+ -->									</div>
+								<!--  Login Snippet-->
+								<div  style="float:right">
+									<li id="bcLoginSnippet" class="megamenu__item" style="width: 140px;" >
+										<div popover="loginSnippet.html"  aria-label="Login Snippet"	referby="loginSnippet" att-accessibility-click="13,32" popover-style="\" popover-placement="below" style="width: 200px;">
+											<div class="icon-user-small login-snippet-icon"></div>
+											<div class="login-snippet-text" style="display: inline-block; font-size:12px; margin-left:5px;overflow: hidden; max-height: 31px;   max-width:120px; padding-top: 0px; margin-top: 0px; white-space: nowrap;" ng-bind="userProfile.firstName"></div>
+										</div>
+									</li>
+									<li class="megamenu__item" style="width:120px;">&nbsp;</li>
+								</div>
+								
+							</div>		
+						</div>
+						<div style="clear: both"></div>
+					</div>
+					</div>
+				</div>
+			</div>
+		<div class="license-notification" id="license-notification">
+			<a href="javascript:void(0)" style="background-color:#bbb;" class="button button--small" tooltip="Please contact ECOMP Portal team to get the license" tooltip-placement="below" tooltip-style="light"  tooltip-popup-delay="500" >
+				<span style="">{{app_name_full}}</span>
+			</a>									
+		</div>
+		<div style="position: relative; color: black; top: 70px;">
+			<div ng-cloak>		
+				<span ng-style="adjustHLeftMenu('burgerIcon')" style="z-index:998; position:fixed; left:0%; font-size:35px; margin-left:10px;text-decoration:none;">
+					<a ng-click="toggleDrawer();isOpen = !isOpen" href="javascript:void(0);" class="arrow-icon-left" >
+					<span class="icon-hamburger"></span></a>	
+					<span ng-init="isOpen = true" ng-show="isOpen" style="font-size:16px; position:relative; top:-8px; left:-15px;">&nbsp&nbsp&nbsp {{app_name}}</span>
+				</span>
+				<div att-drawer drawer-slide="left" drawer-custom-top="{{drawer_custom_top}}px" drawer-size="200px" drawer-open="drawerOpen" drawer-custom-height="100%" >
+				    <div ng-style="adjustHLeftMenu('leftMenu')">
+					    <div class="attDrawer" style="margin-top:{{drawer_margin_top}}px;">   
+					    	<div style="margin-left:10px; margin-right:10px;">
+						    	<accordion close-others="true" css="att-accordion--no-box">
+				                    <accordion-group ng-repeat="parent in menuItems" heading="{{parent.parentLabel}}" child="{{parent.parentAction}}" parent-link="{{parent.parentAction}}" image-source="{{parent.parentImageSrc}}" child-length="{{parent.childItemList.length}}" is-open="parent.open">
+				                    	<div ng-repeat="subMenu in parent.childItemList" style="font-size:12px; margin-left:10px;">
+				                    		<a href="{{subMenu.action}}" style="font-size:12px; color:#666666;" >{{subMenu.label}}</a>
+				                    	</div>
+				                    </accordion-group>
+				                </accordion>
+							</div>						
+					    </div>
+				    </div>
+				</div>
+			</div>		
+		</div>
+	</div>
+</div>
+<script>    
+	function returnToPortal(){
+		window.location.href = "<c:out value='${returnPortalUrl}'/>";
+	}
+	detectScrollEvent = function() {
+		var footerOff = $('#footerContainer').offset().top;
+		var headOff = $('#headerContainer').offset().top;
+		var winHeight = $(window).height();
+		if ((footerOff - headOff) <= winHeight) {
+			$('.att-drawer').css({
+				"height" : footerOff - headOff - 55
+			});
+		} else {
+			$('.att-drawer').css({
+				"height" : "94vh"
+			});
+		}
+	}
+	$(window).scroll(function() {
+		if ($('.att-drawer').is(':visible')) {
+			detectScrollEvent();
+		}
+	});
+	app.controller("headerController", function($scope, $timeout, $log, $http, UserInfoService, $window, $cookies,LeftMenuService) {
+  		// $log.debug('HeaderController started');
+		$scope.jsonMenuData = [];
+		$scope.loadMenufail=false;
+		$scope.app_name = "";
+		$scope.app_name_full = "";
+		$scope.megaMenuDataObject =[];
+		$scope.activeClickSubMenu = {
+          		x: ''
+        };
+      	$scope.activeClickMenu = {
+      			x: ''
+      	};
+  		$scope.favoritesMenuItems = [];
+        $scope.favoriteItemsCount = 0;
+        $scope.showFavorites = false;
+        $scope.emptyFavorites = false;
+        $scope.favoritesWindow = false;
+        $scope.userProfile={
+    			firstName:'',
+    			lastName:'',
+    			fullName:'',
+    			email:''
+    	}
+      	/*Put user info into fields*/
+    	$scope.inputUserInfo = function(userInfo){
+    		if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
+    			if (typeof(userInfo.USER_FIRST_NAME) != "undefined" && userInfo.USER_FIRST_NAME!=null && userInfo.USER_FIRST_NAME!='')
+    				$scope.userProfile.firstName = userInfo.USER_FIRST_NAME;
+    			if (typeof(userInfo.USER_LAST_NAME) != "undefined" && userInfo.USER_LAST_NAME!=null && userInfo.USER_LAST_NAME!='')
+    				$scope.userProfile.lastName = userInfo.USER_LAST_NAME;
+    			if (typeof(userInfo.USER_EMAIL) != "undefined" && userInfo.USER_EMAIL!=null && userInfo.USER_EMAIL!='')  			
+    				$scope.userProfile.email = userInfo.USER_EMAIL;
+    		}		
+    	}
+      	 /*getting user info from session*/
+    	$scope.getUserNameFromSession = function(){
+    		UserInfoService.getFunctionalMenuStaticDetailSession()
+    	  	.then(function (res) {
+  		  		$scope.userProfile.firstName = res.firstName;
+  		  		$scope.redirectUrl = res.portalUrl;
+    	  	});
+        }
+      	$scope.getTopMenuStaticInfo=function() {
+    		var promise = UserInfoService.getFunctionalMenuStaticDetailShareContext();
+    		promise.then(
+				function(res) {   					
+					if(res==null || res==''){
+						$log.info('failed getting static User information');    
+						$scope.getUserNameFromSession();
+					}else{
+						$log.info('Received static User information');
+						var resData = res;						
+						$scope.inputUserInfo(resData);					
+						$scope.userProfile.fullName = $scope.userProfile.firstName+ ' '+ $scope.userProfile.lastName;					
+					}
+				},
+				function(err) {
+					$log.info('failed getting static User information');       				
+				}
+    		);
+  		}
+      			
+		var unflatten = function( array, parent, tree ){
+			tree = typeof tree !== 'undefined' ? tree : [];
+			parent = typeof parent !== 'undefined' ? parent : { menuId: null };
+			var children = _.filter( array, function(child){ return child.parentMenuId == parent.menuId; });
+		
+			if( !_.isEmpty( children )  ){
+				if( parent.menuId === null ){
+						tree = children;
+				}else{
+					parent['children'] = children
+				}
+				_.each( children, function( child ){ unflatten( array, child ) } );
+			}
+
+			return tree;
+		}
+		
+		var menuStructureConvert = function(menuItems) {
+			var megaMenuDataObjectTemp = [
+	                                 {
+	                                	 text: "ECOMP",
+	                                	 children:menuItems
+	                                 },
+	                                 {
+	                                	 text: "Help",
+	                                	 children: [{
+	                                		 text:"Contact Us",
+	                                		 url:"<c:out value='${contactUsLink}'/>"
+	                                	 },
+	                                	 {
+	                                		 text:"Get Access",
+	                                		 url:"<c:out value='${getAccessLink}'/>"
+	                                	 }]
+	                                 }
+	                                 ];
+			return megaMenuDataObjectTemp;
+		}; 
+   		
+		
+		/*Left Menu*/
+		LeftMenuService.getAppName().then(function(response){
+        		var j = response; 
+    	  		try{
+    	  			if(j && j !== "null" && j!== "undefined"){
+    	  				// console.log("app name is " + $scope.app_name);
+    	  				$scope.app_name_full = j.data;
+    	  				var processed_app_name = j.data;
+    	  				if(processed_app_name.indexOf("[")<=-1) {
+    	  					if (document.getElementById('license-notification')!=null)
+    	  						document.getElementById('license-notification').style.display = "none"; 
+    	  				}
+    	  				var n = processed_app_name.length;
+    	  				if (n > 15) {
+    	  					n = 15;
+    	  				}
+    	  				$scope.app_name = processed_app_name.substr(0, n);
+    	  			}else{
+    	  				throw "Get app_name response is not an object/is empty"; 
+    	  			}  
+    	  		}catch (e) {
+    	  			console.log("error happened while trying to get app name "+e);
+    	  			return;
+    	        }	       
+    		},function(error){
+    			console.log('getAppName failed', error);
+    		});
+		
+	    $scope.getTopMenuStaticInfo();      
+    	$scope.getMenu=function() {
+    		
+   		 $http({
+   		        method: "GET",
+   		        url: 'get_functional_menu',
+// TIMEOUT USED FOR LOCAL TESTING ONLY	      		        
+// 		        timeout: 100
+   		 }).success(function (response) {
+			if(response == '101: Timeout') {
+	  			$log.error('Timeout attempting to get_functional_menu');
+	  		// TIMEOUT USED FOR LOCAL TESTING ONLY	      		        
+//	  			$scope.createErrorMenu();
+	  			$scope.megaMenuDataObject = menuStructureConvert('');
+	  		}else {
+ 		   		$log.debug('get_functional_menu success: ' + response); 		   			   		
+				if(typeof response != 'undefined' && response.length!=0 && typeof response[0] != 'undefined' && typeof response[0].error!="undefined"){
+// createErrorMenu() USED FOR LOCAL TESTING ONLY
+//		  			$scope.createErrorMenu();
+					$scope.megaMenuDataObject = menuStructureConvert('');
+		 	   	//	$scope.loadMenufail=true;
+			 	}else{
+		 	   		$scope.jsonMenuData = unflatten( response );
+		 	   		$scope.megaMenuDataObject = menuStructureConvert($scope.jsonMenuData);
+	 	   		}
+			}
+		}).error(function (response){
+// createErrorMenu() USED FOR LOCAL TESTING ONLY	      		        
+//		  		$scope.createErrorMenu();
+
+	 	   		//$scope.loadMenufail=true;
+	 	   		$scope.megaMenuDataObject = menuStructureConvert('');
+		        $log.debug('REST API failed get_functional_menu...'+ response);
+		  });
+  		}
+    	$scope.adjustHLeftMenu = function (type){
+    		$scope.showHeader = ($cookies.show_app_header == undefined ? true : $cookies.show_app_header);
+    		
+    		if($scope.showHeader == true) {
+	    		$scope.drawer_margin_top = 60;
+	    		$scope.drawer_custom_top = 54;
+	    		$scope.toggle_drawer_top = 55;
+    		}
+    		else  {
+    			
+    			$scope.drawer_margin_top = 50;
+        		$scope.drawer_custom_top = 0;
+        		$scope.toggle_drawer_top = 10;
+    		}
+    		if(type=='burgerIcon'){
+    			return { "top": $scope.toggle_drawer_top+"px"};
+    		}else if(type=='leftMenu'){
+    			return { "margin-top": $scope.drawer_margin_top+"px"};
+    		}else
+    			return;
+    	}
+    	$scope.adjustHeader=function() {
+    		$scope.showHeader = ($cookies.show_app_header == undefined ? true : $cookies.show_app_header);
+    		
+    		if($scope.showHeader == true) {
+	    		$scope.drawer_margin_top = 50;
+	    		$scope.drawer_custom_top = 54;
+	    		$scope.toggle_drawer_top = 55;
+    		}
+    		else  {
+    			
+    			$scope.drawer_margin_top = 40;
+        		$scope.drawer_custom_top = 0;
+        		$scope.toggle_drawer_top = 10;
+    		}
+    		
+    		
+    	}
+    	
+    	
+		//$scope.getMenu();
+		$scope.adjustHeader();
+		
+
+		/* **************************************************************************/
+		/* Logic for the favorite menus is here */
+
+            $scope.loadFavorites = function () {
+                $log.debug('loadFavorites has happened.');
+                if ($scope.favoritesMenuItems == '') {
+                    $scope.generateFavoriteItems();
+                    $log.debug('loadFavorites is calling generateFavoriteItems()');
+                } else {
+                    $log.debug('loadFavorites is NOT calling generateFavoriteItems()');
+                }
+            }
+            
+            $scope.goToUrl = function (item) {
+                $log.info("goToUrl called")
+                $log.info(item);
+
+                var url = item.url;
+                var restrictedApp = item.restrictedApp;
+                $log.debug('Restricted app status is: ' + restrictedApp);
+                if (!url) {
+                    $log.info('No url found for this application, doing nothing..');
+                    return;
+                }
+                if (restrictedApp) {
+                    $window.open(url, '_blank');
+                } else {
+                    $window.open(url, '_self');
+                }
+
+            }
+            
+            $scope.submenuLevelAction = function(index, column) {
+                if ($scope.favoritesMenuItems == '') {
+                    $scope.generateFavoriteItems();
+                    $log.debug('submenuLevelAction is calling generateFavoriteItems()');
+                }
+                $log.debug('item hovered/clicked: ' + index + '; column = ' + column);
+                if (column == 2) {  // 2 is Design
+                    $scope.favoritesWindow = false;
+                    $scope.showFavorites = false;
+                    $scope.emptyFavorites = false;
+                }
+                if (index=='Favorites' && $scope.favoriteItemsCount != 0) {
+                    $log.debug('Showing Favorites window');
+                    $scope.favoritesWindow = true;
+                    $scope.showFavorites = true;
+                    $scope.emptyFavorites = false;
+                }
+                if (index=='Favorites' && $scope.favoriteItemsCount == 0) {
+                    $log.debug('Hiding Favorites window in favor of No Favorites Window');
+                    $scope.favoritesWindow = true;
+                    $scope.showFavorites = false;
+                    $scope.emptyFavorites = true;
+                }
+                if (column > 2) {
+                    $scope.favoritesWindow = false;
+                    $scope.showFavorites = false;
+                    $scope.emptyFavorites = false;
+                }
+            };
+            
+            $scope.hideFavoritesWindow = function() {
+                $log.debug('$scope.hideFavoritesWindow has been called');
+                $scope.showFavorites = false;
+                $scope.emptyFavorites = false;
+            }
+            
+            $scope.isUrlFavorite = function (menuId) {
+//                 $log.debug('array objects in menu favorites = ' + $scope.favoriteItemsCount + '; menuId=' + menuId);
+                var jsonMenu =  JSON.stringify($scope.favoritesMenuItems);
+                var isMenuFavorite =  jsonMenu.indexOf('menuId\":' + menuId);
+                if (isMenuFavorite==-1) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
+		            
+            $scope.generateFavoriteItems  = function() {
+            	$http({
+      		        method: "GET",
+      		        url: 'get_favorites',
+		// TIMEOUT USED FOR LOCAL TESTING ONLY	      		        
+//			      		        timeout: 100
+	      		    }).success(function (response) {
+				  		if (response == '101: Timeout') {
+						$log.error('Timeout attempting to get_favorites_menu');
+					} else {
+					 	if(typeof response != 'undefined' && response.length!=0 && typeof response[0] != 'undefined' && typeof response[0].error!="undefined"){
+						    $log.error('REST API failed get_favorites' + response);
+					 	   	}else{
+					 	   		$log.debug('get_favorites = ' + JSON.stringify(response));
+						 	   	$scope.favoritesMenuItems = response;
+		                        $scope.favoriteItemsCount = Object.keys($scope.favoritesMenuItems).length;
+		                        $log.info('number of favorite menus: ' + $scope.favoriteItemsCount);
+	                        }
+				  		}
+					}).error(function (response){
+					    $log.error('REST API failed get_favorites' + response);
+		//createFavoriteErrorMenu() USED FOR LOCAL TESTING ONLY	      		        
+//							$scope.createFavoriteErrorMenu();
+					});
+        	}
+		            
+		        	$scope.createFavoriteErrorMenu=function() {
+		                $scope.favoritesMenuItems = [
+// 		                                             {
+// 		                                         	    "menuId": "93",
+// 		                                         	    "text": "XXX",
+// 		                                         	    "url": "XXX"
+// 		                                         	  }
+		                                         	];
+		                $scope.favoriteItemsCount = Object.keys($scope.favoritesMenuItems).length;
+		                $log.info('number of favorite menus: ' + $scope.favoriteItemsCount);
+		        	}
+		            
+        	/* end of Favorite Menu code */
+	        /* **************************************************************************/
+
+        	
+	        /* **************************************************************************/
+        	// THIS IS USED FOR LOCAL TESTING ONLY
+	        /* **************************************************************************/
+
+			$scope.createErrorMenu=function() {
+    		$scope.jsonMenuData = [
+                                   {
+                               	    "menuId": 1,
+                               	    "column": 2,
+                               	    "text": "Design",
+                               	    "parentMenuId": null,
+                               	    "url": ""
+                               	  },
+                               	  {
+                               	    "menuId": 2,
+                               	    "column": 3,
+                               	    "text": "Infrastructure Ordering",
+                               	    "parentMenuId": null,
+                               	    "url": ""
+                               	  },
+                               	  {
+                               	    "menuId": 3,
+                               	    "column": 4,
+                               	    "text": "Service Creation",
+                               	    "parentMenuId": null,
+                               	    "url": ""
+                               	  },
+                               	  {
+                               	    "menuId": 4,
+                               	    "column": 5,
+                               	    "text": "Service Mgmt",
+                               	    "parentMenuId": null,
+                               	    "url": ""
+                               	  },
+                               	  {
+                               	    "menuId": 99,
+                               	    "column": 1,
+                               	    "text": "Favorites",
+                               	    "parentMenuId": null,
+                               	    "url": ""
+                               	  }
+                               	];
+	  		$scope.jsonMenuData = unflatten( $scope.jsonMenuData );
+ 	   		$scope.megaMenuDataObject = menuStructureConvert($scope.jsonMenuData);
+//	  		$log.debug(JSON.stringify($scope.jsonMenuData));
+    	}
+		var childItemList="";
+		var parentList = "";
+		try{
+			childItemList = ${menu.childItemList};
+			parentList = ${menu.parentList};
+		}catch(err){
+			console.log("ebz_header: failed to get child/parent lists", err);
+		}
+		
+ 		var pageUrl = window.location.href.split('/')[window.location.href.split('/').length-1];
+		
+		$scope.menuItems = [];
+		for (var i = 0; i < parentList.length; i++) {
+			$scope.openCurrentMenu = false;
+		 if(pageUrl==parentList[i].action)
+				$scope.openCurrentMenu = true;
+			$scope.childItemList = childItemList[i];
+			for(chIndex in  $scope.childItemList){
+				if($scope.childItemList.length>0)
+					if($scope.childItemList[chIndex].action!=null){
+						if($scope.childItemList[chIndex].action==pageUrl)
+							$scope.openCurrentMenu = true;
+					}
+			}
+			$scope.item = {
+				parentLabel : parentList[i].label,
+				parentAction : parentList[i].action,
+				parentImageSrc : parentList[i].imageSrc,
+				open:$scope.openCurrentMenu,
+				childItemList : $scope.childItemList
+			}
+			$scope.menuItems.push($scope.item);
+		}
+		$scope.arrowShow = true;
+		$scope.drawerOpen = false;
+		$scope.subMenuContent = false;
+		$scope.toggleSubMenu = function() {
+			$scope.subMenuContent = !$scope.subMenuContent;
+		};
+
+		var drawerOpen = 'open';
+		if (drawerOpen == 'open') {
+			$scope.drawerOpen = true;
+			$scope.arrowShow = true;
+		} else {
+			$scope.arrowShow = false;
+		}
+		$scope.arrowShow = true;
+		$scope.drawerOpen = false;
+		$scope.toggleDrawer = function() {
+			$scope.drawerOpen = !($scope.drawerOpen);
+			if ($scope.drawerOpen) {
+				$scope.arrowShow = true;				
+				if (document.getElementById('mContent')!=null)
+					document.getElementById('mContent').style.marginLeft = "0px"; 			
+			} else {
+				$scope.arrowShow = false;
+				if (document.getElementById('mContent')!=null)
+					document.getElementById('mContent').style.marginLeft = "-150px";
+			}
+		};
+		//var drawerOpen = getCookie('drawerOpen');
+		if (drawerOpen == 'open') {
+			$scope.drawerOpen = true;
+			$scope.arrowShow = true;
+		} else {
+			$scope.arrowShow = false;
+		}
+		$timeout(function() {
+			detectScrollEvent();
+		}, 800);
+		
+	});
+	
+	app.filter("ellipsis", function(){
+	    return function(text, length){
+	        if (text) {
+	            var ellipsis = text.length > length ? "..." : "";
+	            return text.slice(0, length) + ellipsis;
+	        };
+	        return text;        
+	    }
+	});
+</script>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html
new file mode 100644
index 00000000..ae5e13ec
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html
@@ -0,0 +1,115 @@
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  -->
+<script type="text/ng-template" id="loginSnippet.html">
+          <div style="line-height: normal; right: 167px; min-height: 200px; height: auto; width: auto; " ng-controller="loginSnippetCtrl" >
+									<div id="reg-header-snippet">
+										<div class="reg-profilePicture" style="min-height: 215px; width: auto; " id="reg-profile-links">
+											<div id="reg-profileImage">	
+												<div style="clear: both; height: 80px; position: relative; width: 80px;">
+												
+													<span style="  background-position: -1px -1px; height: 81px;left: 0;position: absolute;top: 0;width: 81px;">&nbsp;</span>
+												</div>
+											</div>						
+											<div id="reg-logout-div">
+												<a class="reg-logout-btn" href="logout.htm">Log Out</a>	
+											</div>
+										</div>
+										<div tabindex="0" class="reg-profileDetails" id="reg-profiledetails-id">
+										<ul class="reg-Details-table" style="list-style: none;">
+											<li><div class="reg-userName-table"><div id="reg-userName-table-row"><div id="reg-userName-table-cell"><h3 id="reg-userName" ng-bind="userProfile.fullName"></h3><span class="visuallyhidden">.</span></div></div></div></li>
+											<li><div class="reg-userEmail-label"><span class="reg-userEmail-label-spn">EMAIL<span class="visuallyhidden">:</span></span></div></li>
+											<li><div class="reg-userEmail-value"><span class="reg-userEmail-value-spn" ng-bind="userProfile.email"><span class="visuallyhidden">.</span></span></div></li>
+											<li><div class="reg-userRole-label"><span class="reg-userRole-label-spn">orgUserId<span class="visuallyhidden">:</span></span></div></li>
+											<li><div class="reg-userRole-value"><span class="reg-userRole-value-spn" ng-bind="userProfile.orgUserId"><span class="visuallyhidden"></span></span></div></li>			
+										</ul>	
+										</div>
+										</div>
+									</div>
+    </script>
+    <script type="text/ng-template" id="chat_box.html">
+     
+								<div style="width: auto;">
+									
+									<div style="font-size: 24px; font-family: Omnes-ECOMP-W02, Arial;line-height: 26px;color: #444444;text-align: center;">
+										<span>Live Chat</span>
+									</div>
+									
+								</div>   
+	</script>       
+
+<script>
+var loginSnippetCtrl =  function ($scope,$http, $log,UserInfoService){
+	/*Define fields*/
+	$scope.userProfile={
+			firstName:'',
+			lastName:'',
+			fullName:'',
+			email:''
+	}
+	/*Put user info into fields*/
+	$scope.inputUserInfo = function(userInfo){
+		if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
+			if (typeof(userInfo.USER_FIRST_NAME) != "undefined" && userInfo.USER_FIRST_NAME!=null && userInfo.USER_FIRST_NAME!='')
+				$scope.userProfile.firstName = userInfo.USER_FIRST_NAME;
+			if (typeof(userInfo.USER_LAST_NAME) != "undefined" && userInfo.USER_LAST_NAME!=null && userInfo.USER_LAST_NAME!='')
+				$scope.userProfile.lastName = userInfo.USER_LAST_NAME;
+			if (typeof(userInfo.USER_EMAIL) != "undefined" && userInfo.USER_EMAIL!=null && userInfo.USER_EMAIL!='')  			
+				$scope.userProfile.email = userInfo.USER_EMAIL;		
+			
+		}		
+	}
+	 /*getting user info from session*/
+	$scope.getUserNameFromSession = function(){
+		UserInfoService.getFunctionalMenuStaticDetailSession()
+	  	.then(function (response) {
+	  		var j = response;
+	  		// console.log(response);
+	  		$scope.userProfile.fullName = response.userName;
+	  		$scope.userProfile.email = response.email;
+	  	});
+    }
+	/*getting user info from shared context*/
+	$scope.getUserName=function() {
+		var promise = UserInfoService.getFunctionalMenuStaticDetailShareContext();
+		promise.then(
+			function(res) { 
+				if(res==null || res==''){
+					$log.info('loginSnippet::getUserName: failed to get user info from shared context');
+					$scope.getUserNameFromSession();
+				}else{
+					// $log.info('Received User information from shared context',res);
+					var resData = res;
+					$scope.inputUserInfo(resData);					
+					$scope.userProfile.fullName = $scope.userProfile.firstName+ ' '+ $scope.userProfile.lastName;					
+				}
+			},
+			function(err) {
+				console.log('error');
+			}
+		);
+    };
+    /*call the get user info function*/
+    try{   	
+    	$scope.getUserName();
+    }catch(err){
+    	$log.info('Error while getting User information',err);
+    }
+}
+ </script>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp
new file mode 100644
index 00000000..93f96369
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp
@@ -0,0 +1,45 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+
+<!DOCTYPE html>
+<html ng-app="abs">
+    <head>
+		<%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
+		<script src="static/js/jquery-1.10.2.js" type="text/javascript"></script>
+	</head>
+	<body class="templatebody" style="opacity: 1; background-color: rgb(242, 242, 242); padding: 0px;">
+		<div class="applicationWindow">
+			<div>
+				<tiles:insertAttribute name="header" />
+			</div>
+			<br>
+			<div class="content" id="mContent">
+				<div class="body-content-jsp">
+					<tiles:insertAttribute name="body" />
+				</div>
+			</div>
+			<br>
+			<div>
+				<tiles:insertAttribute name="footer" /> 
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp
new file mode 100644
index 00000000..a579fdc0
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp
@@ -0,0 +1,35 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+<!DOCTYPE html>
+<html>
+    <%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
+	<body class="templatebody" style="opacity: 1; background-color: rgb(242, 242, 242); padding: 0px;">
+		<div class="applicationWindow">
+		
+			<div class="content" style="margin-left:100px; margin-right:100px;">
+				<div>
+					<tiles:insertAttribute name="body" />
+				</div>
+			</div>
+			
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp
new file mode 100644
index 00000000..4cdfe51d
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp
@@ -0,0 +1,48 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+<!DOCTYPE html>
+<html ng-app="abs">
+    <%@ include file="/WEB-INF/fusion/jsp/meta.jsp" %>
+		<script src="static/js/jquery-1.10.2.js" type="text/javascript"></script>
+<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> 
+<script src= "app/fusion/external/ebz/angular_js/angular-route.min.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/angular-sanitize.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/app.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/gestures.js"></script>
+<script src="static/js/jquery-1.10.2.js"></script>
+<script src="static/js/modalService.js"></script>
+<script src="static/js/jquery.mask.min.js" type="text/javascript"></script>
+<script src="static/js/jquery-ui.js" type="text/javascript"></script>
+<script src="app/fusion/external/ebz/sandbox/att-abs-tpls.js" type="text/javascript"></script>
+<script src="static/fusion/js/att_angular_gridster/ui-gridster-tpls.js"></script>
+<script src="static/fusion/js/att_angular_gridster/angular-gridster.js"></script>
+<script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script>
+<script src="app/fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script>		
+
+    
+	<body class="templatebody" style="opacity: 1; background-color: rgb(242, 242, 242); padding: 0px;">
+		<div class="applicationWindow">
+			<div class="content">
+					<tiles:insertAttribute name="body" />
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp
new file mode 100644
index 00000000..61458524
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp
@@ -0,0 +1,97 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<!-- <link rel="stylesheet" type="text/css" href="app/fusion/elasticsearch/styles/styles.css" > -->
+<script>
+app.controller('elasticSearchController',['$scope','$http',function ($scope,$http) { 
+	$scope.submenuId = "";
+	$scope.isNew="";
+ 	$scope.viewPerPage = 20;
+    $scope.currentPage = 2;
+    $scope.totalPage;	
+    $scope.searchCategory = "";
+    $scope.searchString = "";
+ 	$scope.tableData=[];
+ 	$scope.searchText='';
+ 	$scope.flagCount=0;
+ 	function escapeRegExp(str) {
+ 		return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|\&]/g, " ");
+ 	}
+ 	$scope.test = function(){
+ 		$scope.searchText=$scope.searchText;
+ 		var sendData ={
+ 			"data" : escapeRegExp($scope.searchText),
+ 			"size" : "100",
+ 			"fuzzy" : "true",
+ 			"resultname" : "custsuggest"
+		};
+		
+ 		if($scope.flagCount<3 || $scope.searchText.length==0){
+ 			$scope.flagCount++;
+ 			$http.get('es_search/' + encodeURIComponent(JSON.stringify(sendData))).
+ 				then(function(response){
+ 					var data = JSON.parse(response.data.result);
+ 					$scope.tableData = data.hits.hits;
+ 				})
+ 				.catch(function(data,status){
+					console.log("Error: " + status + " : " + data); 					
+ 				})
+ 				.finally(function() {
+ 					$scope.flagCount--;
+ 				});
+ 		}
+ 	}
+ 	$scope.searchText='';
+}]);
+</script>
+
+<div style="margin-left:20px;" ng-app="eSearchApp">
+ 	<div style="margin-top:20px; margin-bottom:20px;"><span class="heading1">Elastic Search - </span><span class="heading2">Corporate Location Data System</span></div>
+	<div class="demoElas" ng-controller="elasticSearchController">
+		<div class="form-field" align="center">
+           <input type="text" placeholder="What are you looking for?" class="search__large-iconform" ng-model="searchText" ng-change="test()">
+           <i class="icon-search">&nbsp;</i>
+        </div>
+        
+        <table att-table table-data="tableData" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">
+		     <thead att-table-row type="header">
+		        <tr>
+		         	<th att-table-header>Customer Name</th>  
+		            <th att-table-header>Phone</th>  
+		            <th att-table-header>Street</th>  
+		            <th att-table-header>City</th>  
+		            <th att-table-header>State</th>  
+		            <th att-table-header>ZIP</th>
+		            <th att-table-header>CLLI</th>  
+		        </tr>
+			 </thead>
+		    <tbody att-table-row type="body" row-repeat="options in tableData">
+		        <tr>
+		     	  	<td att-table-body >{{options._source.name}}</td>
+					<td att-table-body >{{options._source.suggest.payload.tn}}</td>
+					<td att-table-body >{{options._source.suggest.payload.addr}}</td>
+					<td att-table-body >{{options._source.suggest.payload.city}}</td>
+					<td att-table-body >{{options._source.suggest.payload.st}}</td>
+					<td att-table-body >{{options._source.suggest.payload.zip}}</td>	
+					<td att-table-body >{{options._source.suggest.payload.clli}}</td>			
+				</tr>     
+		    </tbody>
+		</table>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp
new file mode 100644
index 00000000..abae598b
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp
@@ -0,0 +1,97 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<!-- <link rel="stylesheet" type="text/css" href="app/fusion/elasticsearch/styles/styles.css" > -->
+<script>
+app.controller('elasticSearchController',['$scope','$http',function ($scope,$http) { 
+	$scope.submenuId = "";
+	$scope.isNew="";
+ 	$scope.viewPerPage = 20;
+    $scope.currentPage = 2;
+    $scope.totalPage;	
+    $scope.searchCategory = "";
+    $scope.searchString = "";
+ 	$scope.tableData=[];
+ 	$scope.searchText='';
+ 	$scope.flagCount=0;
+ 	function escapeRegExp(str) {
+ 		return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|\&]/g, " ");
+ 	}
+ 	$scope.test = function(){
+ 		$scope.searchText=$scope.searchText;
+ 		var sendData ={
+ 			"data" : escapeRegExp($scope.searchText),
+ 			"size" : "20",
+ 			"fuzzy" : "true",
+ 			"resultname" : "custsuggest"
+		};
+		
+ 		if($scope.flagCount<3 || $scope.searchText.length==0){
+ 			$scope.flagCount++;
+ 			$http.get('es_suggest/' + encodeURIComponent(JSON.stringify(sendData))).
+ 				then(function(response){
+ 					var data = JSON.parse(response.data.result);
+ 					$scope.tableData = data.custsuggest[0].options;
+ 				})
+ 				.catch(function(data,status){
+					console.log("Error: " + status + " : " + data); 					
+ 				})
+ 				.finally(function() {
+ 					$scope.flagCount--;
+ 				});
+ 		}
+ 	}
+ 	$scope.searchText='';
+}]);
+</script>
+
+<div style="margin-left:20px;" ng-app="eSearchApp">
+ 	<div style="margin-top:20px; margin-bottom:20px;"><span class="heading1">Elastic Search - </span><span class="heading2">Corporate Location Data System</span></div>
+	<div class="demoElas" ng-controller="elasticSearchController">
+		<div class="form-field" align="center">
+           <input type="text" placeholder="What are you looking for?" class="search__large-iconform" ng-model="searchText" ng-change="test()">
+           <i class="icon-search">&nbsp;</i>
+        </div>
+        
+        <table att-table table-data="tableData" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">
+		     <thead att-table-row type="header">
+		        <tr>
+		         	<th att-table-header>Customer Name</th>  
+		            <th att-table-header>Phone</th>  
+		            <th att-table-header>Street</th>  
+		            <th att-table-header>City</th>  
+		            <th att-table-header>State</th>  
+		            <th att-table-header>ZIP</th>
+		            <th att-table-header>CLLI</th>  
+		        </tr>
+			 </thead>
+		    <tbody att-table-row type="body" row-repeat="options in tableData">
+		        <tr>
+		     	  	<td att-table-body >{{options.text}}</td>
+					<td att-table-body >{{options.payload.tn}}</td>
+					<td att-table-body >{{options.payload.addr}}</td>
+					<td att-table-body >{{options.payload.city}}</td>
+					<td att-table-body >{{options.payload.st}}</td>
+					<td att-table-body >{{options.payload.zip}}</td>	
+					<td att-table-body >{{options.payload.clli}}</td>			
+				</tr>     
+		    </tbody>
+		</table>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp
new file mode 100644
index 00000000..ed50b5dd
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp
@@ -0,0 +1,44 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<iframe id="frame_insert" src="${frame_int}"></iframe>
+
+<script type="text/javascript">
+
+    var frameId = "#frame_insert";
+
+	$(frameId).load(function(){
+		iframeLoaded()
+	   
+	});
+  
+
+  function iframeLoaded() {
+	  var iFrameRef =  $(frameId);
+      if(iFrameRef) {
+    	  
+    	  var height = iFrameRef.contents().find("input[name='inner_height']");
+    	  var width = iFrameRef.contents().find("input[name='inner_width']");
+            
+    	  iFrameRef.css('height', (height.val() != undefined ? height.val():"500px"));
+    	  iFrameRef.css('width',  (width.val() != undefined ? width.val():"500px"));
+    	  iFrameRef.css('border','none');
+      }   
+  }
+</script>   
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/include.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/include.jsp
new file mode 100644
index 00000000..cd6a5e09
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/include.jsp
@@ -0,0 +1,30 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
+<%@ page import="org.openecomp.portalsdk.core.web.support.AppUtils" %>
+
+<%@ page import="java.util.LinkedHashMap" %>
+
+
+<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn"     uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<c:set var="request" value="<%=request%>"/>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp
new file mode 100644
index 00000000..0a361803
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp
@@ -0,0 +1,36 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1"> 
+	<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/fn-ebz.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/demo.css" >
+	 	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/base.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/btn.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/dtpk.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/frms.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/sldr.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/tbs.css" > 		
+		<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">
+		
+</head>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html
new file mode 100644
index 00000000..0766cecd
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html
@@ -0,0 +1,324 @@
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  -->
+
+<script type="text/ng-template" id="modal_informative.html">
+       <div class="modal__informative font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Success!</h2>
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content" style="white-space: pre-wrap;">{{message.text}}</div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Dismiss</button>
+            </div>
+        </div>
+    </script>
+   
+   <script type="text/ng-template" id="modal_message.html">
+       <div class="modal__informative font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Attention!</h2>
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content" style="white-space: pre-wrap;">{{message.text}}</div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Dismiss</button>
+            </div>
+        </div>
+    </script>
+   
+    <script type="text/ng-template" id="delete_informative.html">
+   <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are you sure you want to delete the profile?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+   <script type="text/ng-template" id="email_report_informative.html">
+   <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Mailing your report...</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              The report will be sent to your email soon!
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Ok</button>
+            </div>
+        </div>
+    </script>
+    <script type="text/ng-template" id="delete_authCode.html">
+   <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are you sure you want to delete the Authorization Code(s)?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+     <script type="text/ng-template" id="delete_Schedule.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete This Schedule(s) ?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+    <script type="text/ng-template" id="alternate_number.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete This Number ?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+     <script type="text/ng-template" id="manage_device.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete This Line Port ?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+    <script type="text/ng-template" id="delete_virtualOnNet.html">
+  		 <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete this Virtual On-Net User?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+    <script type="text/ng-template" id="delete_user_meet_me_conference.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete this Conference?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+    <script type="text/ng-template" id="confirmation_informative.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">{{message.title}}</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content" style="white-space: pre-wrap;">{{message.text}}<br/></div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div> 
+        </div>
+    </script>
+   
+    <script type="text/ng-template" id="confirmation_for_delete.html">
+   		<div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name"> <h2 class="font-showcase-font-name">Are You Sure You Want to Delete This {{message.title}}?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">Deletions are not reversible. {{message.text}}<br/></div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div> 
+        </div>
+    </script>
+   
+   <script type="text/ng-template" id="modal_warning.html">
+   <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Unable to process your request!</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+			<div class="modal__content" style="white-space: pre-wrap;">Unable to process your request.   <br/>{{message.text}}<br/>
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Dismiss</button>
+            </div>
+        </div>
+    </script>
+    
+    <script type="text/ng-template" id="modal_warning_message.html">
+   <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Warning</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+			<div class="modal__content" style="white-space: pre-wrap;">{{message.text}}<br/>
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Dismiss</button>
+            </div>
+        </div>
+    </script>
+
+
+    
+    <script type="text/ng-template" id="modal_prompt.html">
+       <div class="modal__warning font-showcase">
+          <div class="modal__header">
+              <h2 class="font-showcase-font-name">Unable to process your request. </h2>
+              <i class="icon-circle-action-close close-modal modal__header--close"  ng-click="$dismiss()"></i>
+              
+          </div>
+          <div class="divider-container"><hr> </div>      
+          <div class="modal__content">
+              Unable to process your request.   <br/> {{message.text}}
+          </div>
+   	</div>
+    </script>
+     <script type="text/ng-template" id="delete_device.html">
+        <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete This Device?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+     <script type="text/ng-template" id="delete_multiple_device.html">
+        <div class="modal__warning font-showcase" >
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name">Are You Sure You Want to Delete The Device(s)?</h2>
+				
+                <div class="modal__header--icon"></div>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">
+              Deletions are not reversible.<br/> {{message.text}}
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$close()">Yes</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="$dismiss()">Cancel</button>
+            </div>
+        </div>
+    </script>
+
+<script>
+
+//.controller('modalpopupController', function ($scope, $modalInstance){
+var modalpopupController =  function ($scope, $modalInstance, message){
+	
+	$scope.message = message;
+	
+	
+	$scope.hello = function () {
+        $modalInstance.close($scope.digitPattern);
+    };
+	$modalInstance.ok = function() {
+        //add the  ok functionality
+        alert("Logout");        
+    };
+    $modalInstance.cancel = function() {
+        //add the cancel functionality
+        alert("Keep Log in");
+    };
+    $modalInstance.cancelbutton = function() {
+        //add the cancel functionality
+        alert("Modal Waring popup close event");
+    };
+}
+
+
+</script>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html
new file mode 100644
index 00000000..c163002d
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html
@@ -0,0 +1,274 @@
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  -->
+
+<script type="text/ng-template" id="role_functions_popup.html">
+          <div class="modal__informative font-showcase" style="width:700px;height:500px;overflow:scroll">
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name" style="width: 500px;">Select Role Functions</h2>
+            </div>
+            <button align="right" class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">           	 	
+				<table table-data="availableRoleFunctions" att-table>
+					<thead att-table-row type="header">
+						<tr>
+							<th att-table-header sortable="false" width="10%"> </th>
+							<th att-table-header sortable="false" width="90%">Role Function</th>
+						</tr>
+					</thead>
+					<tbody att-table-row type="body" row-repeat="availableRoleFunction in availableRoleFunctions" style="max-height: 980px;" >
+					  <tr>
+					  
+						<td width="10%">
+							<div ng-click="toggleRoleFunction(availableRoleFunction.selected,availableRoleFunction);">
+							<input type="checkbox" ng-model="availableRoleFunction.selected" att-toggle-main>
+							</div>
+						</td>
+						<td width="90%">{{ availableRoleFunction.name }}</td>
+						
+					  </tr>
+					</tbody>
+				</table>	
+            </div>
+        </div>
+</script>
+
+
+<script type="text/ng-template" id="child_roles_popup.html">
+          <div class="modal__informative font-showcase" style="width:700px;height:500px;overflow:scroll">
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name" style="width: 500px;">Select Child Roles</h2>
+            </div>
+            <button align="right" class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">           	 	
+					<table table-data="availableRoles" att-table>
+						<thead att-table-row type="header">
+							<tr>
+								<th att-table-header sortable="false" width="10%"> </th>
+								<th att-table-header sortable="false" width="90%">Role</th>
+							</tr>
+						</thead>
+						<tbody att-table-row type="body" row-repeat="availableRole in availableRoles" style="max-height: 980px;" >
+							<tr>
+							<td att-table-body width="10%">
+								<div ng-click="toggleChildRole(availableRole.selected,availableRole);">
+								<input type="checkbox" ng-model="availableRole.selected" att-toggle-main>
+								</div>
+							</td>
+							<td att-table-body width="90%">{{ availableRole.name }}</td>
+							</tr>
+						</tbody>
+					</table>	
+            </div>
+        </div>
+</script>
+
+<script>
+
+var rolepopupController =  function ($scope, $modalInstance, role,modalService){
+	$scope.role = role;
+	
+	if($scope.role.childRoles==null){
+		$scope.role.childRoles=[];
+	}
+	
+	$scope.ociavailableRoles=${availableRoles};
+	console.log($scope.ociavailableRoles);
+	$scope.availableRoles=[];
+	if($scope.ociavailableRoles)
+		$.each($scope.ociavailableRoles, function(i, a){ 
+			var availableRole = a;
+			availableRole.selected = false;
+			if($scope.role.childRoles){
+		    $.each($scope.role.childRoles, function(j, b){ 
+		    	if(a.id === b.id) {
+		    		availableRole.selected = true;
+		    	}
+		    });
+			};
+		    $scope.availableRoles.push(availableRole);	    
+		});	
+		;
+	
+	$scope.ociavailableRoleFunctions=${availableRoleFunctions};
+	
+	$scope.availableRoleFunctions = []; 
+	if($scope.ociavailableRoleFunctions)
+		$.each($scope.ociavailableRoleFunctions, function(i, a){ 
+			var availableRoleFunction = a;
+			availableRoleFunction.selected = false;
+		    $.each($scope.role.roleFunctions, function(j, b){ 
+		    	if(a.code === b.code) {
+		    		availableRoleFunction.selected = true;
+		    	}
+		    });
+		    $scope.availableRoleFunctions.push(availableRoleFunction);	    
+		});	
+		;
+	
+		$scope.toggleRoleFunction = function(selected,availableRoleFunction) {
+			//alert('toggleRole: '+selected);
+			 
+			if(!selected) {
+				//remove role function
+				if(role.id==null){
+					var index = $scope.role.roleFunctions.indexOf(availableRoleFunction);
+				 	if(index>=0)
+						$scope.role.roleFunctions.splice(index, 1);
+					return;
+				}
+				var uuu = "role/removeRoleFunction.htm?role_id=${param.role_id}";
+				modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?",
+		    			function(){
+								var postData={roleFunction:availableRoleFunction};
+							  	  $.ajax({
+							  		 type : 'POST',
+							  		 url : uuu,
+							  		 dataType: 'json',
+							  		 contentType: 'application/json',
+							  		 data: JSON.stringify(postData),
+							  		 success : function(data){
+							  			$scope.$apply(function(){$scope.role=data.role;}); 
+									 },
+									 error : function(data){
+										 modalService.showFailure("Fail","Error while saving.");
+									 }
+							  	  });
+					
+		    	},
+		    	function(){
+		    		availableRoleFunction.selected=!availableRoleFunction.selected;
+		    	})
+				
+			} else {
+				//add role function
+				if(role.id==null){
+					$scope.role.roleFunctions.push(availableRoleFunction);
+					return;
+				}
+				var uuu = "role/addRoleFunction.htm?role_id=${param.role_id}";
+				modalService.popupConfirmWinWithCancel("Confirm","You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?",
+		    			function(){
+					  var postData={roleFunction:availableRoleFunction};
+				  	  $.ajax({
+				  		 type : 'POST',
+				  		 url : uuu,
+				  		 dataType: 'json',
+				  		 contentType: 'application/json',
+				  		 data: JSON.stringify(postData),
+				  		 success : function(data){
+				  			$scope.$apply(function(){$scope.role=data.role;}); 
+						 },
+						 error : function(data){
+							 modalService.showFailure("Fail","Error while saving.");
+						 }
+				  	  });
+					
+		    	},
+		    	function(){
+		    		availableRoleFunction.selected=!availableRoleFunction.selected;
+		    	})
+				
+			}
+			
+			  
+	};
+	
+	$scope.toggleChildRole = function(selected,availableRole) {
+		//alert('toggleRole: '+selected);
+
+		if(!selected) {
+			//remove role
+			if(role.id==null){
+				var index = $scope.role.childRoles.indexOf(availableRole);
+			 	if(index>=0)
+					$scope.role.childRoles.splice(index, 1);
+				return;
+			}
+			var uuu = "role/removeChildRole.htm?role_id=${param.role_id}";
+			modalService.popupConfirmWinWithCancel("Confirm","You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?",
+	    			function(){
+						var postData={childRole:availableRole};
+					  	  $.ajax({
+					  		 type : 'POST',
+					  		 url : uuu,
+					  		 dataType: 'json',
+					  		 contentType: 'application/json',
+					  		 data: JSON.stringify(postData),
+					  		 success : function(data){
+					  			 console.log('role',data.role);
+					  			 $scope.$apply(function(){$scope.role=data.role;}); 
+							 },
+							 error : function(data){
+								 modalService.showFailure("Fail","Error while saving.");
+							 }
+					  	  });
+				
+	    	},
+	    	function(){
+	    		 availableRole.selected=true;			
+	    	})
+			
+		} else {
+			//add role
+			if(role.id==null){
+				$scope.role.childRoles.push(availableRole);
+				return;
+			}
+			var uuu = "role/addChildRole.htm?role_id=${param.role_id}";
+			modalService.popupConfirmWinWithCancel("Confirm","You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?",
+	    			function(){
+				  var postData={childRole:availableRole};
+			  	  $.ajax({
+			  		 type : 'POST',
+			  		 url : uuu,
+			  		 dataType: 'json',
+			  		 contentType: 'application/json',
+			  		 data: JSON.stringify(postData),
+			  		 success : function(data){
+			  			$scope.$apply(function(){$scope.role=data.role;}); 
+					 },
+					 error : function(data){
+						 modalService.showFailure("Fail","Error while saving.");
+					 }
+			  	});
+				
+	    	},
+	    	function(){
+	    		availableRole.selected=false;
+	    	})
+			
+			
+		}
+		
+		  
+	};
+
+	
+	$scope.close = function() {
+		console.log('role', $scope.role);
+		$modalInstance.close({role:$scope.role});
+	};
+	
+}
+
+
+</script>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html
new file mode 100644
index 00000000..ee0b5121
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html
@@ -0,0 +1,87 @@
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  -->
+<script type="text/ng-template" id="edit_role_function_popup.html">
+          <div class="modal__informative font-showcase" style="width:400px;">
+            <div class="modal__header">
+                <h2 class="font-showcase-font-name" style="width: 500px;">{{label}}</h2>
+            </div>
+            <div class="divider-container"><hr> </div>      
+            <div class="modal__content">           	 	
+					<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Name:</label><br>
+					<input type="text" class="fn-ebz-text" ng-model="editRoleFunction.name"
+						maxlength="30" /> 
+					</div>
+					<br/>
+					<div class="fn-ebz-container" >
+					<label class="fn-ebz-text-label"><sup><b>*</b></sup>Code:</label><br>
+					<input type="text" class="fn-ebz-text" ng-model="editRoleFunction.code" ng-disabled="disableCd"
+						maxlength="30" /> 
+					</div>
+            </div>
+            <div class="modal__footer">
+                <button class="button button--primary button--small" herf="javascript:void(0)" ng-click="saveRoleFunction(editRoleFunction);">Save</button>
+				<button class="button button--primary button--small" herf="javascript:void(0)" ng-click="close()">Close</button>
+            </div>
+        </div>
+</script>
+
+<script>
+
+var rolefunctionpopupController =  function ($scope, $modalInstance, message){
+	if(message.availableRoleFunction==null)
+		$scope.label='Add Role Function'
+	else{
+		$scope.label='Edit Role Function'
+		$scope.disableCd=true;
+	}
+	$scope.editRoleFunction = message.availableRoleFunction;
+	
+	$scope.saveRoleFunction = function(availableRoleFunction) {
+		  var uuu = "role_function_list/saveRoleFunction.htm";
+		  var postData={availableRoleFunction: availableRoleFunction};
+	  	  $.ajax({
+	  		 type : 'POST',
+	  		 url : uuu,
+	  		 dataType: 'json',
+	  		 contentType: 'application/json',
+	  		 data: JSON.stringify(postData),
+	  		 success : function(data){
+	  			$scope.$apply(function(){
+	  				//$scope.availableRoleFunctions=[];$scope.$apply();
+	  				$scope.availableRoleFunctions=data.availableRoleFunctions;});  
+	  			//alert("Update Successful.") ;
+	  			console.log($scope.availableRoleFunctions);
+				
+	  			//$scope.editRoleFunction = null;
+	  			$modalInstance.close({availableRoleFunctions:$scope.availableRoleFunctions});
+			 },
+			 error : function(data){
+				 alert("Error while saving.");
+			 }
+	  	  });
+		};
+		
+	$scope.close = function() {
+		$modalInstance.close();
+	};
+}
+
+</script>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp
new file mode 100644
index 00000000..eacdfbe0
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/sequence/details.jsp
@@ -0,0 +1 @@
+<iframe style="border:none" src="app/fusion/sequence/view-models/details.html" height="700" width="1300"></iframe> 
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
new file mode 100644
index 00000000..9bf0ed74
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp
@@ -0,0 +1,494 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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 html>
+
+<html xmlns="http://www.w3.org/1999/xhtml" ng-app="abs">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<link type="text/css" rel="stylesheet" href="app/fusion/styles/layout/layout-default-latest.css" />
+    <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/btn.css" >
+    <link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/fn-ebz.css" >
+		<style type="text/css">
+	/*
+	 *	NOTE: All CSS is purely cosmetic - it does not affect functionality
+	 *  http://layout.jquery-dev.com/demos.cfm
+	 */
+
+	/* customize borders to avoid double-borders around inner-layouts */
+	.ui-layout-pane {
+		border:			0; /* override layout-default-latest.css */
+		border-top:		1px solid #BBB;
+		border-bottom:	1px solid #BBB;
+	}
+	.ui-layout-pane-north ,
+	.ui-layout-pane-south {
+		border:			1px solid #BBB;
+		overflow:		auto;
+	}
+	.ui-layout-pane-west ,
+	.ui-layout-pane-east {
+	}
+	.ui-layout-pane-center	{
+		border-left:	0;
+		border-right:	0;
+		}
+		.inner-center {
+			border:		1px solid #BBB;
+		}
+
+	/* add shading to outer sidebar-panes */
+	.outer-west ,
+	.outer-east {
+		background-color: #EEE;
+	}
+	.middle-west ,
+	.middle-east {
+		background-color: #F8F8F8;
+	}
+
+	/* remove padding & scrolling from panes that are 'containers' for nested layouts */
+	.outer-center ,
+	.middle-center {
+		border:			0; /* cosmetic */
+		padding:		0;
+		overflow:		auto;
+	}
+
+	/*
+	 *	customize borders on panes/resizers to make pretty
+	 */
+	.ui-layout-pane-west		{ border-right:		0; }
+	.ui-layout-resizer-west		{ border-left:		1px solid #BBB; }
+	.ui-layout-pane-east		{ border-left:		0; }
+	.ui-layout-resizer-east		{ border-right:		1px solid #BBB; }
+	.ui-layout-pane-north		{ border-bottom:	0; }
+	.ui-layout-resizer-north	{ border-top:		1px solid #BBB; }
+	.ui-layout-pane-south		{ border-top:		0; }
+	.ui-layout-resizer-south	{ border-bottom: 	1px solid #BBB; }
+	/*
+	 *	add borders to resizers when pane is 'closed'
+	 *
+	 *.ui-layout-resizer-closed	{ border:			1px solid #BBB; }
+	 */
+	/*
+	 *	show both borders when the resizer is 'dragging'
+	 */
+	.ui-layout-resizer-west-dragging ,
+	.ui-layout-resizer-east-dragging {
+		border-left:		1px solid #BBB;
+		border-right:		1px solid #BBB;
+	}
+	.ui-layout-resizer-north-dragging ,
+	.ui-layout-resizer-south-dragging {
+		border-top:		1px solid #BBB;
+		border-bottom:	1px solid #BBB;
+	}
+	
+	
+	/*
+	layout toggler background image
+	*/
+	.ui-layout-toggler-west, .ui-layout-toggler-east {
+	border-width: 1px 0;
+	background-image: url("static/fusion/images/layout/panel-e-w-toggle.png");
+	background-size: 10px 10px;
+    background-repeat: no-repeat;
+    background-position: center; 
+	}
+	
+	.ui-layout-toggler-north, .ui-layout-toggler-south {
+	border-width: 0 1px;
+	background-image: url("static/fusion/images/layout/panel-n-s-toggle.png");
+	background-size: 10px 10px;
+	background-repeat: no-repeat;
+	 background-position: center; 
+	}
+	
+	body{background-color:#fff;font-size:14px;font-size:.875rem;margin:0;padding:0px 0 20px;position:relative}
+
+	</style>
+
+
+	<!-- LAYOUT v 1.3.0 -->
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery-ui-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/jquery.layout-latest.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/webrtc/RTCMultiConnection.js"></script>
+    <script type="text/javascript" src="app/fusion/scripts/socket/peerBroadcast.js"></script>
+	<script type="text/javascript" src="app/fusion/scripts/layout/debug.js"></script>
+	
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/fn-ebz.css" >
+	<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
+
+	<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> 
+	<script src= "app/fusion/external/ebz/angular_js/angular-route.min.js"></script>
+	<script src= "app/fusion/external/ebz/angular_js/angular-sanitize.js"></script>
+	<script src= "app/fusion/external/ebz/angular_js/app.js"></script>
+	<script src= "app/fusion/external/ebz/angular_js/gestures.js"></script>
+	
+	<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
+	<script src="app/fusion/scripts/modalService.js"></script>
+	<script src="app/fusion/external/ebz/sandbox/att-abs-tpls.js" type="text/javascript"></script>
+	<script src="app/fusion/scripts/att_angular_gridster/ui-gridster-tpls.js"></script>
+	<script src="app/fusion/scripts/att_angular_gridster/angular-gridster.js"></script>
+	<script src= "app/fusion/external/ebz/angular_js/checklist-model.js"></script>
+	<script type="text/javascript" src= "app/fusion/external/ebz/angular_js/angular-cookies.js"></script>
+	<style>
+		body{background-color:#fff;font-size:14px;font-size:.875rem;margin:0;padding:0px 0 20px;position:relative}
+	</style>
+
+	<script type="text/javascript">
+
+	
+	var popupModalService;
+	
+	app.controller("collaborationController", function ($scope,$http,modalService, $modal) { 
+		popupModalService = modalService;
+		   
+		});
+	
+
+	$(document).ready(function () {
+
+		// OUTER-LAYOUT
+		panelLayout = $('body').layout({
+			center__paneSelector:	".outer-center"
+		,	west__paneSelector:		".outer-west"
+		,	east__paneSelector:		".outer-east"
+		//,	west__size:				800
+		//,	east__size:				125
+		,	spacing_open:			8  // ALL panes
+		,	spacing_closed:			12 // ALL panes
+	
+		,	center__childOptions: {
+			center__paneSelector:	".inner-center"
+		,	west__paneSelector:		".inner-west"
+		,	east__paneSelector:		".inner-east"
+		,	west__size:				75
+		,	east__size:				75
+		,	spacing_open:			8  // ALL panes
+		,	spacing_closed:			8  // ALL panes
+		,	west__spacing_closed:	12
+		,	east__spacing_closed:	12
+		}
+
+		 
+
+		
+		});
+		
+	
+		function initializeConnections() {
+	    	
+	    	var channelId = null;
+			channelId = location.href.replace(/\/|:|#|%|\.|\[|\]/g, '');
+			var videoChannelId = channelId.concat("video");
+			var screenChannelId = channelId.concat("screen");
+			
+			videoConnection = new RTCMultiConnection(videoChannelId);
+			screenConnection = new RTCMultiConnection(screenChannelId);
+			
+			configConnection(videoConnection,true,true,false,true,false);
+		    configConnection(screenConnection,false,false,true,false,true);
+	    	
+	    };
+	    
+	    function configConnection(_connection, _audio, _video, _screen, _data, _oneway) {
+	    	 _connection.session = {
+	                 audio:     _audio, // by default, it is true
+	                 video:     _video, // by default, it is true
+	                 screen:    _screen,
+	                 data:      _data,
+	                 oneway:    _oneway,
+	                 broadcast: false
+	            };
+	    	 
+	    	 _connection.direction = "one-to-one";
+	    	 
+	    	 if( _data == true ) {
+	    	 _connection.onmessage = function(e) {
+	             appendDIV(e.data);
+
+	             console.debug(e.userid, 'posted', e.data);
+	             console.log('latency:', e.latency, 'ms');
+	         };
+	    	 }
+	    
+	     
+	    }; 
+	    
+	    function assignStreamToDom() {
+	    	
+	    	
+	    	screenConnection.screenbody = document.querySelector('.screenContainer1'); 
+	    	screenConnection.videobody = document.querySelector('.videoContainer2'); 
+	    	
+	    	videoConnection.screenbody = document.querySelector('.screenContainer2'); 
+	    	videoConnection.videobody = document.querySelector('.videoContainer1'); 
+	    };
+	    
+		function maximizeLayout() {
+	    	
+			// open the panes and maximize the window.
+		     top.window.resizeTo(screen.availWidth,screen.availHeight);
+		     panelLayout.open('west');
+		     // panelLayout.open('south'); is not working due to state initialization problem; debug to find out. so replacing the call with work around below - hack.
+	    	 $(".ui-layout-toggler-south-closed").first().click();
+		     
+		 };
+	    
+	   function minimizeLayout() {
+	    	
+			// close the panes and minimize the window.
+		     top.window.resizeTo(screen.availWidth - 2*screen.availWidth/3, screen.availHeight - screen.availHeight/2);
+		     panelLayout.close('west');
+		     // panelLayout.close('south'); is not working due to state initialization problem; debug to find out. so replacing the call with work around below - hack.
+	    	 $(".ui-layout-toggler-south-opened").first().click();
+	    };
+	    
+	    function emptyContainers() {
+	    	 $('.screenContainer1').empty(); 
+		     $('.videoContainer2').empty(); 
+		    	
+		     $('.screenContainer2').empty();  
+		     $('.videoContainer1').empty(); 
+	    };
+	    
+	    function appendDIV(div, parent) {
+	        if (typeof div === 'string') {
+	            var content = div;
+	            div = document.createElement('div');
+	            div.innerHTML =  content;
+	          };
+	          
+	          var chatOutput = document.getElementById('chat-output'),
+	            fileProgress = document.getElementById('file-progress');
+	    
+	          if (!parent) chatOutput.insertBefore(div, chatOutput.firstChild);
+	            else fileProgress.insertBefore(div, fileProgress.firstChild);
+
+	            div.tabIndex = 0;
+	            $('#chat-input').focus();
+	     };
+	     
+	     function confirmClose() {
+	    	 var message = "Are you sure you want to close the session?";
+	    	 
+	    	 if(popupModalService != undefined) {
+	    		 popupModalService.popupConfirmWin("Confirm", message, function(){ location.reload();});
+	    	 }
+	    	 
+	    	 else if (confirm(message) == true) {
+	    		     location.reload();
+	    		    //window.opener.location.reload(); // go to the parent window
+	    			//close();
+	    	    } else {
+	    	        // do nothing
+	    	    }
+	    	 
+	     };
+	     
+	     function notifyOthers() {
+	    	 
+	    	// var websocket = localStorage.getItem('notifySocket');
+	    	 //if( websocket != null) {
+	    		 // handling websocket peer broadcast session 
+	    		 var currentUser = "${sessionScope.user.sbcid}";
+	    		 var initialPageVisit = "${sessionScope.initialPageVisit}";
+	    		 var remoteUser = '';
+	    		 
+	    		 var userList = location.search.split('chat_id=')[1].split('-');
+	    		 for(var i=0;i<userList.length;i++) {
+	    			 if(userList[i] !== currentUser) {
+	    				 remoteUser = userList[i];
+	    				 break;
+	    			 }
+	    		 }
+	    		
+	    		socketSetup(initialPageVisit, currentUser, remoteUser,"socketSend");
+	    		
+	    		 
+	    		 
+	    		 
+	    	
+	    	 
+	     };
+	     
+	     function makeChatVisible() {
+	    	 
+	    	 $('#chat-input').css("visibility", 'visible');    	 
+	     };
+	    
+	    
+	    
+	     /* on click button enabled*/
+	     document.getElementById('share-screen').onclick = function() {
+	    
+	     emptyContainers();	 
+	     videoConnection.close();
+		 screenConnection.close();	 
+	     
+	     maximizeLayout();
+	     emptyContainers();
+	     makeChatVisible();
+	     
+	     videoConnection.open();
+	     screenConnection.open();
+	     
+	     
+	     notifyOthers();
+	     
+	    
+	    
+		};
+
+		 document.getElementById('stop-share-screen').onclick = function() {
+		 
+		 emptyContainers();
+		 
+		 videoConnection.close();
+		 screenConnection.close();
+		 
+		 confirmClose();
+		 
+		};
+
+		 document.getElementById('view-screen').onclick = function() {
+		
+		 maximizeLayout();
+		 emptyContainers();
+		 makeChatVisible();
+		 
+		 // timeout is required for the sharing to properly work
+		 setTimeout(function() { 
+			 screenConnection.connect();
+		 },2000);
+		 setTimeout(function() { 
+			 videoConnection.connect();
+		 },1000);
+		
+		 
+		};
+		
+		document.getElementById('chat-input').onkeypress = function(e) {
+	        if (e.keyCode !== 13 || !this.value) return;
+	        var message = "<b>${model.name}</b>: " + this.value;
+	        appendDIV(message);
+
+	        // sending text message
+	        videoConnection.send(message);
+
+	        this.value = '';
+	    };
+	    
+	    /*
+	    document.getElementById('file').onchange = function() {
+	    	videoConnection.send(this.files[0]);
+        };
+		*/
+		
+		
+		//document.querySelector('.screenContainerPane').appenChild(document.querySelector('.screenContainer'));
+		//document.querySelector('.videoContainerPane').appendChild(document.querySelector('.videoContainer'));
+		
+		//panelLayout.bindButton($('#share-screen'), 'open', 'outer-west');
+		//panelLayout.bindButton($('#stop-share-screen'), 'close', 'outer-west');
+		var videoConnection = null, screenConnection = null;
+		initializeConnections();
+		assignStreamToDom();
+		
+		// start the share
+		//document.getElementById('share-screen').click();
+		//
+		});
+	
+
+</script>
+
+
+</head>
+
+<body>
+<!--  
+	<button id="share-screen" hidden="true" style="display: none;" class="setup">Share Your Screen</button>
+    <button id="stop-share-screen" hidden="true" style="display: none;" class="setup">Stop Share Your Screen</button>
+    <button id="view-screen" hidden="true" style="display: none;" class="setup">View My Screen</button>   
+    
+    -->    
+ 
+<div class="outer-center" style="position: absolute; left: 12px; right: 0px; top: 0px;bottom: 0px;">
+	<div class="inner-center">
+	
+	<!-- 	<jsp:include page="/WEB-INF/fusion/zul/chatOne.zul" /> -->
+	
+	
+	
+	<table style="width: 100%;">
+				<tbody><tr>
+                    <td>
+                        <button id="share-screen"  class="button button--primary button--small setup">Start Session</button>
+    				    <button id="stop-share-screen"  class="button button--primary button--small setup">Stop Session</button>
+    					<button id="view-screen" class="button button--primary button--small setup">View</button>       
+	
+                    </td>
+    
+                </tr>
+            </tbody>
+	
+                <tbody><tr>
+                    <td>
+                         <input type="text" id="chat-input" style="font-size: 1.2em;visibility:collapse;" placeholder="type here.."/>
+                         <div id="chat-output"></div>
+                    </td>
+                    <!-- 
+                    <td style="background: white;">
+                        <input type="file" id="file">
+                        <div id="file-progress"></div>
+                    </td>
+                     -->
+                </tr>
+            </tbody>
+    </table>
+	
+		
+	</div>
+	<div id="inner-south" class="ui-layout-south">
+		<div class="videoContainer1"></div>
+		<div class="videoContainer2"></div>
+ 		
+	</div>
+</div>
+
+<div class="outer-west">
+   <div class="screenContainer1"></div>
+   <div class="screenContainer2"></div>
+   <div ng-controller="collaborationController">
+   </div>
+</div>
+
+
+
+
+
+</body>
+</html>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
new file mode 100644
index 00000000..098a5857
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
@@ -0,0 +1,393 @@
+<?xml version="1.0"?>
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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 hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.openecomp.portalsdk.core.domain">
+
+     <!-- User class mapping details -->
+    <class name="User" table="FN_USER">
+        <id name="id" column="user_id" > 
+          <generator class="native">
+             <param name="sequence">seq_fn_user</param> 
+          </generator>
+        </id>
+
+        <property name="orgId"         column="org_id"/>
+        <property name="managerId"     column="manager_id"/>
+        <property name="firstName"     column="first_name"/>
+        <property name="middleInitial" column="middle_name"/>
+        <property name="lastName"      column="last_name"/>
+        <property name="phone"         column="phone"/>
+        <property name="fax"           column="fax"/>
+        <property name="cellular"      column="cellular"/>
+        <property name="email"         column="email"/>
+        <property name="addressId"     column="address_id"/>
+        <property name="alertMethodCd" column="alert_method_cd"/>
+
+        <property name="address1"      column="address_line_1"/>
+        <property name="address2"      column="address_line_2"/>
+        <property name="city"          column="city"/>
+        <property name="state"         column="state_cd"/>
+        <property name="zipCode"       column="zip_code"/>
+        <property name="country"       column="country_cd"/>
+
+        <property name="hrid"          column="hrid"/>
+        <property name="orgUserId"     column="org_user_id"/>
+        <property name="orgCode"       column="org_code"/>
+        <property name="loginId"       column="login_id"/>
+        <property name="loginPwd"      column="login_pwd"/>
+        <property name="lastLoginDate" column="last_login_date"  type="timestamp"/>
+
+        <property name="locationClli"  column="location_clli" />
+        <property name="orgManagerUserId" column="org_manager_userid" />
+        <property name="company"       column="company" />
+        <property name="department"    column="department" />
+        <property name="departmentName"    	column="department_name" />
+        <property name="businessUnit"  		column="business_unit" />
+        <property name="businessUnitName"   column="business_unit_name" />
+        <property name="jobTitle"      		column="job_title" />
+        <property name="siloStatus"    		column="silo_status" />
+        <property name="financialLocCode"   column="fin_loc_code" />
+
+        <property name="active"        column="active_yn"       type="yes_no"/>
+        <property name="internal"      column="is_internal_yn"  type="yes_no"/>
+
+        <property name="created"  type="timestamp" column="created_date"  />
+        <property name="modified" type="timestamp" column="modified_date" />
+
+        <property name="createdId"  column="created_id" />
+        <property name="modifiedId" column="modified_id" />
+		<property name="timeZoneId" column="timezone" />
+		
+        <set name="userApps" table="FN_USER_ROLE" lazy="false" sort="natural" inverse="true" cascade="all-delete-orphan">
+            <key column="user_id"/>
+            <one-to-many class="org.openecomp.portalsdk.core.domain.UserApp" />
+        </set>
+
+        <set name="pseudoRoles" table="FN_USER_PSEUDO_ROLE" lazy="false" sort="natural">
+            <key column="user_id"/>
+            <many-to-many column="pseudo_role_id" class="org.openecomp.portalsdk.core.domain.Role" />
+        </set>
+    </class>
+
+     <!-- Profile class mapping details;
+     	  dupe of User class, but fewer fields -->
+    <class name="Profile" table="FN_USER">
+        <id name="id" column="user_id" > 
+			<generator class="increment"/>
+        </id>	
+        <property name="first_name"     column="first_name"/>
+        <property name="last_name"      column="last_name"/>
+        <property name="email"         column="email"/>
+        <property name="orgManagerUserId" column="org_manager_userid" />
+        <property name="active_yn"        column="active_yn"/>
+        <property name="orgUserId"         column="org_user_id"/>
+   	</class>
+	
+ 	<class name="UserApp" table="fn_user_role">
+        <composite-id>
+            <key-property name="userId" type="long">
+                <column name="user_id" precision="11" scale="0" />
+            </key-property>
+        	<key-many-to-one name="app" class="org.openecomp.portalsdk.core.domain.App" column="app_id" />
+        	<key-many-to-one name="role" class="org.openecomp.portalsdk.core.domain.Role" column="role_id" />
+        </composite-id>
+        <property name="priority" type="java.lang.Short">
+            <column name="priority" precision="4" scale="0" />
+        </property>
+    </class>
+
+    <!-- App class mapping details -->
+    <class name="App" table="fn_app">
+        <id name="id" column="app_id"/>
+        <property name="name" column="app_name"/>
+        <property name="appPassword" column="app_password"/>
+        <property name="username" column="app_username"/>
+		<property name="imageUrl" column="app_image_url"/>
+		<property name="description" column="app_description"/>
+		<property name="notes" column="app_notes"/>
+		<property name="url" column="app_url"/>
+		<property name="alternateUrl" column="app_alternate_url"/>
+		<property name="restEndpoint" column="app_rest_endpoint"/>
+		<property name="mlAppName" column="ml_app_name"/>
+		<property name="mlAppAdminId" column="ml_app_admin_id"/>
+		<property name="motsId" column="mots_id"/>
+		<property name="open" column="open"/>
+		<property name="enabled" column="enabled"/>
+		<property name="thumbnail" column="thumbnail" type="blob"/>
+		<property name="uebKey" column="ueb_key"/>
+		<property name="uebSecret" column="ueb_secret"/>
+		<property name="uebTopicName" column="ueb_topic_name"/>
+    </class>
+
+
+	<!-- Audit Log class mapping details -->
+    <class name="AuditLog" table="fn_audit_log">
+        <id name="id" column="log_id">
+          <!-- <generator class="sequence">
+            <param name="sequence">seq_fn_audit_log</param>
+          </generator> -->
+          <generator class="native">
+			<param name="sequence">seq_fn_audit_log</param>
+		  </generator>
+        </id>
+        <property name="activityCode"      column="activity_cd"/>
+        <property name="affectedRecordId"  column="affected_record_id"  />
+        <property name="comments"          column="comments"  />
+        <property name="createdId"         column="user_id" />
+    </class>
+    
+    <!-- User Role class mapping details -->
+    <class name="Role" table="FN_ROLE">
+        <id name="id" column="role_id">
+           <generator class="native">
+             <param name="sequence">seq_fn_role</param> 
+          </generator>
+        </id>
+
+        <property name="name"      column="role_name"/>
+        <property name="priority"  column="priority" />
+        <property name="active"    column="active_yn"  type="yes_no"/>
+
+        <set name="roleFunctions" table="FN_ROLE_FUNCTION" lazy="false" sort="natural">
+            <key column="role_id"/>
+            <many-to-many column="function_cd" class="org.openecomp.portalsdk.core.domain.RoleFunction"/>
+        </set>
+
+        <set name="childRoles" table="FN_ROLE_COMPOSITE" lazy="false" sort="natural">
+            <key column="parent_role_id"/>
+            <many-to-many column="child_role_id" class="org.openecomp.portalsdk.core.domain.Role"/>
+        </set>
+        
+        <set name="parentRoles" table="FN_ROLE_COMPOSITE" lazy="false" sort="natural">
+            <key column="child_role_id"/>
+            <many-to-many column="parent_role_id" class="org.openecomp.portalsdk.core.domain.Role"/>
+        </set>
+
+    </class>
+    
+ 
+
+    <!-- User Role Function class mapping details -->
+    <class name="RoleFunction" table="FN_FUNCTION">
+        <id        name="code"  column="function_cd"   />
+        <property  name="name"  column="function_name" />
+    </class>
+    
+    <!-- Menu class mapping details -->
+    <class name="Menu" table="FN_MENU">
+        <id name="id" column="menu_id">
+          <generator class="native">
+             <param name="sequence">seq_fn_menu</param> 
+          </generator>
+        </id>
+
+         <!-- <property name="menuLevel"   column="level-1"/> -->
+         <property name="label"       column="label"/>
+         <property name="parentId"    column="parent_id"/>
+         <property name="action"      column="action"/>
+         <property name="functionCd"  column="function_cd"/>
+         <property name="sortOrder"   column="sort_order"/>
+         <property name="servlet"     column="servlet"/>
+         <property name="queryString" column="query_string"/>
+         <property name="externalUrl" column="external_url"/>
+         <property name="target"      column="target"/>
+         <property name="menuSetCode" column="menu_set_cd"/>
+         <property name="active"      column="active_yn"    type="yes_no"/>
+         <property name="separator"   column="separator_yn" type="yes_no"/>
+         <property name="imageSrc"    column="image_src" />
+    </class>
+
+    <class name="MenuData" table="FN_MENU">
+        <!--  <id       name="id"          column="menu_id"/> -->
+        <id name="id" column="menu_id">
+          <generator class="native">
+             <param name="sequence">seq_fn_menu</param> 
+          </generator>
+        </id>
+        <property name="label"       column="label"/>
+        <property name="action"      column="action"/>
+        <property name="functionCd"  column="function_cd"/>
+        <property name="sortOrder"   column="sort_order"/>
+        <property name="servlet"     column="servlet"/>
+        <property name="queryString" column="query_string"/>
+        <property name="externalUrl" column="external_url"/>
+        <property name="target"      column="target"/>
+        <property name="active"      column="active_yn"    type="yes_no"/>
+        <property name="separator"   column="separator_yn" type="yes_no"/>
+        <property name="imageSrc"    column="image_src" />
+        <property name="menuSetCode" column="menu_set_cd"  />
+
+        <many-to-one name="parentMenu" column="parent_id" class="MenuData"/>
+
+        <set name="childMenus" lazy="false" sort="natural" inverse="true" where="active_yn = 'Y'">
+            <key column="parent_id"/>
+            <one-to-many class="MenuData"/>
+        </set>
+    </class>
+    
+    <!-- Broadcast Message class mapping details -->
+    <class name="BroadcastMessage" table="fn_broadcast_message">
+        <id name="id" column="message_id">
+            <generator class="native">
+              <param name="sequence">seq_fn_broadcast_message</param>
+            </generator>
+        </id>
+        <property name="messageText" column="message_text"/>
+        <property name="locationId"  column="message_location_id"/>
+
+        <property name="startDate"   column="broadcast_start_date"  type="timestamp"/>
+        <property name="endDate"     column="broadcast_end_date"    type="timestamp"/>
+
+        <property name="sortOrder"   column="sort_order"/>
+        <property name="active"      column="active_yn"             type="yes_no"/>
+
+        <property name="siteCd"      column="broadcast_site_cd"    />
+    </class>
+    
+    <class name="org.openecomp.portalsdk.analytics.model.base.ReportUserRole" table="cr_report_access">
+		<composite-id>
+			<key-property name="repId" column="rep_id" />
+			<key-property name="orderNo" column="order_no" />
+		</composite-id>
+
+        <property name="roleId" column="role_id"/>
+        <property name="userId"  column="user_id"/>
+        <property name="readOnlyYn"  column="read_only_yn"/>
+    </class>    
+    
+    <!-- State Lookup class mapping details -->
+    <class name="LuState" table="FN_LU_STATE">
+        <id       name="abbr"  column="state_cd" />
+        <property name="state"                   />
+    </class>
+    
+    <!-- Country Lookup class mapping details -->
+    <class name="LuCountry" table="FN_LU_COUNTRY">
+        <id       name="abbr"  column="country_cd" />
+        <property name="country"                   />
+        <property name="fullName" column="full_name" />
+        <property name="webphoneCountryLabel" column="fullwebphone_country_label_name" />
+    </class>
+    
+    <class name="LuTimeZone" table="FN_LU_TIMEZONE">
+        <id       name="timezoneId"  column="timezone_id" />
+        <property name="name" column="timezone_name" />
+        <property name="value" column="timezone_value" />
+    </class>
+
+
+    <!-- Lookup (id/value bean) class mapping details -->
+    <class name="Lookup">
+        <composite-id  name="nameValueId" class="org.openecomp.portalsdk.core.domain.support.NameValueId">
+          <key-property name="val"/>
+          <key-property name="lab" />
+        </composite-id>
+    </class>
+
+	<class name="UrlsAccessible" table="V_URL_ACCESS">
+      <composite-id  name="urlsAccessibleKey" class="org.openecomp.portalsdk.core.domain.UrlsAccessibleKey">
+    	<key-property	name="url"	column="url"/>
+    	<key-property   name="functionCd"	column="function_cd"/>
+      </composite-id>
+    </class>
+
+
+	<query name="ParentIdForLabelList">
+      select distinct md.parentMenu.id from MenuData as md where md.label = :paramLabel and md.label is not null
+    </query>
+    
+	<query name="IdForLabelList">
+      select distinct md.id from MenuData as md where md.label = :paramLabel
+    </query>    
+    
+	<query name="parentList">
+      select distinct md.id, md.label, md.parentMenu.id from MenuData as md where md.label is not null
+    </query>
+    	
+	<query name="functionCDlistOld">
+      select distinct functionCd from MenuData 
+    </query>
+
+	<query name="functionCDlist">
+      select distinct code from RoleFunction 
+    </query>   
+     
+	<query name="menuData">
+      from MenuData where menuSetCode = :menu_set_cd and parentMenu is null
+    </query>
+	<query name="restrictedUrls">
+      FROM UrlsAccessible A where upper(A.urlsAccessibleKey.url) = upper(:current_url)
+    </query>
+
+    <query name="getUserNameById">
+      select firstName, lastName from User where id = :user_id
+    </query>
+
+    <query name="getUserEmail">
+      select email from User where id = :user_id
+    </query>
+
+    <query name="getAllUsers">
+      select id, firstName, lastName from User where active = true order by lastName, firstName
+    </query>
+	
+    <query name="getRoleNameById">
+      select name from Role where id = :role_id
+    </query>
+
+    <query name="getAllRoles">
+      select id, name from Role order by name
+    </query>	
+    
+    <query name="getReportSecurityUsers">
+      select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and userId is not null
+    </query>
+        
+    <query name="getReportSecurityRoles">
+      select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and roleId is not null
+    </query>
+
+<!--     <query name="insertReportSecurityUsers">
+		insert into ReportUserRole (repId, roleId, userId, readOnlyYn) values (:report_id, :role_id, :user_id, :read_only_yn)
+    </query> -->
+    
+
+    <query name="deleteReportSecurityUsers">
+      delete from ReportUserRole where repId = :report_id and userId =:user_id
+    </query>
+
+    <query name="deleteReportSecurityRoles">
+      delete from ReportUserRole where repId = :report_id and roleId =:role_id
+    </query>
+    
+     <query name="getUserByProfileId">
+      select orgUserId from User where id = :user_id
+    </query>
+    
+     <query name="getUserIdByorgUserId">
+      select id from User where orgUserId = :orgUserId
+    </query>
+
+</hibernate-mapping>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml b/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
new file mode 100644
index 00000000..3d8852cb
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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 hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.openecomp.portalsdk.workflow.domain">
+
+    
+	 <!-- WorkflowSchedule mapping details -->
+    <class name="WorkflowSchedule" table="fn_schedule_workflows">
+        <id name="id" column="id_schedule_workflows"> 
+          <generator class="native">
+          </generator>
+        </id>
+
+        <property name="serverUrl"         column="workflow_server_url"/>
+        <property name="workflowKey"     column="workflow_key"/>
+        <property name="arguments"     column="workflow_arguments"/>
+        <property name="cronDetails" column="startDateTimeCron"/>
+        <property name="startDateTime" column="start_date_time"/>
+        <property name="endDateTime" column="endDateTime"/>
+        <property name="recurrence" column="recurrence"/>
+        
+	</class>
+	
+	
+	
+</hibernate-mapping>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/jsp/error.jsp b/usecaseui-common/src/main/webapp/WEB-INF/jsp/error.jsp
new file mode 100644
index 00000000..2a48507c
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/jsp/error.jsp
@@ -0,0 +1,20 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+${errMsg}
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/jsp/leafletMap.jsp b/usecaseui-common/src/main/webapp/WEB-INF/jsp/leafletMap.jsp
new file mode 100644
index 00000000..e11070d1
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/jsp/leafletMap.jsp
@@ -0,0 +1,216 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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 html>
+
+<html>
+<head>
+    
+    <meta charset="UTF-8">
+
+    <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+    <script src="app/fusion/external/leaflet-0.7.3/leaflet.js"></script>
+    <link rel="stylesheet" href="app/fusion/external/leaflet-0.7.3/leaflet.css" />
+
+    <style>
+        #map { 
+            height: 450px;
+            width: 800px;
+        }
+        .animateOff {
+            color: red;   
+        }
+        .animateOn {
+            color: green;   
+        }
+    </style>
+<!--     
+    <script src="static/fusion/gis/js/local.js"></script>
+ -->
+    <script>
+
+    var siteData = [
+		
+	];
+    
+    var pipeData = [
+       
+    ];
+    </script>
+   
+    
+</head>
+<body>
+  <div id="map"></div>
+  <button id="forwardButton" onclick="stepForward();">Step Forward</button>
+  <button id="playPause" onclick="playPause();">Play</button>
+  <div>
+    <table att-table table-data="tableData" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">
+      <thead att-table-row type="header">
+        <tr>
+          <th att-table-header sortable="false" key="id">Site</th>
+          <th att-table-header sortable="false" key="lastName">Usage</th>        
+        </tr>
+      </thead>
+      <tbody att-table-row type="body" id="topTenSites">
+      </tbody>	  
+    </table>
+    <table att-table table-data="tableData" view-per-page="viewPerPage" current-page="currentPage" search-category="searchCategory" search-string="searchString" total-page="totalPage">
+      <thead att-table-row type="header">
+        <tr>
+          <th att-table-header sortable="false" key="id">Link</th>
+          <th att-table-header sortable="false" key="lastName">Usage</th>        
+        </tr>
+      </thead>
+      <tbody att-table-row type="body" id="topTenLinks">
+      </tbody>	  
+    </table>
+  </div>
+
+  <script>
+    var map = L.map('map').setView([40, -96], 4);
+    <!-- please add your map location -->
+    L.tileLayer('http://XXX/tiles-light/{z}/{x}/{y}.png', {maxZoom:18}).addTo(map);
+    
+    var dataLayer = addDataLayers(map, null);
+
+    function addDataLayers(map, dataLayer) {
+    	if (dataLayer!=null) {
+    		map.removeLayer(dataLayer);
+    	}
+    	
+    	dataLayer = L.layerGroup();
+
+    	var siteInfo = [];
+
+        var pipeLayer = L.layerGroup();
+        for (var i=0; i<pipeData.length; i++) {
+        	var pipe = pipeData[i];
+        	
+        	var usage = pipe.usage;
+        	if (!usage || Math.random()<0.05) {
+        		//console.log("Rerolling " + pipe.name);
+	        	usage = Math.floor(Math.random()*33 + Math.random()*33 + Math.random()*34);
+        	} else {
+        		//console.log("Adjusting " + pipe.name);
+        		usage = Math.floor(usage + Math.random()*15 - Math.random()*15);
+        	}
+        	if (usage<0) usage = 0;
+        	while (usage>100) usage -= Math.floor(20*Math.random());
+        	if (usage>90) usage -= Math.floor(20*Math.random());
+        	
+        	pipe.usage = usage;
+
+        	var color = "black";
+        	if (usage>60) color = "yellow";
+        	if (usage>70) color = "orange";
+        	if (usage>80) color = "red";
+        	pipeLayer.addLayer(L.polyline([[pipe.lat_a, pipe.lon_a], [pipe.lat_z, pipe.lon_z]], {"color": color, "title": pipe.name}).bindPopup(pipe.name + "<br/>" + pipe.title + "<br/>" + usage + "% usage"));
+
+        	var siteA = siteInfo[pipe.id_a];
+        	if (siteA) {
+        		siteA.usage += usage;
+        		siteA.maxUsage += 100;
+        		//console.log("Site a id = " + pipe.id_a + ", object existed = " + siteA + ", usage = " + siteA.usage + ", max = " + siteA.maxUsage);
+        	} else {
+        		siteA = {};
+        		siteA.usage = usage;
+        		siteA.maxUsage = 100;
+        		siteInfo[pipe.id_a] = siteA;
+        		//console.log("Site a id = " + pipe.id_a + ", object is new = " + siteA + ", usage = " + siteA.usage + ", max = " + siteA.maxUsage);
+        	}
+
+        	var siteZ = siteInfo[pipe.id_z];
+        	if (siteZ) {
+        		siteZ.usage += usage;
+        		siteZ.maxUsage += 100;
+        		//console.log("Site z id = " + pipe.id_z + ", object existed = " + siteZ + ", usage = " + siteZ.usage + ", max = " + siteZ.maxUsage);
+        	} else {
+        		siteZ = {};
+        		siteZ.usage = usage;
+        		siteZ.maxUsage = 100;
+        		siteInfo[pipe.id_z] = siteZ;
+        		//console.log("Site z id = " + pipe.id_z + ", object is new = " + siteZ + ", usage = " + siteZ.usage + ", max = " + siteZ.maxUsage);
+        	}
+        }
+        dataLayer.addLayer(pipeLayer);
+
+        var dataCenterLayer = L.layerGroup();
+        for (var i=0; i<siteData.length; i++) {
+        	var site = siteData[i];
+//    		{"id": "slkut", "name": "Salt Lake City, UT", "title": "250G", "lat": 40.75, "lon": -111.88},
+        	var info = siteInfo[site.id];
+        	var color = "black";
+        	if (info.usage/info.maxUsage>.6) color = "yellow";
+        	if (info.usage/info.maxUsage>.7) color = "orange";
+        	if (info.usage/info.maxUsage>.8) color = "red";
+        	var pct = Math.floor(100*info.usage/info.maxUsage);
+        	site.usage = pct;
+//        	dataCenterLayer.addLayer(L.marker([site.lat, site.lon], {"title": site.name}).bindPopup(site.name + "<br/>" + pipe.title + "<br/>" + info.usage + "/" + info.maxUsage));
+			dataCenterLayer.addLayer(L.circleMarker([site.lat, site.lon], {"color": color, "title": site.name, "fillOpacity": .5}).bindPopup(site.name + "<br/>" + pipe.title + "<br/>" + pct + "%"));
+        }
+        dataLayer.addLayer(dataCenterLayer);
+
+        dataLayer.addTo(map);
+
+        siteData.sort(function(a,b){return b.usage-a.usage});
+        var topTenHtml = "";
+        for (var i=0; i<10; i++) {
+        	topTenHtml = topTenHtml + "<tr><td att-table-body>" + siteData[i].name + "</td><td att-table-body>" + siteData[i].usage + "%</td></tr>";
+        }
+        document.getElementById("topTenSites").innerHTML = topTenHtml;
+
+        pipeData.sort(function(a,b){return b.usage-a.usage});
+        topTenHtml = "";
+        for (var i=0; i<10; i++) {
+        	topTenHtml = topTenHtml + "<tr><td att-table-body>" + pipeData[i].name + "</td><td att-table-body>" + pipeData[i].usage + "%</td></tr>";
+        }
+        document.getElementById("topTenLinks").innerHTML = topTenHtml;
+
+        return dataLayer; 
+    }
+    
+    function stepForward() {
+    	dataLayer = addDataLayers(map, dataLayer);
+    }
+
+    var intervalObj = null;    
+    function playPause() {
+    	if (intervalObj==null) {
+    		document.getElementById('playPause').innerHTML = "Pause";
+    		document.getElementById('forwardButton').disabled = true;
+    		intervalObj = window.setInterval(function(){dataLayer = addDataLayers(map, dataLayer);},1500);
+    	} else {
+    		document.getElementById('playPause').innerHTML = "Play";
+    		document.getElementById('forwardButton').disabled = false;
+    		clearInterval(intervalObj);
+    		intervalObj = null;
+    	}
+    }
+    
+    function onMapClick(e) {
+        //alert("You clicked the map at " + e.latlng);
+        dataLayer = addDataLayers(map, dataLayer);
+    }
+
+    map.on('click', onMapClick);
+  </script>
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/jsp/login_external_ng.jsp b/usecaseui-common/src/main/webapp/WEB-INF/jsp/login_external_ng.jsp
new file mode 100644
index 00000000..cb6def1e
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/jsp/login_external_ng.jsp
@@ -0,0 +1,79 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+<%@ taglib prefix="c"      uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt"    uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties" %>
+<c:set var="title" value="Login" />
+<c:set var="isMobileEnabled"
+	value="<%=(SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE)!= null && SystemProperties.getProperty(SystemProperties.MOBILE_ENABLE).trim().equals(\"true\"))%>" />
+
+<!DOCTYPE html>
+<html ng-app="abs">
+	<head>
+
+	    <title>
+	      Login
+        </title>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1"> 
+	<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+		<style>
+		.terms {
+			font-family: Verdana,Arial,Helvetica, sans-serif;
+			font-size: 9px;
+		}
+		</style>
+	</head>
+	<body style="padding-top: 15px;">
+		<form action="login_external" method="post">
+	        <div style="position: fixed; left:15px; top:15px;z-index:-1;">
+	        </div>
+			<div class="centered style="-webkit-transform: translateZ(0);background:white, z-index:0;">
+				<br/>
+				<div align="center" style="margin-left:auto;margin-right:auto;width:40%;padding:6px;opacity:0.7;background-color:white">
+	          		<img src="static/fusion/images/ecomp_trans.png"/>
+					<h2> ECOMP Portal </h2>
+					<div align="center" id="errorInfo" style="align:center;font-size:14px;margin-left:5px"><span style="color:red">${model.error}</span></div>
+					<br>
+					<label>
+						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<label class="form-field__label">Login ID:</label>
+					</label>
+					<input  type="text" class="fn-ebz-text" name="loginId" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
+						maxlength="30" />
+					<br/>
+					<br/>
+					<label >&nbsp;Password:</label>
+					<input type="password" class="span3" name="password" style="width: 140px;height:25px;border-radius:7px;font-size:18px;padding-left:5px;"
+						maxlength="30" onkeydown="if (event.keyCode == 13) document.getElementById('loginBtn').click()"/> 
+					<br />
+					<br />
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					<input id="loginBtn" type="submit" type="image" src="static/fusion/images/login_button.gif" alt="Login" />
+					<br>
+				</div>
+			</div>
+			<br/><br/><br/><br/><br/><br/><br/>
+			<div id="footer">
+			</div>
+	    </form>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/jsp/net_map.jsp b/usecaseui-common/src/main/webapp/WEB-INF/jsp/net_map.jsp
new file mode 100644
index 00000000..2a341467
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/jsp/net_map.jsp
@@ -0,0 +1,38 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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 html> 
+<html> 
+<head> 
+  	<link rel="import" href="app/fusion/elementmap/element-map-import.html">
+</head>
+
+<body>
+
+
+<div data-ng-app="elementMapModule">
+	<element-map contentfilename='NetworkMap_topology_composition' layoutfilename='network_map_layout' callflowfilename='call_flow_sip_digest' callflowstep='Step_1'></element-map>
+</div>
+
+<input type="hidden" name="inner_width" value="1500px">
+<input type="hidden" name="inner_height" value="800px">
+
+</body>
+
+</html>
diff --git a/usecaseui-common/src/main/webapp/WEB-INF/web.xml b/usecaseui-common/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..3f84f06a
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee" 
+         xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
+
+	<!-- This is a stub web.xml in the common area -->
+	<display-name>ecomp-sdk-app-common</display-name>
+
+</web-app>
diff --git a/usecaseui-common/src/main/webapp/index.jsp b/usecaseui-common/src/main/webapp/index.jsp
new file mode 100644
index 00000000..f6030c97
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/index.jsp
@@ -0,0 +1,24 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<%-- Redirected because we can't set the welcome page to a virtual URL. --%>
+<%-- Forward to the intended start page to reduce frustration for new users. --%> 
+<c:redirect url="/login.htm"></c:redirect>
diff --git a/usecaseui-common/src/main/webapp/manifest.jsp b/usecaseui-common/src/main/webapp/manifest.jsp
new file mode 100644
index 00000000..b7345adb
--- /dev/null
+++ b/usecaseui-common/src/main/webapp/manifest.jsp
@@ -0,0 +1,47 @@
+<%--
+  ================================================================================
+  eCOMP Portal SDK
+  ================================================================================
+  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.
+  ================================================================================
+  --%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%
+	// Read contents of maven-generated manifest file.
+	final String path = "/META-INF/MANIFEST.MF";
+	java.io.InputStream input = getServletContext().getResourceAsStream(path);
+	java.io.InputStreamReader reader = new java.io.InputStreamReader(input, "UTF-8");
+	char [] buf = new char[1024];
+	int length = reader.read(buf, 0, buf.length);
+	final String manifest = new String(buf, 0, length);
+	reader.close();
+	input.close();
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Manifest</title>
+</head>
+<body>
+<h2>
+Contents of file <%= path %>:
+</h2>
+<pre>
+<%= manifest %>
+</pre>
+</body>
+</html>
author	shentao <shentao@chinamobile.com>	2017-08-31 23:40:50 +0800
committer	shentao <shentao@chinamobile.com>	2017-08-31 23:40:58 +0800
commit	4ff32341a0af1972b44a7410e76e9b231131e7ab (patch)
tree	e12d231d9204183e288cd2c39100b796d0c3365c /usecaseui-common/src/main
parent	47b0a0f5957fab266d8c02d0fb09ac6bba343cbd (diff)