DDL updates and cleanup

- remove unused javascript libraries - remove contentious icons and images - Remove constraints to support Role Centralization Issue: PORTAL-21, Portal-17 Change-Id: I347accb04343d1c866c075ee716c46fea9e0d036 Signed-off-by: st782s <statta@research.att.com>
author: st782s <statta@research.att.com> 2017-08-14 11:41:04 -0400
committer: st782s <statta@research.att.com> 2017-08-15 14:07:15 -0400
commit: a2f5a35c06a526b05e4efd9fe275d6639bf22cd3 (patch)
tree: 75e423e367598929f54345359b3851e48ae9cd68
parent: 3159458ff8563771a5460839fd75bdc25159ea87 (diff)
115 files changed, 4369 insertions, 18692 deletions
diff --git a/.gitignore b/.gitignore
index 485dee64..9faef0c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+.project
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_1710_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_1710_Common.sql
new file mode 100644
index 00000000..b13d660e
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_1710_Common.sql
@@ -0,0 +1,1389 @@
+-- ---------------------------------------------------------------------------------------------------------------
+-- This script creates tables in the 1707 COMMON version of the ECOMP SDK application database.
+-- Additional DDL scripts may be required!
+--
+-- Note to database admin: set the MySQL system variable called lower_case_table_names to 1
+-- It can be set 3 different ways: 
+--   command-line options (Cmd-line), 
+--   options valid in configuration files (Option file), or 
+--   server system variables (System Var). 
+--
+-- When set to 1 table names are stored in lowercase on disk and comparisons are not case sensitive. 
+--
+-- MySql/MariaDB Version compatibility information
+--
+-- bash-4.2$ mysql --version  – cluster version
+-- mysql  Ver 15.1 Distrib 10.1.17-MariaDB, for Linux (x86_64) using readline 5.1
+--
+-- All versions newer or older than these DO NOT necessarily mean they are compatible.
+-- ---------------------------------------------------------------------------------------------------------------
+
+SET FOREIGN_KEY_CHECKS=1; 
+
+CREATE DATABASE IF NOT EXISTS ecomp_sdk;
+
+USE ecomp_sdk;
+
+-- ---------- create table SECTION
+--
+-- NAME: CR_FAVORITE_REPORTS; TYPE: TABLE 
+--
+create table cr_favorite_reports (
+    USER_ID INTEGER NOT NULL,
+    REP_ID INTEGER NOT NULL
+);
+
+--
+-- NAME: CR_FILEHIST_LOG; TYPE: TABLE 
+--
+create table cr_filehist_log (
+    SCHEDULE_ID NUMERIC(11,0) NOT NULL,
+    URL CHARACTER VARYING(4000),
+    NOTES CHARACTER VARYING(3500),
+    RUN_TIME TIMESTAMP
+);
+
+--
+-- NAME: CR_FOLDER; TYPE: TABLE 
+--
+create table cr_folder (
+    FOLDER_ID INTEGER NOT NULL,
+    FOLDER_NAME CHARACTER VARYING(50) NOT NULL,
+    DESCR CHARACTER VARYING(500),
+    CREATE_ID INTEGER NOT NULL,
+    CREATE_DATE TIMESTAMP NOT NULL,
+    PARENT_FOLDER_ID INTEGER,
+    PUBLIC_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL
+);
+
+--
+-- NAME: CR_FOLDER_ACCESS; TYPE: TABLE 
+--
+create table cr_folder_access (
+    FOLDER_ACCESS_ID NUMERIC(11,0) NOT NULL,
+    FOLDER_ID NUMERIC(11,0) NOT NULL,
+    ORDER_NO NUMERIC(11,0) NOT NULL,
+    ROLE_ID NUMERIC(11,0),
+    USER_ID NUMERIC(11,0),
+    READ_ONLY_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL
+);
+
+--
+-- NAME: CR_HIST_USER_MAP; TYPE: TABLE 
+--
+create table cr_hist_user_map (
+    HIST_ID INT(11) NOT NULL,
+    USER_ID INT(11) NOT NULL
+);
+
+--
+-- NAME: CR_LU_FILE_TYPE; TYPE: TABLE 
+--
+create table cr_lu_file_type (
+    LOOKUP_ID NUMERIC(2,0) NOT NULL,
+    LOOKUP_DESCR CHARACTER VARYING(255) NOT NULL,
+    ACTIVE_YN CHARACTER(1) DEFAULT 'Y',
+    ERROR_CODE NUMERIC(11,0)
+);
+
+--
+-- NAME: CR_RAPTOR_ACTION_IMG; TYPE: TABLE 
+--
+create table cr_raptor_action_img (
+    IMAGE_ID CHARACTER VARYING(100) NOT NULL,
+    IMAGE_LOC CHARACTER VARYING(400)
+);
+
+--
+-- NAME: CR_RAPTOR_PDF_IMG; TYPE: TABLE 
+--
+create table cr_raptor_pdf_img (
+    IMAGE_ID CHARACTER VARYING(100) NOT NULL,
+    IMAGE_LOC CHARACTER VARYING(400)
+);
+
+--
+-- NAME: CR_REMOTE_SCHEMA_INFO; TYPE: TABLE 
+--
+create table cr_remote_schema_info (
+    SCHEMA_PREFIX CHARACTER VARYING(5) NOT NULL,
+    SCHEMA_DESC CHARACTER VARYING(75) NOT NULL,
+    DATASOURCE_TYPE CHARACTER VARYING(100)
+);
+
+--
+-- NAME: CR_REPORT; TYPE: TABLE 
+--
+create table cr_report (
+    REP_ID NUMERIC(11,0) NOT NULL,
+    TITLE CHARACTER VARYING(100) NOT NULL,
+    DESCR CHARACTER VARYING(255),
+    PUBLIC_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL,
+    REPORT_XML TEXT,
+    CREATE_ID NUMERIC(11,0),
+    CREATE_DATE TIMESTAMP default now(),
+    MAINT_ID NUMERIC(11,0),
+    MAINT_DATE TIMESTAMP DEFAULT NOW(), 
+    MENU_ID CHARACTER VARYING(500),
+    MENU_APPROVED_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL,
+    OWNER_ID NUMERIC(11,0),
+    FOLDER_ID INTEGER DEFAULT 0,
+    DASHBOARD_TYPE_YN CHARACTER VARYING(1) DEFAULT 'N',
+    DASHBOARD_YN CHARACTER VARYING(1) DEFAULT 'N'
+);
+
+--
+-- NAME: CR_REPORT_ACCESS; TYPE: TABLE 
+--
+create table cr_report_access (
+    REP_ID NUMERIC(11,0) NOT NULL,
+    ORDER_NO NUMERIC(11,0) NOT NULL,
+    ROLE_ID NUMERIC(11,0),
+    USER_ID NUMERIC(11,0),
+    READ_ONLY_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL
+);
+
+--
+-- NAME: CR_REPORT_DWNLD_LOG; TYPE: TABLE 
+--
+create table cr_report_dwnld_log (
+    USER_ID NUMERIC(11,0) NOT NULL,
+    REP_ID INTEGER NOT NULL,
+    FILE_NAME CHARACTER VARYING(100) NOT NULL,
+    DWNLD_START_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
+    RECORD_READY_TIME TIMESTAMP DEFAULT NOW(),
+    FILTER_PARAMS CHARACTER VARYING(2000)
+);
+
+--
+-- NAME: CR_REPORT_EMAIL_SENT_LOG; TYPE: TABLE 
+--
+create table cr_report_email_sent_log (
+    LOG_ID INTEGER NOT NULL,
+    SCHEDULE_ID NUMERIC(11,0),
+    GEN_KEY CHARACTER VARYING(25) NOT NULL,
+    REP_ID NUMERIC(11,0) NOT NULL,
+    USER_ID NUMERIC(11,0),
+    SENT_DATE TIMESTAMP DEFAULT NOW(),
+    ACCESS_FLAG CHARACTER VARYING(1) DEFAULT 'Y' NOT NULL,
+    TOUCH_DATE TIMESTAMP DEFAULT NOW()
+);
+
+--
+-- NAME: CR_REPORT_FILE_HISTORY; TYPE: TABLE 
+--
+create table cr_report_file_history (
+    HIST_ID INT(11) NOT NULL,
+    SCHED_USER_ID NUMERIC(11,0) NOT NULL,
+    SCHEDULE_ID NUMERIC(11,0) NOT NULL,
+    USER_ID NUMERIC(11,0) NOT NULL,
+    REP_ID NUMERIC(11,0),
+    RUN_DATE TIMESTAMP,
+    RECURRENCE CHARACTER VARYING(50),
+    FILE_TYPE_ID NUMERIC(2,0),
+    FILE_NAME CHARACTER VARYING(80),
+    FILE_BLOB BLOB,
+    FILE_SIZE NUMERIC(11,0),
+    RAPTOR_URL CHARACTER VARYING(4000),
+    ERROR_YN CHARACTER(1) DEFAULT 'N',
+    ERROR_CODE NUMERIC(11,0),
+    DELETED_YN CHARACTER(1) DEFAULT 'N',
+    DELETED_BY NUMERIC(38,0)
+);
+
+--
+-- NAME: CR_REPORT_LOG; TYPE: TABLE 
+--
+create table cr_report_log (
+    REP_ID NUMERIC(11,0) NOT NULL,
+    LOG_TIME TIMESTAMP NOT NULL,
+    USER_ID NUMERIC(11,0) NOT NULL,
+    ACTION CHARACTER VARYING(2000) NOT NULL,
+    ACTION_VALUE CHARACTER VARYING(50),
+    FORM_FIELDS CHARACTER VARYING(4000)
+);
+
+--
+-- NAME: CR_REPORT_SCHEDULE; TYPE: TABLE 
+--
+create table cr_report_schedule (
+    SCHEDULE_ID NUMERIC(11,0) NOT NULL,
+    SCHED_USER_ID NUMERIC(11,0) NOT NULL,
+    REP_ID NUMERIC(11,0) NOT NULL,
+    ENABLED_YN CHARACTER VARYING(1) NOT NULL,
+    START_DATE TIMESTAMP DEFAULT NOW(),
+    END_DATE TIMESTAMP DEFAULT NOW(),
+    RUN_DATE TIMESTAMP DEFAULT NOW(),
+    RECURRENCE CHARACTER VARYING(50),
+    CONDITIONAL_YN CHARACTER VARYING(1) NOT NULL,
+    CONDITION_SQL CHARACTER VARYING(4000),
+    NOTIFY_TYPE INTEGER DEFAULT 0,
+    MAX_ROW INTEGER DEFAULT 1000,
+    INITIAL_FORMFIELDS CHARACTER VARYING(3500),
+    PROCESSED_FORMFIELDS CHARACTER VARYING(3500),
+    FORMFIELDS CHARACTER VARYING(3500),
+    CONDITION_LARGE_SQL TEXT,
+    ENCRYPT_YN CHARACTER(1) DEFAULT 'N',
+    ATTACHMENT_YN CHARACTER(1) DEFAULT 'Y'
+);
+
+--
+-- NAME: CR_REPORT_SCHEDULE_USERS; TYPE: TABLE 
+--
+create table cr_report_schedule_users (
+    SCHEDULE_ID NUMERIC(11,0) NOT NULL,
+    REP_ID NUMERIC(11,0) NOT NULL,
+    USER_ID NUMERIC(11,0) NOT NULL,
+    ROLE_ID NUMERIC(11,0),
+    ORDER_NO NUMERIC(11,0) NOT NULL
+);
+
+--
+-- NAME: CR_REPORT_TEMPLATE_MAP; TYPE: TABLE 
+--
+create table cr_report_template_map (
+    REPORT_ID INTEGER NOT NULL,
+    TEMPLATE_FILE CHARACTER VARYING(200)
+);
+
+--
+-- NAME: CR_SCHEDULE_ACTIVITY_LOG; TYPE: TABLE 
+--
+create table cr_schedule_activity_log (
+    SCHEDULE_ID NUMERIC(11,0) NOT NULL,
+    URL CHARACTER VARYING(4000),
+    NOTES CHARACTER VARYING(2000),
+    RUN_TIME TIMESTAMP
+);
+
+--
+-- NAME: CR_TABLE_JOIN; TYPE: TABLE 
+--
+create table cr_table_join (
+    SRC_TABLE_NAME CHARACTER VARYING(30) NOT NULL,
+    DEST_TABLE_NAME CHARACTER VARYING(30) NOT NULL,
+    JOIN_EXPR CHARACTER VARYING(500) NOT NULL
+);
+
+--
+-- NAME: CR_TABLE_ROLE; TYPE: TABLE 
+--
+create table cr_table_role (
+    TABLE_NAME CHARACTER VARYING(30) NOT NULL,
+    ROLE_ID NUMERIC(11,0) NOT NULL
+);
+
+--
+-- NAME: CR_TABLE_SOURCE; TYPE: TABLE 
+--
+create table cr_table_source (
+    TABLE_NAME CHARACTER VARYING(30) NOT NULL,
+    DISPLAY_NAME CHARACTER VARYING(30) NOT NULL,
+    PK_FIELDS CHARACTER VARYING(200),
+    WEB_VIEW_ACTION CHARACTER VARYING(50),
+    LARGE_DATA_SOURCE_YN CHARACTER VARYING(1) DEFAULT 'N' NOT NULL,
+    FILTER_SQL CHARACTER VARYING(4000),
+    SOURCE_DB CHARACTER VARYING(50)
+);
+
+--
+-- NAME: FN_LU_TIMEZONE; TYPE: TABLE 
+--
+create table fn_lu_timezone (
+    TIMEZONE_ID INT(11) NOT NULL,
+    TIMEZONE_NAME CHARACTER VARYING(100) NOT NULL,
+    TIMEZONE_VALUE CHARACTER VARYING(100) NOT NULL
+);
+
+create table fn_user (
+    USER_ID INT(11) NOT NULL PRIMARY KEY  AUTO_INCREMENT,
+    ORG_ID INT(11),
+    MANAGER_ID INT(11),
+    FIRST_NAME CHARACTER VARYING(50),
+    MIDDLE_NAME CHARACTER VARYING(50),
+    LAST_NAME CHARACTER VARYING(50),
+    PHONE CHARACTER VARYING(25),
+    FAX CHARACTER VARYING(25),
+    CELLULAR CHARACTER VARYING(25),
+    EMAIL CHARACTER VARYING(50),
+    ADDRESS_ID NUMERIC(11,0),
+    ALERT_METHOD_CD CHARACTER VARYING(10),
+    HRID CHARACTER VARYING(20),
+    ORG_USER_ID CHARACTER VARYING(20),
+    ORG_CODE CHARACTER VARYING(30),
+    LOGIN_ID CHARACTER VARYING(25),
+    LOGIN_PWD CHARACTER VARYING(25),
+    LAST_LOGIN_DATE TIMESTAMP,
+    ACTIVE_YN CHARACTER VARYING(1) DEFAULT 'Y' NOT NULL,
+    CREATED_ID INT(11),
+    CREATED_DATE TIMESTAMP DEFAULT NOW(),
+    MODIFIED_ID INT(11),
+    MODIFIED_DATE TIMESTAMP default now(),
+    IS_INTERNAL_YN CHARACTER(1) DEFAULT 'N' NOT NULL,
+    ADDRESS_LINE_1 CHARACTER VARYING(100),
+    ADDRESS_LINE_2 CHARACTER VARYING(100),
+    CITY CHARACTER VARYING(50),
+    STATE_CD CHARACTER VARYING(3),
+    ZIP_CODE CHARACTER VARYING(11),
+    COUNTRY_CD CHARACTER VARYING(3),
+    LOCATION_CLLI CHARACTER VARYING(8),
+    ORG_MANAGER_USERID CHARACTER VARYING(20),
+    COMPANY CHARACTER VARYING(100),
+    DEPARTMENT_NAME CHARACTER VARYING(100),
+    JOB_TITLE CHARACTER VARYING(100),
+    TIMEZONE INT(11),
+    DEPARTMENT CHARACTER VARYING(25),
+    BUSINESS_UNIT CHARACTER VARYING(25),
+    BUSINESS_UNIT_NAME CHARACTER VARYING(100),
+    COST_CENTER CHARACTER VARYING(25),
+    FIN_LOC_CODE CHARACTER VARYING(10),
+    SILO_STATUS CHARACTER VARYING(10)
+);
+
+--
+-- NAME: FN_ROLE; TYPE: TABLE 
+--
+create table fn_role (
+    ROLE_ID INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    ROLE_NAME CHARACTER VARYING(300) NOT NULL,
+    ACTIVE_YN CHARACTER VARYING(1) DEFAULT 'Y' NOT NULL,
+    PRIORITY NUMERIC(4,0)
+);
+
+--
+-- NAME: FN_AUDIT_ACTION; TYPE: TABLE 
+--
+create table fn_audit_action (
+    AUDIT_ACTION_ID INTEGER NOT NULL,
+    CLASS_NAME CHARACTER VARYING(500) NOT NULL,
+    METHOD_NAME CHARACTER VARYING(50) NOT NULL,
+    AUDIT_ACTION_CD CHARACTER VARYING(20) NOT NULL,
+    AUDIT_ACTION_DESC CHARACTER VARYING(200),
+    ACTIVE_YN CHARACTER VARYING(1)
+);
+
+--
+-- NAME: FN_AUDIT_ACTION_LOG; TYPE: TABLE 
+--
+create table fn_audit_action_log (
+    AUDIT_LOG_ID INTEGER NOT NULL PRIMARY KEY  AUTO_INCREMENT,
+    AUDIT_ACTION_CD CHARACTER VARYING(200),
+    ACTION_TIME TIMESTAMP,
+    USER_ID NUMERIC(11,0),
+    CLASS_NAME CHARACTER VARYING(100),
+    METHOD_NAME CHARACTER VARYING(50),
+    SUCCESS_MSG CHARACTER VARYING(20),
+    ERROR_MSG CHARACTER VARYING(500)
+);
+
+--
+-- NAME: FN_LU_ACTIVITY; TYPE: TABLE 
+--
+create table fn_lu_activity (
+    ACTIVITY_CD CHARACTER VARYING(50) NOT NULL PRIMARY KEY,
+    ACTIVITY CHARACTER VARYING(50) NOT NULL
+);
+
+--
+-- NAME: FN_AUDIT_LOG; TYPE: TABLE 
+--
+create table fn_audit_log (
+    LOG_ID INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    USER_ID INT(11) NOT NULL,
+    ACTIVITY_CD CHARACTER VARYING(50) NOT NULL,
+    AUDIT_DATE TIMESTAMP DEFAULT NOW() NOT NULL,
+    COMMENTS CHARACTER VARYING(1000),
+    AFFECTED_RECORD_ID_BK CHARACTER VARYING(500),
+    AFFECTED_RECORD_ID CHARACTER VARYING(4000),
+    CONSTRAINT FK_FN_AUDIT_REF_209_FN_USER FOREIGN KEY (USER_ID) REFERENCES FN_USER(USER_ID)
+);
+
+--
+-- NAME: FN_BROADCAST_MESSAGE; TYPE: TABLE 
+--
+create table fn_broadcast_message (
+    MESSAGE_ID INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    MESSAGE_TEXT CHARACTER VARYING(1000) NOT NULL,
+    MESSAGE_LOCATION_ID NUMERIC(11,0) NOT NULL,
+    BROADCAST_START_DATE TIMESTAMP NOT NULL  DEFAULT NOW(),
+    BROADCAST_END_DATE TIMESTAMP NOT NULL DEFAULT NOW(),
+    ACTIVE_YN CHARACTER(1) DEFAULT 'Y' NOT NULL,
+    SORT_ORDER NUMERIC(4,0) NOT NULL,
+    BROADCAST_SITE_CD CHARACTER VARYING(50)
+);
+
+--
+-- NAME: FN_CHAT_LOGS; TYPE: TABLE 
+--
+create table fn_chat_logs (
+    CHAT_LOG_ID INTEGER NOT NULL,
+    CHAT_ROOM_ID INTEGER,
+    USER_ID INTEGER,
+    MESSAGE CHARACTER VARYING(1000),
+    MESSAGE_DATE_TIME TIMESTAMP
+);
+
+--
+-- NAME: FN_CHAT_ROOM; TYPE: TABLE 
+--
+create table fn_chat_room (
+    CHAT_ROOM_ID INTEGER NOT NULL,
+    NAME CHARACTER VARYING(50) NOT NULL,
+    DESCRIPTION CHARACTER VARYING(500),
+    OWNER_ID INTEGER,
+    CREATED_DATE TIMESTAMP DEFAULT NOW(),
+    UPDATED_DATE TIMESTAMP DEFAULT NOW()
+);
+
+--
+-- NAME: FN_CHAT_USERS; TYPE: TABLE 
+--
+create table fn_chat_users (
+    CHAT_ROOM_ID INTEGER,
+    USER_ID INTEGER,
+    LAST_ACTIVITY_DATE_TIME TIMESTAMP,
+    CHAT_STATUS CHARACTER VARYING(20),
+    ID INTEGER NOT NULL
+);
+
+--
+-- NAME: FN_DATASOURCE; TYPE: TABLE 
+--
+create table fn_datasource (
+    ID INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    NAME CHARACTER VARYING(50),
+    DRIVER_NAME CHARACTER VARYING(256),
+    SERVER CHARACTER VARYING(256),
+    PORT INTEGER,
+    USER_NAME CHARACTER VARYING(256),
+    PASSWORD CHARACTER VARYING(256),
+    URL CHARACTER VARYING(256),
+    MIN_POOL_SIZE INTEGER,
+    MAX_POOL_SIZE INTEGER,
+    ADAPTER_ID INTEGER,
+    DS_TYPE CHARACTER VARYING(20)
+);
+
+--
+-- NAME: FN_FUNCTION; TYPE: TABLE 
+--
+create table fn_function (
+    FUNCTION_CD CHARACTER VARYING(30) NOT NULL PRIMARY KEY,
+    FUNCTION_NAME CHARACTER VARYING(50) NOT NULL
+);
+
+--
+-- NAME: FN_LU_ALERT_METHOD; TYPE: TABLE 
+--
+create table fn_lu_alert_method (
+    ALERT_METHOD_CD CHARACTER VARYING(10) NOT NULL,
+    ALERT_METHOD CHARACTER VARYING(50) NOT NULL
+);
+
+--
+-- NAME: FN_LU_BROADCAST_SITE; TYPE: TABLE 
+--
+create table fn_lu_broadcast_site (
+    BROADCAST_SITE_CD CHARACTER VARYING(50) NOT NULL,
+    BROADCAST_SITE_DESCR CHARACTER VARYING(100)
+);
+--
+-- NAME: FN_LU_MENU_SET; TYPE: TABLE 
+--
+create table fn_lu_menu_set (
+    MENU_SET_CD CHARACTER VARYING(10) NOT NULL PRIMARY KEY,
+    MENU_SET_NAME CHARACTER VARYING(50) NOT NULL
+);
+
+--
+-- NAME: FN_LU_PRIORITY; TYPE: TABLE 
+--
+create table fn_lu_priority (
+    PRIORITY_ID NUMERIC(11,0) NOT NULL,
+    PRIORITY CHARACTER VARYING(50) NOT NULL,
+    ACTIVE_YN CHARACTER(1) NOT NULL,
+    SORT_ORDER NUMERIC(5,0)
+);
+
+--
+-- NAME: FN_LU_ROLE_TYPE; TYPE: TABLE 
+--
+create table fn_lu_role_type (
+    ROLE_TYPE_ID NUMERIC(11,0) NOT NULL,
+    ROLE_TYPE CHARACTER VARYING(50) NOT NULL
+);
+--
+-- NAME: FN_LU_TAB_SET; TYPE: TABLE 
+--
+create table fn_lu_tab_set (
+    TAB_SET_CD CHARACTER VARYING(30) NOT NULL,
+    TAB_SET_NAME CHARACTER VARYING(50) NOT NULL
+);
+
+--
+-- NAME: FN_MENU; TYPE: TABLE 
+--
+create table fn_menu (
+    MENU_ID INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    LABEL CHARACTER VARYING(100),
+    PARENT_ID INT(11),
+    SORT_ORDER NUMERIC(4,0),
+    ACTION CHARACTER VARYING(200),
+    FUNCTION_CD CHARACTER VARYING(30),
+    ACTIVE_YN CHARACTER VARYING(1) DEFAULT 'Y' NOT NULL,
+    SERVLET CHARACTER VARYING(50),
+    QUERY_STRING CHARACTER VARYING(200),
+    EXTERNAL_URL CHARACTER VARYING(200),
+    TARGET CHARACTER VARYING(25),
+    MENU_SET_CD CHARACTER VARYING(10) DEFAULT 'APP',
+    SEPARATOR_YN CHARACTER(1) DEFAULT 'N',
+    IMAGE_SRC CHARACTER VARYING(100),
+    CONSTRAINT FK_FN_MENU_REF_196_FN_MENU FOREIGN KEY (PARENT_ID) REFERENCES FN_MENU(MENU_ID),
+    CONSTRAINT FK_FN_MENU_MENU_SET_CD FOREIGN KEY (MENU_SET_CD) REFERENCES FN_LU_MENU_SET(MENU_SET_CD)
+);
+
+--
+-- NAME: FN_ORG; TYPE: TABLE 
+--
+create table fn_org (
+    ORG_ID INT(11) NOT NULL,
+    ORG_NAME CHARACTER VARYING(50) NOT NULL,
+    ACCESS_CD CHARACTER VARYING(10)
+);
+
+--
+-- NAME: FN_RESTRICTED_URL; TYPE: TABLE 
+--
+create table fn_restricted_url (
+    RESTRICTED_URL CHARACTER VARYING(250) NOT NULL,
+    FUNCTION_CD CHARACTER VARYING(30) NOT NULL
+);
+
+--
+-- NAME: FN_ROLE_COMPOSITE; TYPE: TABLE 
+--
+create table fn_role_composite (
+    PARENT_ROLE_ID INT(11) NOT NULL,
+    CHILD_ROLE_ID INT(11) NOT NULL,
+    CONSTRAINT FK_FN_ROLE_COMPOSITE_CHILD FOREIGN KEY (CHILD_ROLE_ID) REFERENCES FN_ROLE(ROLE_ID),
+    CONSTRAINT FK_FN_ROLE_COMPOSITE_PARENT FOREIGN KEY (PARENT_ROLE_ID) REFERENCES FN_ROLE(ROLE_ID)
+);
+
+--
+-- NAME: FN_ROLE_FUNCTION; TYPE: TABLE 
+--
+create table fn_role_function (
+    ROLE_ID INT(11) NOT NULL,
+    FUNCTION_CD CHARACTER VARYING(30) NOT NULL,
+    CONSTRAINT FK_FN_ROLE__REF_198_FN_ROLE FOREIGN KEY (ROLE_ID) REFERENCES FN_ROLE(ROLE_ID)
+);
+
+--
+-- NAME: FN_TAB; TYPE: TABLE 
+--
+create table fn_tab (
+    TAB_CD CHARACTER VARYING(30) NOT NULL,
+    TAB_NAME CHARACTER VARYING(50) NOT NULL,
+    TAB_DESCR CHARACTER VARYING(100),
+    ACTION CHARACTER VARYING(100) NOT NULL,
+    FUNCTION_CD CHARACTER VARYING(30) NOT NULL,
+    ACTIVE_YN CHARACTER(1) NOT NULL,
+    SORT_ORDER NUMERIC(11,0) NOT NULL,
+    PARENT_TAB_CD CHARACTER VARYING(30),
+    TAB_SET_CD CHARACTER VARYING(30)
+);
+
+--
+-- NAME: FN_TAB_SELECTED; TYPE: TABLE 
+--
+create table fn_tab_selected (
+    SELECTED_TAB_CD CHARACTER VARYING(30) NOT NULL,
+    TAB_URI CHARACTER VARYING(40) NOT NULL
+);
+
+--
+-- NAME: FN_USER_PSEUDO_ROLE; TYPE: TABLE 
+--
+create table fn_user_pseudo_role (
+    PSEUDO_ROLE_ID INT(11) NOT NULL,
+    USER_ID INT(11) NOT NULL
+);
+
+--
+-- NAME: FN_USER_ROLE; TYPE: TABLE 
+--
+create table fn_user_role (
+    USER_ID INT(10) NOT NULL,
+    ROLE_ID INT(10) NOT NULL,
+    PRIORITY NUMERIC(4,0),
+    APP_ID INT(11) DEFAULT 1,
+    CONSTRAINT FK_FN_USER__REF_172_FN_USER FOREIGN KEY (USER_ID) REFERENCES FN_USER(USER_ID),
+    CONSTRAINT FK_FN_USER__REF_175_FN_ROLE FOREIGN KEY (ROLE_ID) REFERENCES FN_ROLE(ROLE_ID)
+);
+--
+-- NAME: SCHEMA_INFO; TYPE: TABLE 
+--
+create table schema_info (
+    SCHEMA_ID CHARACTER VARYING(25) NOT NULL,
+    SCHEMA_DESC CHARACTER VARYING(75) NOT NULL,
+    DATASOURCE_TYPE CHARACTER VARYING(100),
+    CONNECTION_URL VARCHAR(200) NOT NULL,
+    USER_NAME VARCHAR(45) NOT NULL,
+    PASSWORD VARCHAR(45) NULL DEFAULT NULL,
+    DRIVER_CLASS VARCHAR(100) NOT NULL,
+    MIN_POOL_SIZE INT NOT NULL,
+    MAX_POOL_SIZE INT NOT NULL,
+    IDLE_CONNECTION_TEST_PERIOD INT NOT NULL
+
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_APP; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_app (
+  APP_ID int(11) PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  APP_NAME varchar(100) NOT NULL DEFAULT '?',
+  APP_IMAGE_URL varchar(256) DEFAULT NULL,
+  APP_DESCRIPTION varchar(512) DEFAULT NULL,
+  APP_NOTES varchar(4096) DEFAULT NULL,
+  APP_URL varchar(256) DEFAULT NULL,
+  APP_ALTERNATE_URL varchar(256) DEFAULT NULL,
+  APP_REST_ENDPOINT varchar(2000) DEFAULT NULL,
+  ML_APP_NAME varchar(50) NOT NULL DEFAULT '?',
+  ML_APP_ADMIN_ID varchar(7) NOT NULL DEFAULT '?',
+  MOTS_ID int(11) DEFAULT NULL,
+  APP_PASSWORD varchar(256) NOT NULL DEFAULT '?',
+  OPEN char(1) DEFAULT 'N',
+  ENABLED char(1) DEFAULT 'Y',
+  THUMBNAIL mediumblob,
+  APP_USERNAME varchar(50),
+  UEB_KEY VARCHAR(256) DEFAULT NULL,
+  UEB_SECRET VARCHAR(256) DEFAULT NULL,
+  UEB_TOPIC_NAME VARCHAR(256) DEFAULT NULL
+  
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_FN_WORKFLOW; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_workflow (
+  id mediumint(9) NOT NULL AUTO_INCREMENT,
+  name varchar(20) NOT NULL,
+  description varchar(500) DEFAULT NULL,
+  run_link varchar(300) DEFAULT NULL,
+  suspend_link varchar(300) DEFAULT NULL,
+  modified_link varchar(300) DEFAULT NULL,
+  active_yn varchar(300) DEFAULT NULL,
+  created varchar(300) DEFAULT NULL,
+  created_by int(11) DEFAULT NULL,
+  modified varchar(300) DEFAULT NULL,
+  modified_by int(11) DEFAULT NULL,
+  workflow_key varchar(50) DEFAULT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY name (name)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_SCHEDULE_WORKFLOWS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_schedule_workflows (
+  id_schedule_workflows bigint(25) PRIMARY KEY NOT NULL AUTO_INCREMENT, 
+  workflow_server_url varchar(45) DEFAULT NULL,
+  workflow_key varchar(45) NOT NULL,
+  workflow_arguments varchar(45) DEFAULT NULL,
+  startDateTimeCron varchar(45) DEFAULT NULL,
+  endDateTime TIMESTAMP DEFAULT NOW(),
+  start_date_time TIMESTAMP DEFAULT NOW(),
+  recurrence varchar(45) DEFAULT NULL
+  );
+
+--  For demo reporting application add : demo_bar_chart, demo_bar_chart_inter, demo_line_chart, demo_pie_chart and demo_util_chart
+-- 	 									demo_scatter_chart, demo_scatter_plot
+-- ----------------------------------------------------------
+-- NAME: DEMO_BAR_CHART; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_bar_chart (
+    label varchar(20),
+    value numeric(25,15) 
+  );
+
+-- ----------------------------------------------------------
+-- NAME: DEMO_BAR_CHART_INTER; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_bar_chart_inter (
+    spam_date date,
+    num_rpt_sources numeric(10,0),
+    num_det_sources numeric(10,0)
+  );
+
+-- ----------------------------------------------------------
+-- NAME: DEMO_LINE_CHART; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_line_chart (
+    series varchar(20),
+    log_date date,
+    data_value numeric(10,5) 
+  );
+  
+-- ----------------------------------------------------------
+-- NAME: DEMO_PIE_CHART; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_pie_chart (
+    legend varchar(20),
+    data_value numeric(10,5)  
+  );  
+ 
+-- ----------------------------------------------------------
+-- NAME: DEMO_UTIL_CHART; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_util_chart (
+    traffic_date date,
+    util_perc numeric(10,5) 
+  );  
+
+-- ----------------------------------------------------------
+-- NAME: DEMO_SCATTER_CHART; TYPE: TABLE
+-- ----------------------------------------------------------  
+create table demo_scatter_chart (
+  rainfall numeric(10,2),
+  key_value varchar(20),
+  measurements numeric(10,2)
+); 
+  
+-- ----------------------------------------------------------
+-- NAME: DEMO_SCATTER_PLOT; TYPE: TABLE
+-- ----------------------------------------------------------
+create table demo_scatter_plot
+(
+  SERIES  VARCHAR(20),
+  VALUEX  numeric(25,15),
+  VALUEY  numeric(25,15)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_JOB_DETAILS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_job_details (
+SCHED_NAME VARCHAR(120) NOT NULL,
+JOB_NAME VARCHAR(200) NOT NULL,
+JOB_GROUP VARCHAR(200) NOT NULL,
+DESCRIPTION VARCHAR(250) NULL,
+JOB_CLASS_NAME VARCHAR(250) NOT NULL,
+IS_DURABLE VARCHAR(1) NOT NULL,
+IS_NONCONCURRENT VARCHAR(1) NOT NULL,
+IS_UPDATE_DATA VARCHAR(1) NOT NULL,
+REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
+JOB_DATA BLOB NULL,
+PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_triggers (
+SCHED_NAME VARCHAR(120) NOT NULL,
+TRIGGER_NAME VARCHAR(200) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+JOB_NAME VARCHAR(200) NOT NULL,
+JOB_GROUP VARCHAR(200) NOT NULL,
+DESCRIPTION VARCHAR(250) NULL,
+NEXT_FIRE_TIME BIGINT(13) NULL,
+PREV_FIRE_TIME BIGINT(13) NULL,
+PRIORITY INTEGER NULL,
+TRIGGER_STATE VARCHAR(16) NOT NULL,
+TRIGGER_TYPE VARCHAR(8) NOT NULL,
+START_TIME BIGINT(13) NOT NULL,
+END_TIME BIGINT(13) NULL,
+CALENDAR_NAME VARCHAR(200) NULL,
+MISFIRE_INSTR SMALLINT(2) NULL,
+JOB_DATA BLOB NULL,
+PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
+REFERENCES FN_QZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_SIMPLE_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_simple_triggers (
+SCHED_NAME VARCHAR(120) NOT NULL,
+TRIGGER_NAME VARCHAR(200) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+REPEAT_COUNT BIGINT(7) NOT NULL,
+REPEAT_INTERVAL BIGINT(12) NOT NULL,
+TIMES_TRIGGERED BIGINT(10) NOT NULL,
+PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_CRON_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_cron_triggers (
+SCHED_NAME VARCHAR(120) NOT NULL,
+TRIGGER_NAME VARCHAR(200) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+CRON_EXPRESSION VARCHAR(120) NOT NULL,
+TIME_ZONE_ID VARCHAR(80),
+PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_SIMPROP_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_simprop_triggers
+  (          
+    SCHED_NAME VARCHAR(120) NOT NULL,
+    TRIGGER_NAME VARCHAR(200) NOT NULL,
+    TRIGGER_GROUP VARCHAR(200) NOT NULL,
+    STR_PROP_1 VARCHAR(512) NULL,
+    STR_PROP_2 VARCHAR(512) NULL,
+    STR_PROP_3 VARCHAR(512) NULL,
+    INT_PROP_1 INT NULL,
+    INT_PROP_2 INT NULL,
+    LONG_PROP_1 BIGINT NULL,
+    LONG_PROP_2 BIGINT NULL,
+    DEC_PROP_1 NUMERIC(13,4) NULL,
+    DEC_PROP_2 NUMERIC(13,4) NULL,
+    BOOL_PROP_1 VARCHAR(1) NULL,
+    BOOL_PROP_2 VARCHAR(1) NULL,
+    PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+    FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) 
+    REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_BLOB_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_blob_triggers (
+SCHED_NAME VARCHAR(120) NOT NULL,
+TRIGGER_NAME VARCHAR(200) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+BLOB_DATA BLOB NULL,
+PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
+INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
+FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES FN_QZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
+);
+  
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_CALENDARS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_calendars (
+SCHED_NAME VARCHAR(120) NOT NULL,
+CALENDAR_NAME VARCHAR(200) NOT NULL,
+CALENDAR BLOB NOT NULL,
+PRIMARY KEY (SCHED_NAME,CALENDAR_NAME)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_PAUSED_TRIGGER_GRPS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_paused_trigger_grps (
+SCHED_NAME VARCHAR(120) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_FIRED_TRIGGERS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_fired_triggers (
+SCHED_NAME VARCHAR(120) NOT NULL,
+ENTRY_ID VARCHAR(95) NOT NULL,
+TRIGGER_NAME VARCHAR(200) NOT NULL,
+TRIGGER_GROUP VARCHAR(200) NOT NULL,
+INSTANCE_NAME VARCHAR(200) NOT NULL,
+FIRED_TIME BIGINT(13) NOT NULL,
+SCHED_TIME BIGINT(13) NOT NULL,
+PRIORITY INTEGER NOT NULL,
+STATE VARCHAR(16) NOT NULL,
+JOB_NAME VARCHAR(200) NULL,
+JOB_GROUP VARCHAR(200) NULL,
+IS_NONCONCURRENT VARCHAR(1) NULL,
+REQUESTS_RECOVERY VARCHAR(1) NULL,
+PRIMARY KEY (SCHED_NAME,ENTRY_ID)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_SCHEDULER_STATE; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_scheduler_state (
+SCHED_NAME VARCHAR(120) NOT NULL,
+INSTANCE_NAME VARCHAR(200) NOT NULL,
+LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
+CHECKIN_INTERVAL BIGINT(13) NOT NULL,
+PRIMARY KEY (SCHED_NAME,INSTANCE_NAME)
+);
+
+-- ----------------------------------------------------------
+-- NAME: FN_QZ_LOCKS; TYPE: TABLE
+-- ----------------------------------------------------------
+create table fn_qz_locks (
+SCHED_NAME VARCHAR(120) NOT NULL,
+LOCK_NAME VARCHAR(40) NOT NULL,
+PRIMARY KEY (SCHED_NAME,LOCK_NAME)
+);
+
+--
+-- name: rcloudinvocation; type: table
+--
+create table rcloudinvocation (
+    id varchar(128) not null primary key,
+    created timestamp not null,
+    userinfo varchar(2048) not null,
+    notebookid varchar(128) not null,
+    parameters varchar(2048) default null,
+    tokenreaddate timestamp null
+);
+
+--
+-- name: rcloudnotebook; type: table
+--
+create table rcloudnotebook (
+    notebookname varchar(128) not null primary key,
+    notebookid varchar(128) not null
+);
+
+--
+-- Name: fn_lu_message_location; Type: TABLE
+--
+
+CREATE TABLE fn_lu_message_location (
+    message_location_id numeric(11,0) NOT NULL,
+    message_location_descr character varying(30) NOT NULL
+);
+
+-- ------------------ CREATE VIEW SECTION
+--
+-- NAME: V_URL_ACCESS; TYPE: VIEW
+--
+CREATE VIEW v_url_access AS
+ SELECT DISTINCT M.ACTION AS URL,
+    M.FUNCTION_CD
+   FROM FN_MENU M
+  WHERE (M.ACTION IS NOT NULL)
+UNION
+ SELECT DISTINCT T.ACTION AS URL,
+    T.FUNCTION_CD
+   FROM FN_TAB T
+  WHERE (T.ACTION IS NOT NULL)
+UNION
+ SELECT R.RESTRICTED_URL AS URL,
+    R.FUNCTION_CD
+   FROM FN_RESTRICTED_URL R;
+   
+-- ------------------ ALTER TABLE ADD CONSTRAINT PRIMARY KEY SECTION
+--
+-- NAME: CR_FAVORITE_REPORTS_USER_IDREP_ID; TYPE: CONSTRAINT 
+--
+alter table cr_favorite_reports 
+    add constraint cr_favorite_reports_user_idrep_id primary key (user_id, rep_id);
+--
+-- NAME: CR_FOLDER_FOLDER_ID; TYPE: CONSTRAINT 
+--
+alter table cr_folder
+    add constraint cr_folder_folder_id primary key (folder_id);
+--
+-- NAME: CR_FOLDER_ACCESS_FOLDER_ACCESS_ID; TYPE: CONSTRAINT 
+--
+alter table cr_folder_access
+    add constraint cr_folder_access_folder_access_id primary key (folder_access_id);
+--
+-- NAME: CR_HIST_USER_MAP_HIST_IDUSER_ID; TYPE: CONSTRAINT 
+--
+alter table cr_hist_user_map
+    add constraint cr_hist_user_map_hist_iduser_id primary key (hist_id, user_id);
+--
+-- NAME: CR_LU_FILE_TYPE_LOOKUP_ID; TYPE: CONSTRAINT 
+--
+alter table cr_lu_file_type
+    add constraint cr_lu_file_type_lookup_id primary key (lookup_id);
+--
+-- NAME: CR_RAPTOR_ACTION_IMG_IMAGE_ID; TYPE: CONSTRAINT 
+--
+alter table cr_raptor_action_img
+    add constraint cr_raptor_action_img_image_id primary key (image_id);
+--
+-- NAME: CR_RAPTOR_PDF_IMG_IMAGE_ID; TYPE: CONSTRAINT 
+--
+alter table cr_raptor_pdf_img
+    add constraint cr_raptor_pdf_img_image_id primary key (image_id);
+--
+-- NAME: CR_REMOTE_SCHEMA_INFO_SCHEMA_PREFIX; TYPE: CONSTRAINT 
+--
+alter table cr_remote_schema_info
+    add constraint cr_remote_schema_info_schema_prefix primary key (schema_prefix);
+--
+-- NAME: CR_REPORT_REP_ID; TYPE: CONSTRAINT 
+--
+alter table cr_report
+    add constraint cr_report_rep_id primary key (rep_id);
+--
+-- NAME: CR_REPORT_ACCESS_REP_IDORDER_NO; TYPE: CONSTRAINT 
+--
+alter table cr_report_access
+    add constraint cr_report_access_rep_idorder_no primary key (rep_id, order_no);
+--
+-- NAME: CR_REPORT_EMAIL_SENT_LOG_LOG_ID; TYPE: CONSTRAINT 
+--
+alter table cr_report_email_sent_log
+    add constraint cr_report_email_sent_log_log_id primary key (log_id);
+--
+-- NAME: CR_REPORT_FILE_HISTORY_HIST_ID; TYPE: CONSTRAINT 
+--
+alter table cr_report_file_history
+    add constraint cr_report_file_history_hist_id primary key (hist_id);
+--
+-- NAME: CR_REPORT_SCHEDULE_SCHEDULE_ID; TYPE: CONSTRAINT 
+--
+alter table cr_report_schedule
+    add constraint cr_report_schedule_schedule_id primary key (schedule_id);
+--
+-- NAME: CR_REPORT_SCHEDULE_USERS_SCHEDULE_IDREP_IDUSER_IDORDER_NO; TYPE: CONSTRAINT 
+--
+alter table cr_report_schedule_users
+    add constraint cr_report_schedule_users_schedule_idrep_iduser_idorder_no primary key (schedule_id, rep_id, user_id, order_no);
+--
+-- NAME: CR_REPORT_TEMPLATE_MAP_REPORT_ID; TYPE: CONSTRAINT 
+--
+alter table cr_report_template_map
+    add constraint cr_report_template_map_report_id primary key (report_id);
+--
+-- NAME: CR_TABLE_ROLE_TABLE_NAMEROLE_ID; TYPE: CONSTRAINT 
+--
+alter table cr_table_role
+    add constraint cr_table_role_table_namerole_id primary key (table_name, role_id);
+--
+-- NAME: CR_TABLE_SOURCE_TABLE_NAME; TYPE: CONSTRAINT 
+--
+alter table cr_table_source
+    add constraint cr_table_source_table_name primary key (table_name);
+--
+-- NAME: FN_AUDIT_ACTION_AUDIT_ACTION_ID; TYPE: CONSTRAINT 
+--
+alter table fn_audit_action
+    add constraint fn_audit_action_audit_action_id primary key (audit_action_id);  
+--
+-- NAME: FN_CHAT_LOGS_CHAT_LOG_ID; TYPE: CONSTRAINT 
+--
+alter table fn_chat_logs
+    add constraint fn_chat_logs_chat_log_id primary key (chat_log_id);
+--
+-- NAME: FN_CHAT_ROOM_CHAT_ROOM_ID; TYPE: CONSTRAINT 
+--
+alter table fn_chat_room
+    add constraint fn_chat_room_chat_room_id primary key (chat_room_id);
+--
+-- NAME: FN_CHAT_USERS_ID; TYPE: CONSTRAINT 
+--
+alter table fn_chat_users  
+    add constraint fn_chat_users_id primary key (id);
+--
+-- NAME: FN_LU_ALERT_METHOD_ALERT_METHOD_CD; TYPE: CONSTRAINT 
+--
+alter table fn_lu_alert_method
+    add constraint fn_lu_alert_method_alert_method_cd primary key (alert_method_cd);
+--
+-- NAME: FN_LU_BROADCAST_SITE_BROADCAST_SITE_CD; TYPE: CONSTRAINT 
+--
+alter table fn_lu_broadcast_site
+    add constraint fn_lu_broadcast_site_broadcast_site_cd primary key (broadcast_site_cd);
+--
+-- NAME: FN_LU_PRIORITY_PRIORITY_ID; TYPE: CONSTRAINT 
+--
+alter table fn_lu_priority
+    add constraint fn_lu_priority_priority_id primary key (priority_id);
+--
+-- NAME: FN_LU_ROLE_TYPE_ROLE_TYPE_ID; TYPE: CONSTRAINT 
+--
+alter table fn_lu_role_type
+    add constraint fn_lu_role_type_role_type_id primary key (role_type_id);
+--
+-- NAME: FN_LU_TAB_SET_TAB_SET_CD; TYPE: CONSTRAINT 
+--
+alter table fn_lu_tab_set
+    add constraint fn_lu_tab_set_tab_set_cd primary key (tab_set_cd);
+--
+-- NAME: FN_LU_TIMEZONE_TIMEZONE_ID; TYPE: CONSTRAINT 
+--
+alter table fn_lu_timezone
+    add constraint fn_lu_timezone_timezone_id primary key (timezone_id);
+--
+-- NAME: FN_ORG_ORG_ID; TYPE: CONSTRAINT 
+--
+alter table fn_org
+    add constraint fn_org_org_id primary key (org_id);
+--
+-- NAME: FN_RESTRICTED_URL_RESTRICTED_URLFUNCTION_CD; TYPE: CONSTRAINT 
+--
+alter table fn_restricted_url
+    add constraint fn_restricted_url_restricted_urlfunction_cd primary key (restricted_url, function_cd);
+--
+-- NAME: FN_ROLE_COMPOSITE_PARENT_ROLE_IDCHILD_ROLE_ID; TYPE: CONSTRAINT 
+--
+alter table fn_role_composite
+    add constraint fn_role_composite_parent_role_idchild_role_id primary key (parent_role_id, child_role_id);
+--
+-- NAME: FN_ROLE_FUNCTION_ROLE_IDFUNCTION_CD; TYPE: CONSTRAINT 
+--
+alter table fn_role_function
+    add constraint fn_role_function_role_idfunction_cd primary key (role_id, function_cd);
+--
+-- NAME: FN_TAB_TAB_CD; TYPE: CONSTRAINT 
+--
+alter table fn_tab
+    add constraint fn_tab_tab_cd primary key (tab_cd);
+--
+-- NAME: FN_TAB_SELECTED_SELECTED_TAB_CDTAB_URI; TYPE: CONSTRAINT 
+--
+alter table fn_tab_selected
+    add constraint fn_tab_selected_selected_tab_cdtab_uri primary key (selected_tab_cd, tab_uri);
+--
+-- NAME: FN_USER_PSEUDO_ROLE_PSEUDO_ROLE_IDUSER_ID; TYPE: CONSTRAINT 
+--
+alter table fn_user_pseudo_role
+    add constraint fn_user_pseudo_role_pseudo_role_iduser_id primary key (pseudo_role_id, user_id);
+--
+-- NAME: FN_USER_ROLE_USER_IDROLE_ID; TYPE: CONSTRAINT 
+--
+alter table fn_user_role
+    add constraint fn_user_role_user_idrole_id primary key (user_id, role_id, app_id);
+--
+-- Name: fn_lu_message_location_MESSAGE_LOCATION_ID; Type: CONSTRAINT
+--
+
+ALTER TABLE fn_lu_message_location
+    ADD CONSTRAINT fn_lu_message_location_MESSAGE_LOCATION_ID PRIMARY KEY (message_location_id);
+
+-- ------------------ CREATE INDEX SECTION
+--
+-- NAME: CR_REPORT_CREATE_IDPUBLIC_YNTITLE; TYPE: INDEX 
+--
+create index cr_report_create_idpublic_yntitle using btree on cr_report (create_id, public_yn, title);
+--
+-- NAME: CR_TABLE_JOIN_DEST_TABLE_NAME; TYPE: INDEX 
+--
+create index cr_table_join_dest_table_name using btree on cr_table_join (dest_table_name);
+--
+-- NAME: CR_TABLE_JOIN_SRC_TABLE_NAME; TYPE: INDEX 
+--
+create index cr_table_join_src_table_name using btree on cr_table_join (src_table_name);
+--
+-- NAME: FN_AUDIT_LOG_ACTIVITY_CD; TYPE: INDEX 
+--
+create index fn_audit_log_activity_cd using btree on fn_audit_log (activity_cd);
+--
+-- NAME: FN_AUDIT_LOG_USER_ID; TYPE: INDEX 
+--
+create index fn_audit_log_user_id using btree on fn_audit_log (user_id);
+--
+-- NAME: FN_ORG_ACCESS_CD; TYPE: INDEX 
+--
+create index fn_org_access_cd using btree on fn_org (access_cd);
+--
+-- NAME: FN_ROLE_FUNCTION_FUNCTION_CD; TYPE: INDEX 
+--
+create index fn_role_function_function_cd using btree on fn_role_function (function_cd);
+--
+-- NAME: FN_ROLE_FUNCTION_ROLE_ID; TYPE: INDEX 
+--
+create index fn_role_function_role_id using btree on fn_role_function (role_id);
+--
+-- NAME: FN_USER_ADDRESS_ID; TYPE: INDEX 
+--
+create index fn_user_address_id using btree on fn_user (address_id); 
+--
+-- NAME: FN_USER_ALERT_METHOD_CD; TYPE: INDEX 
+--
+create index fn_user_alert_method_cd using btree on fn_user (alert_method_cd); 
+--
+-- NAME: FN_USER_HRID; TYPE: INDEX 
+--
+create unique index fn_user_hrid using btree on fn_user (hrid); 
+--
+-- NAME: FN_USER_LOGIN_ID; TYPE: INDEX 
+--
+create unique index fn_user_login_id using btree on fn_user (login_id); 
+--
+-- NAME: FN_USER_ORG_ID; TYPE: INDEX 
+--
+create index fn_user_org_id using btree on fn_user (org_id); 
+--
+-- NAME: FN_USER_ROLE_ROLE_ID; TYPE: INDEX 
+--
+create index fn_user_role_role_id using btree on fn_user_role (role_id);
+--
+-- NAME: FN_USER_ROLE_USER_ID; TYPE: INDEX 
+--
+create index fn_user_role_user_id using btree on fn_user_role (user_id);
+--
+-- NAME: FK_FN_USER__REF_178_FN_APP_idx; TYPE: INDEX 
+--
+create index fk_fn_user__ref_178_fn_app_IDX on fn_user_role (app_id);
+
+-- ----------------------------------------------------------
+-- NAME: QUARTZ TYPE: INDEXES
+-- ----------------------------------------------------------
+create index idx_fn_qz_j_req_recovery on fn_qz_job_details(sched_name,requests_recovery);
+create index idx_fn_qz_j_grp on fn_qz_job_details(sched_name,job_group);
+create index idx_fn_qz_t_j on fn_qz_triggers(sched_name,job_name,job_group);
+create index idx_fn_qz_t_jg on fn_qz_triggers(sched_name,job_group);
+create index idx_fn_qz_t_c on fn_qz_triggers(sched_name,calendar_name);
+create index idx_fn_qz_t_g on fn_qz_triggers(sched_name,trigger_group);
+create index idx_fn_qz_t_state on fn_qz_triggers(sched_name,trigger_state);
+create index idx_fn_qz_t_n_state on fn_qz_triggers(sched_name,trigger_name,trigger_group,trigger_state);
+create index idx_fn_qz_t_n_g_state on fn_qz_triggers(sched_name,trigger_group,trigger_state);
+create index idx_fn_qz_t_next_fire_time on fn_qz_triggers(sched_name,next_fire_time);
+create index idx_fn_qz_t_nft_st on fn_qz_triggers(sched_name,trigger_state,next_fire_time);
+create index idx_fn_qz_t_nft_misfire on fn_qz_triggers(sched_name,misfire_instr,next_fire_time);
+create index idx_fn_qz_t_nft_st_misfire on fn_qz_triggers(sched_name,misfire_instr,next_fire_time,trigger_state);
+create index idx_fn_qz_t_nft_st_misfire_grp on fn_qz_triggers(sched_name,misfire_instr,next_fire_time,trigger_group,trigger_state);
+create index idx_fn_qz_ft_trig_inst_name on fn_qz_fired_triggers(sched_name,instance_name);
+create index idx_fn_qz_ft_inst_job_req_rcvry on fn_qz_fired_triggers(sched_name,instance_name,requests_recovery);
+create index idx_fn_qz_ft_j_g on fn_qz_fired_triggers(sched_name,job_name,job_group);
+create index idx_fn_qz_ft_jg on fn_qz_fired_triggers(sched_name,job_group);
+create index idx_fn_qz_ft_t_g on fn_qz_fired_triggers(sched_name,trigger_name,trigger_group);
+create index idx_fn_qz_ft_tg on fn_qz_fired_triggers(sched_name,trigger_group);
+
+-- ------------------ ALTER TABLE ADD CONSTRAINT FOREIGN KEY SECTION
+--
+-- NAME: FK_FN_AUDIT_REF_205_FN_LU_AC; TYPE: CONSTRAINT 
+--
+alter table fn_audit_log
+	add constraint fk_fn_audit_ref_205_fn_lu_ac foreign key (activity_cd) references fn_lu_activity(activity_cd);
+--
+-- NAME: FK_FN_ROLE__REF_201_FN_FUNCT; TYPE: CONSTRAINT 
+--    
+alter table fn_role_function
+	add constraint fk_fn_role__ref_201_fn_funct foreign key (function_cd) references fn_function(function_cd);
+--
+-- NAME: FK_FN_USER__REF_178_FN_APP; TYPE: FK CONSTRAINT
+--
+alter table fn_user_role
+	add constraint fk_fn_user__ref_178_fn_app foreign key (app_id) references fn_app(app_id);
+--
+-- NAME: FK_CR_REPOR_REF_14707_CR_REPOR; TYPE: FK CONSTRAINT
+--
+alter table cr_report_schedule
+    add constraint fk_cr_repor_ref_14707_cr_repor foreign key (rep_id) references cr_report(rep_id);
+--
+-- NAME: FK_CR_REPOR_REF_14716_CR_REPOR; TYPE: FK CONSTRAINT
+--
+alter table cr_report_schedule_users
+    add constraint fk_cr_repor_ref_14716_cr_repor foreign key (schedule_id) references cr_report_schedule(schedule_id);
+--
+-- NAME: FK_CR_REPOR_REF_17645_CR_REPOR; TYPE: FK CONSTRAINT
+--
+alter table cr_report_log
+    add constraint fk_cr_repor_ref_17645_cr_repor foreign key (rep_id) references cr_report(rep_id);
+--
+-- NAME: FK_CR_REPOR_REF_8550_CR_REPOR; TYPE: FK CONSTRAINT
+--
+alter table cr_report_access
+    add constraint fk_cr_repor_ref_8550_cr_repor foreign key (rep_id) references cr_report(rep_id);
+--
+-- NAME: FK_CR_REPORT_REP_ID; TYPE: FK CONSTRAINT
+--
+alter table cr_report_email_sent_log
+    add constraint fk_cr_report_rep_id foreign key (rep_id) references cr_report(rep_id);
+--
+-- NAME: FK_CR_TABLE_REF_311_CR_TAB; TYPE: FK CONSTRAINT
+--
+alter table cr_table_join
+    add constraint fk_cr_table_ref_311_cr_tab foreign key (src_table_name) references cr_table_source(table_name);
+--
+-- NAME: FK_CR_TABLE_REF_315_CR_TAB; TYPE: FK CONSTRAINT
+--
+alter table cr_table_join
+    add constraint fk_cr_table_ref_315_cr_tab foreign key (dest_table_name) references cr_table_source(table_name);
+--
+-- NAME: FK_CR_TABLE_REF_32384_CR_TABLE; TYPE: FK CONSTRAINT
+--
+alter table cr_table_role
+    add constraint fk_cr_table_ref_32384_cr_table foreign key (table_name) references cr_table_source(table_name);
+--
+-- NAME: FK_FN_TAB_FUNCTION_CD; TYPE: FK CONSTRAINT
+--
+alter table fn_tab
+    add constraint fk_fn_tab_function_cd foreign key (function_cd) references fn_function(function_cd);
+--
+-- NAME: FK_FN_TAB_SELECTED_TAB_CD; TYPE: FK CONSTRAINT
+--
+alter table fn_tab_selected
+    add constraint fk_fn_tab_selected_tab_cd foreign key (selected_tab_cd) references fn_tab(tab_cd);
+--
+-- NAME: FK_FN_TAB_SET_CD; TYPE: FK CONSTRAINT
+--
+alter table fn_tab
+    add constraint fk_fn_tab_set_cd foreign key (tab_set_cd) references fn_lu_tab_set(tab_set_cd);
+--
+-- NAME: FK_FN_USER_REF_110_FN_ORG; TYPE: FK CONSTRAINT
+-- 
+alter table fn_user
+    add constraint fk_fn_user_ref_110_fn_org foreign key (org_id) references fn_org(org_id); 
+--
+-- NAME: FK_FN_USER_REF_123_FN_LU_AL; TYPE: FK CONSTRAINT
+--
+alter table fn_user
+    add constraint fk_fn_user_ref_123_fn_lu_al foreign key (alert_method_cd) references fn_lu_alert_method(alert_method_cd); 
+--
+-- NAME: FK_FN_USER_REF_197_FN_USER; TYPE: FK CONSTRAINT
+--
+alter table fn_user  
+    add constraint fk_fn_user_ref_197_fn_user foreign key (manager_id) references fn_user(user_id); 
+--
+-- NAME: FK_FN_USER_REF_198_FN_USER; TYPE: FK CONSTRAINT
+--
+alter table fn_user  
+    add constraint fk_fn_user_ref_198_fn_user foreign key (created_id) references fn_user(user_id); 
+--
+-- NAME: FK_FN_USER_REF_199_FN_USER; TYPE: FK CONSTRAINT
+--
+alter table fn_user  
+    add constraint fk_fn_user_ref_199_fn_user foreign key (modified_id) references fn_user(user_id);    
+--
+-- NAME: FK_PARENT_KEY_CR_FOLDER; TYPE: FK CONSTRAINT
+--
+alter table cr_folder
+    add constraint fk_parent_key_cr_folder foreign key (parent_folder_id) references cr_folder(folder_id);
+--
+-- NAME: FK_PSEUDO_ROLE_PSEUDO_ROLE_ID; TYPE: FK CONSTRAINT
+--
+alter table fn_user_pseudo_role 
+    add constraint fk_pseudo_role_pseudo_role_id foreign key (pseudo_role_id) references fn_role(role_id);
+--
+-- NAME: FK_PSEUDO_ROLE_USER_ID; TYPE: FK CONSTRAINT
+--
+alter table fn_user_pseudo_role 
+    add constraint fk_pseudo_role_user_id foreign key (user_id) references fn_user(user_id);
+--
+-- NAME: FK_TIMEZONE; TYPE: FK CONSTRAINT
+--
+alter table fn_user
+    add constraint fk_timezone foreign key (timezone) references fn_lu_timezone(timezone_id); 
+--
+-- NAME: SYS_C0014614; TYPE: FK CONSTRAINT
+--
+alter table cr_report_file_history
+    add constraint sys_c0014614 foreign key (file_type_id) references cr_lu_file_type(lookup_id);
+--
+-- NAME: SYS_C0014615; TYPE: FK CONSTRAINT
+--
+alter table cr_report_file_history
+    add constraint sys_c0014615 foreign key (rep_id) references cr_report(rep_id);
+--
+-- NAME: SYS_C0014616; TYPE: FK CONSTRAINT
+--
+alter table cr_hist_user_map  
+    add constraint sys_c0014616 foreign key (hist_id) references cr_report_file_history(hist_id);
+--
+-- NAME: SYS_C0014617; TYPE: FK CONSTRAINT
+--
+alter table cr_hist_user_map  
+    add constraint sys_c0014617 foreign key (user_id) references fn_user(user_id);
+    
+commit;
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_1710_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_1710_Common.sql
new file mode 100644
index 00000000..e366d7a9
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_1710_Common.sql
@@ -0,0 +1,2853 @@
+-- ---------------------------------------------------------------------------------------------------------------
+-- This script populates tables in the 1707 COMMON version of the ECOMP SDK application database.
+-- Additional DML scripts may be required!
+-- ---------------------------------------------------------------------------------------------------------------
+
+SET FOREIGN_KEY_CHECKS=1; 
+
+USE ecomp_sdk;
+
+-- fn_function
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_process','Process List');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job','Job Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job_create','Job Create');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_job_designer','Process in Designer view');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_task','Task Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_task_search','Task Search');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_map','Map Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_sample','Sample Pages Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('login','Login');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_home','Home Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_customer','Customer Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_reports','Reports Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile','Profile Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_admin','Admin Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_feedback','Feedback Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_help','Help Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_logout','Logout Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_notes','Notes Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_ajax','Ajax Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_customer_create','Customer Create');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile_create','Profile Create');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_profile_import','Profile Import');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_tab','Sample Tab Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('view_reports','View Raptor reports');
+
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_itracker_admin','Itracker Admin/Support menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('quantum_bd','Big Data Function');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('1','test role function');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_hiveconfig','Hive Configuration');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_mapreduce_create','Map Reduce Configuration Create');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_mapreduce_search','Map Reduce Configuration Search');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_hiveconfig_search','Hive Configuration Search');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_hiveconfig_create','Hive Configuration Create');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_test','Test Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_doclib','Document Library Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('doclib','Document Library');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('doclib_admin','Document Library Admin');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_concept','CoNCEPT');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_itracker','iTracker Menu');
+Insert into fn_function (FUNCTION_CD,FUNCTION_NAME) values ('menu_mapreduce','Map Reduce Configuration');
+
+-- fn_lu_activity
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role','add_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_role','remove_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_user_role','add_user_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_user_role','remove_user_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role_function','add_role_function');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_role_function','remove_role_function');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_child_role','add_child_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('remove_child_role','remove_child_role');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('mobile_login','Mobile Login');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('mobile_logout','Mobile Logout');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('login','Login');
+Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('logout','Logout');
+
+-- fn_lu_alert_method
+Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('PHONE','Phone');
+Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('FAX','Fax');
+Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('PAGER','Pager');
+Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('EMAIL','Email');
+Insert into fn_lu_alert_method (ALERT_METHOD_CD,ALERT_METHOD) values ('SMS','SMS');
+
+-- fn_lu_menu_set
+Insert into fn_lu_menu_set (MENU_SET_CD,MENU_SET_NAME) values ('APP','Application Menu');
+
+-- fn_lu_priority
+Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (10,'Low','Y',10);
+Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (20,'Normal','Y',20);
+Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (30,'High','Y',30);
+Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (40,'Urgent','Y',40);
+Insert into fn_lu_priority (PRIORITY_ID,PRIORITY,ACTIVE_YN,SORT_ORDER) values (50,'Fatal','Y',50);
+
+-- fn_lu_tab_set
+Insert into fn_lu_tab_set (TAB_SET_CD,TAB_SET_NAME) values ('APP','Application Tabs');
+
+-- fn_lu_timezone
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (10,'US/Eastern','US/Eastern');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (20,'US/Central','US/Central');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (30,'US/Mountain','US/Mountain');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (40,'US/Arizona','America/Phoenix');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (50,'US/Pacific','US/Pacific');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (60,'US/Alaska','US/Alaska');
+Insert into fn_lu_timezone (TIMEZONE_ID,TIMEZONE_NAME,TIMEZONE_VALUE) values (70,'US/Hawaii','US/Hawaii');
+
+-- fn_restricted_url
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('attachment.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('broadcast.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('file_upload.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('job.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('role.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('role_function.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('test.htm','menu_admin');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('async_test.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('chatWindow.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('contact_list.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('customer_dynamic_list.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('event.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('event_list.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('mobile_welcome.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('sample_map.htm','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('template.jsp','menu_home');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('jbpm_designer.htm','menu_job_create');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('jbpm_drools.htm','menu_job_create');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('process_job.htm','menu_job_create');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('profile.htm','menu_profile_create');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor2.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor_blob_extract.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor_email_attachment.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor_search.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('report_list.htm','menu_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('gauge.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('gmap_controller.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('gmap_frame.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('map.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('map_download.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('map_grid_search.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('sample_animated_map.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('sample_map_2.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('sample_map_3.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab2_sub1.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab2_sub2_link1.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab2_sub2_link2.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab2_sub3.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab3.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('tab4.htm','menu_tab');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor.htm','view_reports');
+INSERT INTO fn_restricted_url (restricted_url, function_cd) VALUES ('raptor_blob_extract.htm','view_reports');
+
+-- fn_role
+Insert into fn_role (ROLE_ID,ROLE_NAME,ACTIVE_YN,PRIORITY) values (16,'Standard User','Y',5);
+Insert into fn_role (ROLE_ID,ROLE_NAME,ACTIVE_YN,PRIORITY) values (1,'System Administrator','Y',1);
+
+-- fn_role_composite
+Insert into fn_role_composite (PARENT_ROLE_ID,CHILD_ROLE_ID) values (1,16);
+
+-- fn_role_function
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'login');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_admin');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_ajax');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_customer');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_customer_create');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_feedback');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_help');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_home');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_job');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_job_create');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_logout');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_notes');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_process');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile_create');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_profile_import');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_reports');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_sample');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (1,'menu_tab');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'login');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_ajax');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_customer');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_customer_create');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_home');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_logout');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_map');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_profile');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_reports');
+Insert into fn_role_function (ROLE_ID,FUNCTION_CD) values (16,'menu_tab');
+
+-- fn_tab
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB1_S1','Left Tab 1','Sub - Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2_SUB1','APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB1','Tab 1','Tab 1 Information','tab1.htm','menu_tab','Y',10,null,'APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2','Tab 2','Tab 2 Information','tab2_sub1.htm','menu_tab','Y',20,null,'APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB3','Tab 3','Tab 3 Information','tab3.htm','menu_tab','Y',30,null,'APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB4','Tab 4','Tab 4 Information','tab4.htm','menu_tab','Y',40,null,'APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB1','Sub Tab 1','Sub Tab 1 Information','tab2_sub1.htm','menu_tab','Y',10,'TAB2','APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB2','Sub Tab 2','Sub Tab 2 Information','tab2_sub2.htm','menu_tab','Y',20,'TAB2','APP');
+Insert into fn_tab (TAB_CD,TAB_NAME,TAB_DESCR,ACTION,FUNCTION_CD,ACTIVE_YN,SORT_ORDER,PARENT_TAB_CD,TAB_SET_CD) values ('TAB2_SUB3','Sub Tab 3','Sub Tab 3 Information','tab2_sub3.htm','menu_tab','Y',30,'TAB2','APP');
+
+-- fn_tab_selected
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB1','tab1');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub1');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub2');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2','tab2_sub3');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB1','tab2_sub1');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB1_S1','tab2_sub1');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB2','tab2_sub2');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB2_SUB3','tab2_sub3');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB3','tab3');
+Insert into fn_tab_selected (SELECTED_TAB_CD,TAB_URI) values ('TAB4','tab4');
+
+-- DEMO_BAR_CHART
+Insert into demo_bar_chart (label, value) values ('A', 29.765957771107); 
+Insert into demo_bar_chart (label, value) values ('B', 0); 
+Insert into demo_bar_chart (label, value) values ('C', 32.807804682612); 
+Insert into demo_bar_chart (label, value) values ('D', 196.45946739256); 
+Insert into demo_bar_chart (label, value) values ('E', 0.19434030906893); 
+Insert into demo_bar_chart (label, value) values ('F', 98.079782601442); 
+Insert into demo_bar_chart (label, value) values ('G', 13.925743130903); 
+Insert into demo_bar_chart (label, value) values ('H', 5.1387322875705);
+
+-- DEMO_BAR_CHART_INTER
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('6-Mar-13','%e-%b-%y'), 198, 220);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('5-Mar-13','%e-%b-%y'), 198, 220);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('4-Mar-13','%e-%b-%y'), 238, 235);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('3-Mar-13','%e-%b-%y'), 238, 235);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('2-Mar-13','%e-%b-%y'), 256, 275);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('1-Mar-13','%e-%b-%y'), 239, 260);  
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('28-Feb-13','%e-%b-%y'), 247, 255);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('27-Feb-13','%e-%b-%y'), 252, 265);
+Insert into demo_bar_chart_inter (spam_date, num_rpt_sources, num_det_sources) values (STR_TO_DATE('26-Feb-13','%e-%b-%y'), 198, 220);
+
+-- DEMO_LINE_CHART  
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-May-12','%e-%b-%y'),582.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Apr-12','%e-%b-%y'),583.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-Apr-12','%e-%b-%y'),603);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Apr-12','%e-%b-%y'),607.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Apr-12','%e-%b-%y'),610);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Apr-12','%e-%b-%y'),560.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Apr-12','%e-%b-%y'),571.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Apr-12','%e-%b-%y'),572.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Apr-12','%e-%b-%y'),587.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Apr-12','%e-%b-%y'),608.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Apr-12','%e-%b-%y'),609.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Apr-12','%e-%b-%y'),580.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Apr-12','%e-%b-%y'),605.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Apr-12','%e-%b-%y'),622.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Apr-12','%e-%b-%y'),626.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Apr-12','%e-%b-%y'),628.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Apr-12','%e-%b-%y'),636.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Apr-12','%e-%b-%y'),633.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Apr-12','%e-%b-%y'),624.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Apr-12','%e-%b-%y'),629.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Apr-12','%e-%b-%y'),618.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Mar-12','%e-%b-%y'),599.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Mar-12','%e-%b-%y'),609.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Mar-12','%e-%b-%y'),617.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Mar-12','%e-%b-%y'),614.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Mar-12','%e-%b-%y'),606.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Mar-12','%e-%b-%y'),596.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Mar-12','%e-%b-%y'),599.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Mar-12','%e-%b-%y'),602.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Mar-12','%e-%b-%y'),605.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Mar-12','%e-%b-%y'),601.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Mar-12','%e-%b-%y'),585.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('15-Mar-12','%e-%b-%y'),585.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Mar-12','%e-%b-%y'),589.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Mar-12','%e-%b-%y'),568.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Mar-12','%e-%b-%y'),552);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Mar-12','%e-%b-%y'),545.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Mar-12','%e-%b-%y'),541.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('7-Mar-12','%e-%b-%y'),530.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Mar-12','%e-%b-%y'),530.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Mar-12','%e-%b-%y'),533.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Mar-12','%e-%b-%y'),545.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Mar-12','%e-%b-%y'),544.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Feb-12','%e-%b-%y'),542.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Feb-12','%e-%b-%y'),535.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Feb-12','%e-%b-%y'),525.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Feb-12','%e-%b-%y'),522.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Feb-12','%e-%b-%y'),516.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Feb-12','%e-%b-%y'),513.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Feb-12','%e-%b-%y'),514.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Feb-12','%e-%b-%y'),502.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Feb-12','%e-%b-%y'),502.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Feb-12','%e-%b-%y'),497.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Feb-12','%e-%b-%y'),509.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Feb-12','%e-%b-%y'),502.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Feb-12','%e-%b-%y'),493.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Feb-12','%e-%b-%y'),493.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Feb-12','%e-%b-%y'),476.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Feb-12','%e-%b-%y'),468.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Feb-12','%e-%b-%y'),463.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Feb-12','%e-%b-%y'),459.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Feb-12','%e-%b-%y'),455.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Feb-12','%e-%b-%y'),456.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Jan-12','%e-%b-%y'),456.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Jan-12','%e-%b-%y'),453.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jan-12','%e-%b-%y'),447.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Jan-12','%e-%b-%y'),444.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jan-12','%e-%b-%y'),446.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Jan-12','%e-%b-%y'),420.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jan-12','%e-%b-%y'),427.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Jan-12','%e-%b-%y'),420.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jan-12','%e-%b-%y'),427.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jan-12','%e-%b-%y'),429.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jan-12','%e-%b-%y'),424.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Jan-12','%e-%b-%y'),419.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Jan-12','%e-%b-%y'),421.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jan-12','%e-%b-%y'),422.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Jan-12','%e-%b-%y'),423.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Jan-12','%e-%b-%y'),421.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Jan-12','%e-%b-%y'),422.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Jan-12','%e-%b-%y'),418.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Jan-12','%e-%b-%y'),413.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Jan-12','%e-%b-%y'),411.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Dec-11','%e-%b-%y'),405);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Dec-11','%e-%b-%y'),405.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Dec-11','%e-%b-%y'),402.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-Dec-11','%e-%b-%y'),406.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Dec-11','%e-%b-%y'),403.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Dec-11','%e-%b-%y'),398.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Dec-11','%e-%b-%y'),396.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Dec-11','%e-%b-%y'),395.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Dec-11','%e-%b-%y'),382.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Dec-11','%e-%b-%y'),381.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Dec-11','%e-%b-%y'),378.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Dec-11','%e-%b-%y'),380.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Dec-11','%e-%b-%y'),388.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Dec-11','%e-%b-%y'),391.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Dec-11','%e-%b-%y'),393.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Dec-11','%e-%b-%y'),390.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Dec-11','%e-%b-%y'),389.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Dec-11','%e-%b-%y'),390.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Dec-11','%e-%b-%y'),393.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Dec-11','%e-%b-%y'),389.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Dec-11','%e-%b-%y'),387.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Nov-11','%e-%b-%y'),382.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Nov-11','%e-%b-%y'),373.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Nov-11','%e-%b-%y'),376.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Nov-11','%e-%b-%y'),363.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Nov-11','%e-%b-%y'),366.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Nov-11','%e-%b-%y'),376.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Nov-11','%e-%b-%y'),369.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Nov-11','%e-%b-%y'),374.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Nov-11','%e-%b-%y'),377.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Nov-11','%e-%b-%y'),384.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Nov-11','%e-%b-%y'),388.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Nov-11','%e-%b-%y'),379.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Nov-11','%e-%b-%y'),384.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Nov-11','%e-%b-%y'),385.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Nov-11','%e-%b-%y'),395.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Nov-11','%e-%b-%y'),406.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Nov-11','%e-%b-%y'),399.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Nov-11','%e-%b-%y'),400.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('3-Nov-11','%e-%b-%y'),403.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Nov-11','%e-%b-%y'),397.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Nov-11','%e-%b-%y'),396.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Oct-11','%e-%b-%y'),404.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Oct-11','%e-%b-%y'),404.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Oct-11','%e-%b-%y'),404.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('26-Oct-11','%e-%b-%y'),400.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Oct-11','%e-%b-%y'),397.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Oct-11','%e-%b-%y'),405.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Oct-11','%e-%b-%y'),392.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Oct-11','%e-%b-%y'),395.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Oct-11','%e-%b-%y'),398.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('18-Oct-11','%e-%b-%y'),422.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Oct-11','%e-%b-%y'),419.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Oct-11','%e-%b-%y'),422);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Oct-11','%e-%b-%y'),408.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Oct-11','%e-%b-%y'),402.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Oct-11','%e-%b-%y'),400.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Oct-11','%e-%b-%y'),388.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Oct-11','%e-%b-%y'),369.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Oct-11','%e-%b-%y'),377.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Oct-11','%e-%b-%y'),378.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Oct-11','%e-%b-%y'),372.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Oct-11','%e-%b-%y'),374.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Sep-11','%e-%b-%y'),381.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Sep-11','%e-%b-%y'),390.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Sep-11','%e-%b-%y'),397.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Sep-11','%e-%b-%y'),399.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Sep-11','%e-%b-%y'),403.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Sep-11','%e-%b-%y'),404.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('22-Sep-11','%e-%b-%y'),401.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Sep-11','%e-%b-%y'),412.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Sep-11','%e-%b-%y'),413.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Sep-11','%e-%b-%y'),411.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Sep-11','%e-%b-%y'),400.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Sep-11','%e-%b-%y'),392.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Sep-11','%e-%b-%y'),389.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Sep-11','%e-%b-%y'),384.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Sep-11','%e-%b-%y'),379.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Sep-11','%e-%b-%y'),377.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Sep-11','%e-%b-%y'),384.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Sep-11','%e-%b-%y'),383.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-Sep-11','%e-%b-%y'),379.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Sep-11','%e-%b-%y'),374.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Sep-11','%e-%b-%y'),381.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Aug-11','%e-%b-%y'),384.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Aug-11','%e-%b-%y'),389.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Aug-11','%e-%b-%y'),389.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('26-Aug-11','%e-%b-%y'),383.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Aug-11','%e-%b-%y'),373.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Aug-11','%e-%b-%y'),376.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Aug-11','%e-%b-%y'),373.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Aug-11','%e-%b-%y'),356.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Aug-11','%e-%b-%y'),356.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('18-Aug-11','%e-%b-%y'),366.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Aug-11','%e-%b-%y'),380.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Aug-11','%e-%b-%y'),380.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Aug-11','%e-%b-%y'),383.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Aug-11','%e-%b-%y'),376.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Aug-11','%e-%b-%y'),373.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Aug-11','%e-%b-%y'),363.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Aug-11','%e-%b-%y'),374.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Aug-11','%e-%b-%y'),353.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Aug-11','%e-%b-%y'),373.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Aug-11','%e-%b-%y'),377.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Aug-11','%e-%b-%y'),392.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Aug-11','%e-%b-%y'),388.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Aug-11','%e-%b-%y'),396.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Jul-11','%e-%b-%y'),390.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jul-11','%e-%b-%y'),391.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Jul-11','%e-%b-%y'),392.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Jul-11','%e-%b-%y'),403.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Jul-11','%e-%b-%y'),398.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jul-11','%e-%b-%y'),393.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Jul-11','%e-%b-%y'),387.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Jul-11','%e-%b-%y'),386.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Jul-11','%e-%b-%y'),376.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Jul-11','%e-%b-%y'),373.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('15-Jul-11','%e-%b-%y'),364.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jul-11','%e-%b-%y'),357.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Jul-11','%e-%b-%y'),358.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Jul-11','%e-%b-%y'),353.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jul-11','%e-%b-%y'),354);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Jul-11','%e-%b-%y'),359.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('7-Jul-11','%e-%b-%y'),357.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Jul-11','%e-%b-%y'),351.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Jul-11','%e-%b-%y'),349.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jul-11','%e-%b-%y'),343.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Jun-11','%e-%b-%y'),335.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Jun-11','%e-%b-%y'),334.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Jun-11','%e-%b-%y'),335.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jun-11','%e-%b-%y'),332.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Jun-11','%e-%b-%y'),326.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jun-11','%e-%b-%y'),331.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Jun-11','%e-%b-%y'),322.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Jun-11','%e-%b-%y'),325.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Jun-11','%e-%b-%y'),315.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jun-11','%e-%b-%y'),320.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Jun-11','%e-%b-%y'),325.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jun-11','%e-%b-%y'),326.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Jun-11','%e-%b-%y'),332.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jun-11','%e-%b-%y'),326.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Jun-11','%e-%b-%y'),325.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jun-11','%e-%b-%y'),331.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Jun-11','%e-%b-%y'),332.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Jun-11','%e-%b-%y'),332.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Jun-11','%e-%b-%y'),338.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jun-11','%e-%b-%y'),343.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Jun-11','%e-%b-%y'),346.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jun-11','%e-%b-%y'),345.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-May-11','%e-%b-%y'),347.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-May-11','%e-%b-%y'),337.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-May-11','%e-%b-%y'),335);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-May-11','%e-%b-%y'),336.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-May-11','%e-%b-%y'),332.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-May-11','%e-%b-%y'),334.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-May-11','%e-%b-%y'),335.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-May-11','%e-%b-%y'),340.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-May-11','%e-%b-%y'),339.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-May-11','%e-%b-%y'),336.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-May-11','%e-%b-%y'),333.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-May-11','%e-%b-%y'),340.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-May-11','%e-%b-%y'),346.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-May-11','%e-%b-%y'),347.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-May-11','%e-%b-%y'),349.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-May-11','%e-%b-%y'),347.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-May-11','%e-%b-%y'),346.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-May-11','%e-%b-%y'),346.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-May-11','%e-%b-%y'),349.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-May-11','%e-%b-%y'),348.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-May-11','%e-%b-%y'),346.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Apr-11','%e-%b-%y'),350.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Apr-11','%e-%b-%y'),346.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Apr-11','%e-%b-%y'),350.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Apr-11','%e-%b-%y'),350.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Apr-11','%e-%b-%y'),353.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Apr-11','%e-%b-%y'),350.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Apr-11','%e-%b-%y'),342.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Apr-11','%e-%b-%y'),337.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Apr-11','%e-%b-%y'),331.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Apr-11','%e-%b-%y'),327.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Apr-11','%e-%b-%y'),332.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Apr-11','%e-%b-%y'),336.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Apr-11','%e-%b-%y'),332.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Apr-11','%e-%b-%y'),330.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Apr-11','%e-%b-%y'),335.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Apr-11','%e-%b-%y'),338.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Apr-11','%e-%b-%y'),338.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Apr-11','%e-%b-%y'),338.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Apr-11','%e-%b-%y'),341.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Apr-11','%e-%b-%y'),344.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Mar-11','%e-%b-%y'),348.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Mar-11','%e-%b-%y'),348.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Mar-11','%e-%b-%y'),350.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Mar-11','%e-%b-%y'),350.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Mar-11','%e-%b-%y'),351.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Mar-11','%e-%b-%y'),344.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Mar-11','%e-%b-%y'),339.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Mar-11','%e-%b-%y'),341.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Mar-11','%e-%b-%y'),339.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Mar-11','%e-%b-%y'),330.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Mar-11','%e-%b-%y'),334.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Mar-11','%e-%b-%y'),330.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Mar-11','%e-%b-%y'),345.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Mar-11','%e-%b-%y'),353.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Mar-11','%e-%b-%y'),351.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Mar-11','%e-%b-%y'),346.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Mar-11','%e-%b-%y'),352.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Mar-11','%e-%b-%y'),355.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Mar-11','%e-%b-%y'),355.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Mar-11','%e-%b-%y'),360);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Mar-11','%e-%b-%y'),359.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Mar-11','%e-%b-%y'),352.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Mar-11','%e-%b-%y'),349.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Feb-11','%e-%b-%y'),353.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Feb-11','%e-%b-%y'),348.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Feb-11','%e-%b-%y'),342.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Feb-11','%e-%b-%y'),342.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Feb-11','%e-%b-%y'),338.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Feb-11','%e-%b-%y'),350.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Feb-11','%e-%b-%y'),358.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Feb-11','%e-%b-%y'),363.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Feb-11','%e-%b-%y'),359.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Feb-11','%e-%b-%y'),359.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Feb-11','%e-%b-%y'),356.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Feb-11','%e-%b-%y'),354.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Feb-11','%e-%b-%y'),358.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Feb-11','%e-%b-%y'),355.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Feb-11','%e-%b-%y'),351.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Feb-11','%e-%b-%y'),346.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Feb-11','%e-%b-%y'),343.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Feb-11','%e-%b-%y'),344.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Feb-11','%e-%b-%y'),345.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Jan-11','%e-%b-%y'),339.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Jan-11','%e-%b-%y'),336.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jan-11','%e-%b-%y'),343.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Jan-11','%e-%b-%y'),343.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jan-11','%e-%b-%y'),341.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Jan-11','%e-%b-%y'),337.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Jan-11','%e-%b-%y'),326.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Jan-11','%e-%b-%y'),332.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jan-11','%e-%b-%y'),338.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jan-11','%e-%b-%y'),340.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jan-11','%e-%b-%y'),348.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Jan-11','%e-%b-%y'),345.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Jan-11','%e-%b-%y'),344.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jan-11','%e-%b-%y'),341.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Jan-11','%e-%b-%y'),342.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Jan-11','%e-%b-%y'),336.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Jan-11','%e-%b-%y'),333.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Jan-11','%e-%b-%y'),334);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Jan-11','%e-%b-%y'),331.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Jan-11','%e-%b-%y'),329.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Dec-10','%e-%b-%y'),322.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Dec-10','%e-%b-%y'),323.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Dec-10','%e-%b-%y'),325.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Dec-10','%e-%b-%y'),325.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Dec-10','%e-%b-%y'),324.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Dec-10','%e-%b-%y'),323.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Dec-10','%e-%b-%y'),325.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Dec-10','%e-%b-%y'),324.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Dec-10','%e-%b-%y'),322.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Dec-10','%e-%b-%y'),320.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Dec-10','%e-%b-%y'),321.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Dec-10','%e-%b-%y'),320.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Dec-10','%e-%b-%y'),320.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Dec-10','%e-%b-%y'),321.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Dec-10','%e-%b-%y'),320.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Dec-10','%e-%b-%y'),319.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Dec-10','%e-%b-%y'),321.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Dec-10','%e-%b-%y'),318.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Dec-10','%e-%b-%y'),320.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Dec-10','%e-%b-%y'),317.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Dec-10','%e-%b-%y'),318.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Dec-10','%e-%b-%y'),316.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Nov-10','%e-%b-%y'),311.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Nov-10','%e-%b-%y'),316.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Nov-10','%e-%b-%y'),315);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Nov-10','%e-%b-%y'),314.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Nov-10','%e-%b-%y'),308.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('22-Nov-10','%e-%b-%y'),313.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Nov-10','%e-%b-%y'),306.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Nov-10','%e-%b-%y'),308.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Nov-10','%e-%b-%y'),300.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Nov-10','%e-%b-%y'),301.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Nov-10','%e-%b-%y'),307.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Nov-10','%e-%b-%y'),308.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Nov-10','%e-%b-%y'),316.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Nov-10','%e-%b-%y'),318.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Nov-10','%e-%b-%y'),316.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Nov-10','%e-%b-%y'),318.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Nov-10','%e-%b-%y'),317.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Nov-10','%e-%b-%y'),318.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Nov-10','%e-%b-%y'),312.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Nov-10','%e-%b-%y'),309.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Nov-10','%e-%b-%y'),304.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Oct-10','%e-%b-%y'),300.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Oct-10','%e-%b-%y'),305.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-Oct-10','%e-%b-%y'),307.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Oct-10','%e-%b-%y'),308.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Oct-10','%e-%b-%y'),308.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Oct-10','%e-%b-%y'),307.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Oct-10','%e-%b-%y'),309.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Oct-10','%e-%b-%y'),310.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Oct-10','%e-%b-%y'),309.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Oct-10','%e-%b-%y'),318);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Oct-10','%e-%b-%y'),314.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Oct-10','%e-%b-%y'),302.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Oct-10','%e-%b-%y'),300.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Oct-10','%e-%b-%y'),298.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Oct-10','%e-%b-%y'),295.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Oct-10','%e-%b-%y'),294.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Oct-10','%e-%b-%y'),289.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Oct-10','%e-%b-%y'),289.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Oct-10','%e-%b-%y'),288.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Oct-10','%e-%b-%y'),278.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Oct-10','%e-%b-%y'),282.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Sep-10','%e-%b-%y'),283.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Sep-10','%e-%b-%y'),287.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Sep-10','%e-%b-%y'),286.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Sep-10','%e-%b-%y'),291.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Sep-10','%e-%b-%y'),292.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Sep-10','%e-%b-%y'),288.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Sep-10','%e-%b-%y'),287.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Sep-10','%e-%b-%y'),283.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Sep-10','%e-%b-%y'),283.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Sep-10','%e-%b-%y'),275.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Sep-10','%e-%b-%y'),276.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('15-Sep-10','%e-%b-%y'),270.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Sep-10','%e-%b-%y'),268.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Sep-10','%e-%b-%y'),267.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Sep-10','%e-%b-%y'),263.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Sep-10','%e-%b-%y'),263.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Sep-10','%e-%b-%y'),262.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('7-Sep-10','%e-%b-%y'),257.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Sep-10','%e-%b-%y'),258.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Sep-10','%e-%b-%y'),258.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Sep-10','%e-%b-%y'),252.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Sep-10','%e-%b-%y'),250.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Aug-10','%e-%b-%y'),243.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Aug-10','%e-%b-%y'),242.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Aug-10','%e-%b-%y'),241.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Aug-10','%e-%b-%y'),240.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Aug-10','%e-%b-%y'),242.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Aug-10','%e-%b-%y'),239.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Aug-10','%e-%b-%y'),245.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Aug-10','%e-%b-%y'),249.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Aug-10','%e-%b-%y'),249.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Aug-10','%e-%b-%y'),253.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Aug-10','%e-%b-%y'),251.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Aug-10','%e-%b-%y'),247.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Aug-10','%e-%b-%y'),249.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Aug-10','%e-%b-%y'),251.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Aug-10','%e-%b-%y'),250.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Aug-10','%e-%b-%y'),259.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Aug-10','%e-%b-%y'),261.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Aug-10','%e-%b-%y'),260.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Aug-10','%e-%b-%y'),261.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Aug-10','%e-%b-%y'),262.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Aug-10','%e-%b-%y'),261.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Aug-10','%e-%b-%y'),261.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Jul-10','%e-%b-%y'),257.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Jul-10','%e-%b-%y'),258.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jul-10','%e-%b-%y'),260.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-Jul-10','%e-%b-%y'),264.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Jul-10','%e-%b-%y'),259.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Jul-10','%e-%b-%y'),259.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jul-10','%e-%b-%y'),259.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Jul-10','%e-%b-%y'),254.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Jul-10','%e-%b-%y'),251.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Jul-10','%e-%b-%y'),245.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Jul-10','%e-%b-%y'),249.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Jul-10','%e-%b-%y'),251.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jul-10','%e-%b-%y'),252.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Jul-10','%e-%b-%y'),251.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Jul-10','%e-%b-%y'),257.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Jul-10','%e-%b-%y'),259.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Jul-10','%e-%b-%y'),258.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Jul-10','%e-%b-%y'),258.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Jul-10','%e-%b-%y'),248.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Jul-10','%e-%b-%y'),246.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Jul-10','%e-%b-%y'),246.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Jul-10','%e-%b-%y'),248.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Jun-10','%e-%b-%y'),251.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Jun-10','%e-%b-%y'),256.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jun-10','%e-%b-%y'),268.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Jun-10','%e-%b-%y'),266.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Jun-10','%e-%b-%y'),269);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Jun-10','%e-%b-%y'),270.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jun-10','%e-%b-%y'),273.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Jun-10','%e-%b-%y'),270.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Jun-10','%e-%b-%y'),274.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Jun-10','%e-%b-%y'),271.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Jun-10','%e-%b-%y'),267.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('15-Jun-10','%e-%b-%y'),259.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jun-10','%e-%b-%y'),254.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jun-10','%e-%b-%y'),253.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Jun-10','%e-%b-%y'),250.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Jun-10','%e-%b-%y'),243.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Jun-10','%e-%b-%y'),249.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('7-Jun-10','%e-%b-%y'),250.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Jun-10','%e-%b-%y'),255.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Jun-10','%e-%b-%y'),263.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Jun-10','%e-%b-%y'),263.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Jun-10','%e-%b-%y'),260.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-May-10','%e-%b-%y'),256.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-May-10','%e-%b-%y'),256.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-May-10','%e-%b-%y'),253.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-May-10','%e-%b-%y'),244.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-May-10','%e-%b-%y'),245.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-May-10','%e-%b-%y'),246.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-May-10','%e-%b-%y'),242.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-May-10','%e-%b-%y'),237.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-May-10','%e-%b-%y'),248.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-May-10','%e-%b-%y'),252.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-May-10','%e-%b-%y'),254.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-May-10','%e-%b-%y'),253.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-May-10','%e-%b-%y'),258.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-May-10','%e-%b-%y'),262.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-May-10','%e-%b-%y'),256.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-May-10','%e-%b-%y'),253.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-May-10','%e-%b-%y'),235.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-May-10','%e-%b-%y'),246.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-May-10','%e-%b-%y'),255.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-May-10','%e-%b-%y'),258.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-May-10','%e-%b-%y'),266.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Apr-10','%e-%b-%y'),261.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Apr-10','%e-%b-%y'),268.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Apr-10','%e-%b-%y'),261.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Apr-10','%e-%b-%y'),262.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('26-Apr-10','%e-%b-%y'),269.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Apr-10','%e-%b-%y'),270.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Apr-10','%e-%b-%y'),266.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Apr-10','%e-%b-%y'),259.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Apr-10','%e-%b-%y'),244.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Apr-10','%e-%b-%y'),247.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Apr-10','%e-%b-%y'),247.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Apr-10','%e-%b-%y'),248.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Apr-10','%e-%b-%y'),245.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Apr-10','%e-%b-%y'),242.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Apr-10','%e-%b-%y'),242.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Apr-10','%e-%b-%y'),241.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Apr-10','%e-%b-%y'),239.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Apr-10','%e-%b-%y'),240.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Apr-10','%e-%b-%y'),239.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Apr-10','%e-%b-%y'),238.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Apr-10','%e-%b-%y'),235.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Apr-10','%e-%b-%y'),235.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('31-Mar-10','%e-%b-%y'),235);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Mar-10','%e-%b-%y'),235.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Mar-10','%e-%b-%y'),232.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Mar-10','%e-%b-%y'),230.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Mar-10','%e-%b-%y'),226.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Mar-10','%e-%b-%y'),229.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Mar-10','%e-%b-%y'),228.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Mar-10','%e-%b-%y'),224.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Mar-10','%e-%b-%y'),222.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Mar-10','%e-%b-%y'),224.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Mar-10','%e-%b-%y'),224.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Mar-10','%e-%b-%y'),224.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('15-Mar-10','%e-%b-%y'),223.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Mar-10','%e-%b-%y'),226.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Mar-10','%e-%b-%y'),225.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Mar-10','%e-%b-%y'),224.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Mar-10','%e-%b-%y'),223.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Mar-10','%e-%b-%y'),219.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Mar-10','%e-%b-%y'),218.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Mar-10','%e-%b-%y'),210.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Mar-10','%e-%b-%y'),209.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Mar-10','%e-%b-%y'),208.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Mar-10','%e-%b-%y'),208.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Feb-10','%e-%b-%y'),204.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Feb-10','%e-%b-%y'),202);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Feb-10','%e-%b-%y'),200.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Feb-10','%e-%b-%y'),197.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Feb-10','%e-%b-%y'),200.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Feb-10','%e-%b-%y'),201.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Feb-10','%e-%b-%y'),202.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Feb-10','%e-%b-%y'),202.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Feb-10','%e-%b-%y'),203.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Feb-10','%e-%b-%y'),200.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Feb-10','%e-%b-%y'),200.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Feb-10','%e-%b-%y'),198.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Feb-10','%e-%b-%y'),195.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Feb-10','%e-%b-%y'),196.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Feb-10','%e-%b-%y'),194.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Feb-10','%e-%b-%y'),195.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Feb-10','%e-%b-%y'),192.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Feb-10','%e-%b-%y'),199.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Feb-10','%e-%b-%y'),195.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Feb-10','%e-%b-%y'),194.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Jan-10','%e-%b-%y'),192.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Jan-10','%e-%b-%y'),199.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jan-10','%e-%b-%y'),207.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Jan-10','%e-%b-%y'),205.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jan-10','%e-%b-%y'),203.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('22-Jan-10','%e-%b-%y'),197.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Jan-10','%e-%b-%y'),208.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Jan-10','%e-%b-%y'),211.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jan-10','%e-%b-%y'),215.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jan-10','%e-%b-%y'),205.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jan-10','%e-%b-%y'),205.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Jan-10','%e-%b-%y'),209.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jan-10','%e-%b-%y'),210.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Jan-10','%e-%b-%y'),207.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Jan-10','%e-%b-%y'),210.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Jan-10','%e-%b-%y'),211.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Jan-10','%e-%b-%y'),210.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-Jan-10','%e-%b-%y'),210.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Jan-10','%e-%b-%y'),214.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Jan-10','%e-%b-%y'),214.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jan-10','%e-%b-%y'),210.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Dec-09','%e-%b-%y'),210.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Dec-09','%e-%b-%y'),211.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Dec-09','%e-%b-%y'),209.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Dec-09','%e-%b-%y'),211.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Dec-09','%e-%b-%y'),209.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Dec-09','%e-%b-%y'),209.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Dec-09','%e-%b-%y'),202.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Dec-09','%e-%b-%y'),200.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Dec-09','%e-%b-%y'),198.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Dec-09','%e-%b-%y'),195.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Dec-09','%e-%b-%y'),191.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Dec-09','%e-%b-%y'),195.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Dec-09','%e-%b-%y'),194.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Dec-09','%e-%b-%y'),196.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Dec-09','%e-%b-%y'),194.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Dec-09','%e-%b-%y'),196.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Dec-09','%e-%b-%y'),197.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Dec-09','%e-%b-%y'),189.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Dec-09','%e-%b-%y'),188.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Dec-09','%e-%b-%y'),193.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('3-Dec-09','%e-%b-%y'),196.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Dec-09','%e-%b-%y'),196.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Dec-09','%e-%b-%y'),196.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Nov-09','%e-%b-%y'),199.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Nov-09','%e-%b-%y'),200.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Nov-09','%e-%b-%y'),204.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Nov-09','%e-%b-%y'),204.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Nov-09','%e-%b-%y'),204.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Nov-09','%e-%b-%y'),205.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Nov-09','%e-%b-%y'),199.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Nov-09','%e-%b-%y'),200.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Nov-09','%e-%b-%y'),205.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Nov-09','%e-%b-%y'),207);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Nov-09','%e-%b-%y'),206.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Nov-09','%e-%b-%y'),204.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Nov-09','%e-%b-%y'),201.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Nov-09','%e-%b-%y'),203.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Nov-09','%e-%b-%y'),202.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Nov-09','%e-%b-%y'),201.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Nov-09','%e-%b-%y'),194.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Nov-09','%e-%b-%y'),194.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Nov-09','%e-%b-%y'),190.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Nov-09','%e-%b-%y'),188.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Nov-09','%e-%b-%y'),189.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Oct-09','%e-%b-%y'),188.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Oct-09','%e-%b-%y'),196.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Oct-09','%e-%b-%y'),192.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Oct-09','%e-%b-%y'),197.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Oct-09','%e-%b-%y'),202.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Oct-09','%e-%b-%y'),203.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('22-Oct-09','%e-%b-%y'),205.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Oct-09','%e-%b-%y'),204.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Oct-09','%e-%b-%y'),198.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Oct-09','%e-%b-%y'),189.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Oct-09','%e-%b-%y'),188.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Oct-09','%e-%b-%y'),190.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Oct-09','%e-%b-%y'),191.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Oct-09','%e-%b-%y'),190.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Oct-09','%e-%b-%y'),190.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Oct-09','%e-%b-%y'),190.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Oct-09','%e-%b-%y'),189.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Oct-09','%e-%b-%y'),190.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-Oct-09','%e-%b-%y'),190.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Oct-09','%e-%b-%y'),186.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Oct-09','%e-%b-%y'),184.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Oct-09','%e-%b-%y'),180.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Sep-09','%e-%b-%y'),185.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Sep-09','%e-%b-%y'),185.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Sep-09','%e-%b-%y'),186.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Sep-09','%e-%b-%y'),182.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Sep-09','%e-%b-%y'),183.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Sep-09','%e-%b-%y'),185.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Sep-09','%e-%b-%y'),184.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Sep-09','%e-%b-%y'),184.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('18-Sep-09','%e-%b-%y'),185.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Sep-09','%e-%b-%y'),184.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Sep-09','%e-%b-%y'),181.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Sep-09','%e-%b-%y'),175.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Sep-09','%e-%b-%y'),173.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Sep-09','%e-%b-%y'),172.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Sep-09','%e-%b-%y'),172.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Sep-09','%e-%b-%y'),171.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Sep-09','%e-%b-%y'),172.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Sep-09','%e-%b-%y'),170.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Sep-09','%e-%b-%y'),166.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Sep-09','%e-%b-%y'),165.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Sep-09','%e-%b-%y'),165.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Aug-09','%e-%b-%y'),168.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Aug-09','%e-%b-%y'),170.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Aug-09','%e-%b-%y'),169.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Aug-09','%e-%b-%y'),167.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Aug-09','%e-%b-%y'),169.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Aug-09','%e-%b-%y'),169.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Aug-09','%e-%b-%y'),169.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Aug-09','%e-%b-%y'),166.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Aug-09','%e-%b-%y'),164.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Aug-09','%e-%b-%y'),164);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Aug-09','%e-%b-%y'),159.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Aug-09','%e-%b-%y'),166.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Aug-09','%e-%b-%y'),168.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Aug-09','%e-%b-%y'),165.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Aug-09','%e-%b-%y'),164.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Aug-09','%e-%b-%y'),165.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Aug-09','%e-%b-%y'),163.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Aug-09','%e-%b-%y'),165.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Aug-09','%e-%b-%y'),165.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Aug-09','%e-%b-%y'),166.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Jul-09','%e-%b-%y'),163.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Jul-09','%e-%b-%y'),162.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Jul-09','%e-%b-%y'),160.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Jul-09','%e-%b-%y'),160);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jul-09','%e-%b-%y'),160.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Jul-09','%e-%b-%y'),159.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jul-09','%e-%b-%y'),157.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Jul-09','%e-%b-%y'),156.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Jul-09','%e-%b-%y'),151.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Jul-09','%e-%b-%y'),152.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jul-09','%e-%b-%y'),151.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Jul-09','%e-%b-%y'),147.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jul-09','%e-%b-%y'),146.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Jul-09','%e-%b-%y'),142.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jul-09','%e-%b-%y'),142.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Jul-09','%e-%b-%y'),138.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jul-09','%e-%b-%y'),136.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Jul-09','%e-%b-%y'),137.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Jul-09','%e-%b-%y'),135.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Jul-09','%e-%b-%y'),138.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jul-09','%e-%b-%y'),140.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Jul-09','%e-%b-%y'),140.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jul-09','%e-%b-%y'),142.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Jun-09','%e-%b-%y'),142.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Jun-09','%e-%b-%y'),141.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Jun-09','%e-%b-%y'),142.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jun-09','%e-%b-%y'),139.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Jun-09','%e-%b-%y'),136.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jun-09','%e-%b-%y'),134.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Jun-09','%e-%b-%y'),137.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jun-09','%e-%b-%y'),139.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jun-09','%e-%b-%y'),135.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jun-09','%e-%b-%y'),135.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Jun-09','%e-%b-%y'),136.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jun-09','%e-%b-%y'),136.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Jun-09','%e-%b-%y'),136.97);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Jun-09','%e-%b-%y'),139.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Jun-09','%e-%b-%y'),140.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jun-09','%e-%b-%y'),142.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Jun-09','%e-%b-%y'),143.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Jun-09','%e-%b-%y'),144.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Jun-09','%e-%b-%y'),143.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jun-09','%e-%b-%y'),140.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Jun-09','%e-%b-%y'),139.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jun-09','%e-%b-%y'),139.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-May-09','%e-%b-%y'),135.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-May-09','%e-%b-%y'),135.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-May-09','%e-%b-%y'),133.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-May-09','%e-%b-%y'),130.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-May-09','%e-%b-%y'),122.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-May-09','%e-%b-%y'),124.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-May-09','%e-%b-%y'),125.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-May-09','%e-%b-%y'),127.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-May-09','%e-%b-%y'),126.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-May-09','%e-%b-%y'),122.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-May-09','%e-%b-%y'),122.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-May-09','%e-%b-%y'),119.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-May-09','%e-%b-%y'),124.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-May-09','%e-%b-%y'),129.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-May-09','%e-%b-%y'),129.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-May-09','%e-%b-%y'),129.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-May-09','%e-%b-%y'),132.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-May-09','%e-%b-%y'),132.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-May-09','%e-%b-%y'),132.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-May-09','%e-%b-%y'),127.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Apr-09','%e-%b-%y'),125.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Apr-09','%e-%b-%y'),125.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Apr-09','%e-%b-%y'),123.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Apr-09','%e-%b-%y'),124.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Apr-09','%e-%b-%y'),123.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Apr-09','%e-%b-%y'),125.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Apr-09','%e-%b-%y'),121.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Apr-09','%e-%b-%y'),121.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Apr-09','%e-%b-%y'),120.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Apr-09','%e-%b-%y'),123.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Apr-09','%e-%b-%y'),121.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Apr-09','%e-%b-%y'),117.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Apr-09','%e-%b-%y'),118.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Apr-09','%e-%b-%y'),120.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Apr-09','%e-%b-%y'),119.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Apr-09','%e-%b-%y'),119.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Apr-09','%e-%b-%y'),116.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Apr-09','%e-%b-%y'),115);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Apr-09','%e-%b-%y'),118.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Apr-09','%e-%b-%y'),115.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Apr-09','%e-%b-%y'),112.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Apr-09','%e-%b-%y'),108.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('31-Mar-09','%e-%b-%y'),105.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Mar-09','%e-%b-%y'),104.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Mar-09','%e-%b-%y'),106.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Mar-09','%e-%b-%y'),109.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Mar-09','%e-%b-%y'),106.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Mar-09','%e-%b-%y'),106.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Mar-09','%e-%b-%y'),107.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Mar-09','%e-%b-%y'),101.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Mar-09','%e-%b-%y'),101.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Mar-09','%e-%b-%y'),101.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Mar-09','%e-%b-%y'),99.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Mar-09','%e-%b-%y'),95.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Mar-09','%e-%b-%y'),95.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Mar-09','%e-%b-%y'),96.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Mar-09','%e-%b-%y'),92.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Mar-09','%e-%b-%y'),88.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Mar-09','%e-%b-%y'),83.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Mar-09','%e-%b-%y'),85.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Mar-09','%e-%b-%y'),88.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Mar-09','%e-%b-%y'),91.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Mar-09','%e-%b-%y'),88.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Mar-09','%e-%b-%y'),87.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Feb-09','%e-%b-%y'),89.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Feb-09','%e-%b-%y'),89.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Feb-09','%e-%b-%y'),91.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Feb-09','%e-%b-%y'),90.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Feb-09','%e-%b-%y'),86.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Feb-09','%e-%b-%y'),91.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Feb-09','%e-%b-%y'),90.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Feb-09','%e-%b-%y'),94.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Feb-09','%e-%b-%y'),94.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Feb-09','%e-%b-%y'),99.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Feb-09','%e-%b-%y'),99.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Feb-09','%e-%b-%y'),96.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Feb-09','%e-%b-%y'),97.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Feb-09','%e-%b-%y'),102.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-Feb-09','%e-%b-%y'),99.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Feb-09','%e-%b-%y'),96.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Feb-09','%e-%b-%y'),93.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Feb-09','%e-%b-%y'),92.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Feb-09','%e-%b-%y'),91.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Jan-09','%e-%b-%y'),90.13);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Jan-09','%e-%b-%y'),93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jan-09','%e-%b-%y'),94.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Jan-09','%e-%b-%y'),90.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Jan-09','%e-%b-%y'),89.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Jan-09','%e-%b-%y'),88.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jan-09','%e-%b-%y'),88.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Jan-09','%e-%b-%y'),82.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Jan-09','%e-%b-%y'),78.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Jan-09','%e-%b-%y'),82.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jan-09','%e-%b-%y'),83.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Jan-09','%e-%b-%y'),85.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jan-09','%e-%b-%y'),87.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Jan-09','%e-%b-%y'),88.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jan-09','%e-%b-%y'),90.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Jan-09','%e-%b-%y'),92.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Jan-09','%e-%b-%y'),91.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Jan-09','%e-%b-%y'),93.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Jan-09','%e-%b-%y'),94.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Jan-09','%e-%b-%y'),90.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jan-09','%e-%b-%y'),85.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Dec-08','%e-%b-%y'),85.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Dec-08','%e-%b-%y'),86.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Dec-08','%e-%b-%y'),86.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Dec-08','%e-%b-%y'),85.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Dec-08','%e-%b-%y'),85.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Dec-08','%e-%b-%y'),85.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Dec-08','%e-%b-%y'),86.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Dec-08','%e-%b-%y'),85.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Dec-08','%e-%b-%y'),90);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Dec-08','%e-%b-%y'),89.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Dec-08','%e-%b-%y'),89.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Dec-08','%e-%b-%y'),95.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Dec-08','%e-%b-%y'),94.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Dec-08','%e-%b-%y'),98.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Dec-08','%e-%b-%y'),95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Dec-08','%e-%b-%y'),98.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Dec-08','%e-%b-%y'),100.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Dec-08','%e-%b-%y'),99.72);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Dec-08','%e-%b-%y'),94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Dec-08','%e-%b-%y'),91.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Dec-08','%e-%b-%y'),95.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Dec-08','%e-%b-%y'),92.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-Dec-08','%e-%b-%y'),88.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Nov-08','%e-%b-%y'),92.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Nov-08','%e-%b-%y'),95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Nov-08','%e-%b-%y'),95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Nov-08','%e-%b-%y'),90.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Nov-08','%e-%b-%y'),92.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Nov-08','%e-%b-%y'),82.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Nov-08','%e-%b-%y'),80.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Nov-08','%e-%b-%y'),86.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Nov-08','%e-%b-%y'),89.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Nov-08','%e-%b-%y'),88.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Nov-08','%e-%b-%y'),90.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Nov-08','%e-%b-%y'),96.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Nov-08','%e-%b-%y'),90.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Nov-08','%e-%b-%y'),94.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Nov-08','%e-%b-%y'),95.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Nov-08','%e-%b-%y'),98.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Nov-08','%e-%b-%y'),99.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Nov-08','%e-%b-%y'),103.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Nov-08','%e-%b-%y'),110.99);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Nov-08','%e-%b-%y'),106.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Oct-08','%e-%b-%y'),107.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Oct-08','%e-%b-%y'),111.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Oct-08','%e-%b-%y'),104.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Oct-08','%e-%b-%y'),99.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Oct-08','%e-%b-%y'),92.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Oct-08','%e-%b-%y'),96.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Oct-08','%e-%b-%y'),98.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Oct-08','%e-%b-%y'),96.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Oct-08','%e-%b-%y'),91.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Oct-08','%e-%b-%y'),98.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Oct-08','%e-%b-%y'),97.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Oct-08','%e-%b-%y'),101.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Oct-08','%e-%b-%y'),97.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Oct-08','%e-%b-%y'),104.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Oct-08','%e-%b-%y'),110.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Oct-08','%e-%b-%y'),96.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Oct-08','%e-%b-%y'),88.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Oct-08','%e-%b-%y'),89.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Oct-08','%e-%b-%y'),89.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Oct-08','%e-%b-%y'),98.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Oct-08','%e-%b-%y'),97.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('2-Oct-08','%e-%b-%y'),100.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Oct-08','%e-%b-%y'),109.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Sep-08','%e-%b-%y'),113.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Sep-08','%e-%b-%y'),105.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Sep-08','%e-%b-%y'),128.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Sep-08','%e-%b-%y'),131.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('24-Sep-08','%e-%b-%y'),128.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Sep-08','%e-%b-%y'),126.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Sep-08','%e-%b-%y'),131.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Sep-08','%e-%b-%y'),140.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Sep-08','%e-%b-%y'),134.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Sep-08','%e-%b-%y'),127.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Sep-08','%e-%b-%y'),139.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Sep-08','%e-%b-%y'),140.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Sep-08','%e-%b-%y'),148.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Sep-08','%e-%b-%y'),152.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Sep-08','%e-%b-%y'),151.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Sep-08','%e-%b-%y'),151.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Sep-08','%e-%b-%y'),157.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Sep-08','%e-%b-%y'),160.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Sep-08','%e-%b-%y'),161.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Sep-08','%e-%b-%y'),166.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Sep-08','%e-%b-%y'),166.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Aug-08','%e-%b-%y'),169.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Aug-08','%e-%b-%y'),173.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Aug-08','%e-%b-%y'),174.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Aug-08','%e-%b-%y'),173.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Aug-08','%e-%b-%y'),172.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-Aug-08','%e-%b-%y'),176.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Aug-08','%e-%b-%y'),174.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Aug-08','%e-%b-%y'),175.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Aug-08','%e-%b-%y'),173.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Aug-08','%e-%b-%y'),175.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Aug-08','%e-%b-%y'),175.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Aug-08','%e-%b-%y'),179.32);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Aug-08','%e-%b-%y'),179.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Aug-08','%e-%b-%y'),176.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Aug-08','%e-%b-%y'),173.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Aug-08','%e-%b-%y'),169.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Aug-08','%e-%b-%y'),163.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Aug-08','%e-%b-%y'),164.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Aug-08','%e-%b-%y'),160.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Aug-08','%e-%b-%y'),153.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Aug-08','%e-%b-%y'),156.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Jul-08','%e-%b-%y'),158.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Jul-08','%e-%b-%y'),159.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Jul-08','%e-%b-%y'),157.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jul-08','%e-%b-%y'),154.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Jul-08','%e-%b-%y'),162.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Jul-08','%e-%b-%y'),159.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Jul-08','%e-%b-%y'),166.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jul-08','%e-%b-%y'),162.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Jul-08','%e-%b-%y'),166.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Jul-08','%e-%b-%y'),165.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Jul-08','%e-%b-%y'),171.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Jul-08','%e-%b-%y'),172.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Jul-08','%e-%b-%y'),169.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jul-08','%e-%b-%y'),173.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jul-08','%e-%b-%y'),172.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Jul-08','%e-%b-%y'),176.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-Jul-08','%e-%b-%y'),174.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Jul-08','%e-%b-%y'),179.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Jul-08','%e-%b-%y'),175.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jul-08','%e-%b-%y'),170.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Jul-08','%e-%b-%y'),168.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Jul-08','%e-%b-%y'),174.68);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Jun-08','%e-%b-%y'),167.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jun-08','%e-%b-%y'),170.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Jun-08','%e-%b-%y'),168.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jun-08','%e-%b-%y'),177.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Jun-08','%e-%b-%y'),173.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jun-08','%e-%b-%y'),173.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('20-Jun-08','%e-%b-%y'),175.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jun-08','%e-%b-%y'),180.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jun-08','%e-%b-%y'),178.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jun-08','%e-%b-%y'),181.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Jun-08','%e-%b-%y'),176.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jun-08','%e-%b-%y'),172.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Jun-08','%e-%b-%y'),173.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Jun-08','%e-%b-%y'),180.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Jun-08','%e-%b-%y'),185.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jun-08','%e-%b-%y'),181.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Jun-08','%e-%b-%y'),185.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Jun-08','%e-%b-%y'),189.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Jun-08','%e-%b-%y'),185.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jun-08','%e-%b-%y'),185.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Jun-08','%e-%b-%y'),186.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-May-08','%e-%b-%y'),188.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-May-08','%e-%b-%y'),186.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-May-08','%e-%b-%y'),187.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-May-08','%e-%b-%y'),186.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-May-08','%e-%b-%y'),181.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('22-May-08','%e-%b-%y'),177.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-May-08','%e-%b-%y'),178.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-May-08','%e-%b-%y'),185.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-May-08','%e-%b-%y'),183.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-May-08','%e-%b-%y'),187.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-May-08','%e-%b-%y'),189.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-May-08','%e-%b-%y'),186.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-May-08','%e-%b-%y'),189.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-May-08','%e-%b-%y'),188.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-May-08','%e-%b-%y'),183.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-May-08','%e-%b-%y'),185.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-May-08','%e-%b-%y'),182.59);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-May-08','%e-%b-%y'),186.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-May-08','%e-%b-%y'),184.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-May-08','%e-%b-%y'),180.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-May-08','%e-%b-%y'),180);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('30-Apr-08','%e-%b-%y'),173.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-Apr-08','%e-%b-%y'),175.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('28-Apr-08','%e-%b-%y'),172.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Apr-08','%e-%b-%y'),169.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Apr-08','%e-%b-%y'),168.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Apr-08','%e-%b-%y'),162.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('22-Apr-08','%e-%b-%y'),160.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Apr-08','%e-%b-%y'),168.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Apr-08','%e-%b-%y'),161.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Apr-08','%e-%b-%y'),154.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Apr-08','%e-%b-%y'),153.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Apr-08','%e-%b-%y'),148.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Apr-08','%e-%b-%y'),147.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Apr-08','%e-%b-%y'),147.14);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Apr-08','%e-%b-%y'),154.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Apr-08','%e-%b-%y'),151.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Apr-08','%e-%b-%y'),152.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Apr-08','%e-%b-%y'),155.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Apr-08','%e-%b-%y'),153.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Apr-08','%e-%b-%y'),151.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Apr-08','%e-%b-%y'),147.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Apr-08','%e-%b-%y'),149.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Mar-08','%e-%b-%y'),143.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Mar-08','%e-%b-%y'),143.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('27-Mar-08','%e-%b-%y'),140.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Mar-08','%e-%b-%y'),145.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Mar-08','%e-%b-%y'),140.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Mar-08','%e-%b-%y'),139.53);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Mar-08','%e-%b-%y'),133.27);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Mar-08','%e-%b-%y'),129.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('18-Mar-08','%e-%b-%y'),132.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Mar-08','%e-%b-%y'),126.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Mar-08','%e-%b-%y'),126.61);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Mar-08','%e-%b-%y'),127.94);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Mar-08','%e-%b-%y'),126.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Mar-08','%e-%b-%y'),127.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Mar-08','%e-%b-%y'),119.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Mar-08','%e-%b-%y'),122.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Mar-08','%e-%b-%y'),120.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Mar-08','%e-%b-%y'),124.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Mar-08','%e-%b-%y'),124.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Mar-08','%e-%b-%y'),121.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Feb-08','%e-%b-%y'),125.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Feb-08','%e-%b-%y'),129.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Feb-08','%e-%b-%y'),122.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Feb-08','%e-%b-%y'),119.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Feb-08','%e-%b-%y'),119.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Feb-08','%e-%b-%y'),119.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Feb-08','%e-%b-%y'),121.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Feb-08','%e-%b-%y'),123.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Feb-08','%e-%b-%y'),122.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Feb-08','%e-%b-%y'),124.63);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Feb-08','%e-%b-%y'),127.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Feb-08','%e-%b-%y'),129.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('12-Feb-08','%e-%b-%y'),124.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Feb-08','%e-%b-%y'),129.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Feb-08','%e-%b-%y'),125.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Feb-08','%e-%b-%y'),121.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Feb-08','%e-%b-%y'),122);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Feb-08','%e-%b-%y'),129.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('4-Feb-08','%e-%b-%y'),131.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Feb-08','%e-%b-%y'),133.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Jan-08','%e-%b-%y'),135.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Jan-08','%e-%b-%y'),132.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Jan-08','%e-%b-%y'),131.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jan-08','%e-%b-%y'),130.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Jan-08','%e-%b-%y'),130.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Jan-08','%e-%b-%y'),135.6);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Jan-08','%e-%b-%y'),139.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jan-08','%e-%b-%y'),155.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('18-Jan-08','%e-%b-%y'),161.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jan-08','%e-%b-%y'),160.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('16-Jan-08','%e-%b-%y'),159.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Jan-08','%e-%b-%y'),169.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('14-Jan-08','%e-%b-%y'),178.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Jan-08','%e-%b-%y'),172.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('10-Jan-08','%e-%b-%y'),178.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jan-08','%e-%b-%y'),179.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('8-Jan-08','%e-%b-%y'),171.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Jan-08','%e-%b-%y'),177.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('4-Jan-08','%e-%b-%y'),180.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('3-Jan-08','%e-%b-%y'),194.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Jan-08','%e-%b-%y'),194.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Dec-07','%e-%b-%y'),198.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('28-Dec-07','%e-%b-%y'),199.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Dec-07','%e-%b-%y'),198.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('26-Dec-07','%e-%b-%y'),198.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Dec-07','%e-%b-%y'),198.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Dec-07','%e-%b-%y'),193.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Dec-07','%e-%b-%y'),187.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Dec-07','%e-%b-%y'),183.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Dec-07','%e-%b-%y'),182.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Dec-07','%e-%b-%y'),184.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Dec-07','%e-%b-%y'),190.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Dec-07','%e-%b-%y'),191.83);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Dec-07','%e-%b-%y'),190.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Dec-07','%e-%b-%y'),188.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Dec-07','%e-%b-%y'),194.21);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Dec-07','%e-%b-%y'),194.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Dec-07','%e-%b-%y'),189.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Dec-07','%e-%b-%y'),185.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Dec-07','%e-%b-%y'),179.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('3-Dec-07','%e-%b-%y'),178.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Nov-07','%e-%b-%y'),182.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('29-Nov-07','%e-%b-%y'),184.29);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Nov-07','%e-%b-%y'),180.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Nov-07','%e-%b-%y'),174.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Nov-07','%e-%b-%y'),172.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('23-Nov-07','%e-%b-%y'),171.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('21-Nov-07','%e-%b-%y'),168.46);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Nov-07','%e-%b-%y'),168.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Nov-07','%e-%b-%y'),163.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Nov-07','%e-%b-%y'),166.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('15-Nov-07','%e-%b-%y'),164.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('14-Nov-07','%e-%b-%y'),166.11);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Nov-07','%e-%b-%y'),169.96);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Nov-07','%e-%b-%y'),153.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Nov-07','%e-%b-%y'),165.37);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('8-Nov-07','%e-%b-%y'),175.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('7-Nov-07','%e-%b-%y'),186.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('6-Nov-07','%e-%b-%y'),191.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Nov-07','%e-%b-%y'),186.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('2-Nov-07','%e-%b-%y'),187.87);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('1-Nov-07','%e-%b-%y'),187.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Oct-07','%e-%b-%y'),189.95);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Oct-07','%e-%b-%y'),187);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Oct-07','%e-%b-%y'),185.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Oct-07','%e-%b-%y'),184.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Oct-07','%e-%b-%y'),182.78);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Oct-07','%e-%b-%y'),185.93);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Oct-07','%e-%b-%y'),186.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Oct-07','%e-%b-%y'),174.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('19-Oct-07','%e-%b-%y'),170.42);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Oct-07','%e-%b-%y'),173.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Oct-07','%e-%b-%y'),172.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Oct-07','%e-%b-%y'),169.58);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Oct-07','%e-%b-%y'),166.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Oct-07','%e-%b-%y'),167.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('11-Oct-07','%e-%b-%y'),162.23);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Oct-07','%e-%b-%y'),166.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Oct-07','%e-%b-%y'),167.86);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Oct-07','%e-%b-%y'),167.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Oct-07','%e-%b-%y'),161.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Oct-07','%e-%b-%y'),156.24);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('3-Oct-07','%e-%b-%y'),157.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Oct-07','%e-%b-%y'),158.45);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Oct-07','%e-%b-%y'),156.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Sep-07','%e-%b-%y'),153.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Sep-07','%e-%b-%y'),154.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Sep-07','%e-%b-%y'),152.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-Sep-07','%e-%b-%y'),153.18);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Sep-07','%e-%b-%y'),148.28);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-Sep-07','%e-%b-%y'),144.15);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Sep-07','%e-%b-%y'),140.31);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Sep-07','%e-%b-%y'),140.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Sep-07','%e-%b-%y'),140.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-Sep-07','%e-%b-%y'),138.41);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Sep-07','%e-%b-%y'),138.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('13-Sep-07','%e-%b-%y'),137.2);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Sep-07','%e-%b-%y'),136.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Sep-07','%e-%b-%y'),135.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Sep-07','%e-%b-%y'),136.71);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('7-Sep-07','%e-%b-%y'),131.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Sep-07','%e-%b-%y'),135.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('5-Sep-07','%e-%b-%y'),136.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Sep-07','%e-%b-%y'),144.16);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('31-Aug-07','%e-%b-%y'),138.48);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Aug-07','%e-%b-%y'),136.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Aug-07','%e-%b-%y'),134.08);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Aug-07','%e-%b-%y'),126.82);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Aug-07','%e-%b-%y'),132.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Aug-07','%e-%b-%y'),135.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-Aug-07','%e-%b-%y'),131.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Aug-07','%e-%b-%y'),132.51);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Aug-07','%e-%b-%y'),127.57);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Aug-07','%e-%b-%y'),122.22);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('17-Aug-07','%e-%b-%y'),122.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-Aug-07','%e-%b-%y'),117.05);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Aug-07','%e-%b-%y'),119.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Aug-07','%e-%b-%y'),124.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Aug-07','%e-%b-%y'),127.79);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-Aug-07','%e-%b-%y'),125);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('9-Aug-07','%e-%b-%y'),126.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Aug-07','%e-%b-%y'),134.01);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Aug-07','%e-%b-%y'),135.03);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Aug-07','%e-%b-%y'),135.25);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('3-Aug-07','%e-%b-%y'),131.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Aug-07','%e-%b-%y'),136.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Aug-07','%e-%b-%y'),135);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-Jul-07','%e-%b-%y'),131.76);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-Jul-07','%e-%b-%y'),141.43);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('27-Jul-07','%e-%b-%y'),143.85);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('26-Jul-07','%e-%b-%y'),146);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('25-Jul-07','%e-%b-%y'),137.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('24-Jul-07','%e-%b-%y'),134.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('23-Jul-07','%e-%b-%y'),143.7);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('20-Jul-07','%e-%b-%y'),143.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('19-Jul-07','%e-%b-%y'),140);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('18-Jul-07','%e-%b-%y'),138.12);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('17-Jul-07','%e-%b-%y'),138.91);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('16-Jul-07','%e-%b-%y'),138.1);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('13-Jul-07','%e-%b-%y'),137.73);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('12-Jul-07','%e-%b-%y'),134.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('11-Jul-07','%e-%b-%y'),132.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('10-Jul-07','%e-%b-%y'),132.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('9-Jul-07','%e-%b-%y'),130.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('6-Jul-07','%e-%b-%y'),132.3);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('5-Jul-07','%e-%b-%y'),132.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-Jul-07','%e-%b-%y'),127.17);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-Jul-07','%e-%b-%y'),121.26);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('29-Jun-07','%e-%b-%y'),122.04);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('28-Jun-07','%e-%b-%y'),120.56);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Jun-07','%e-%b-%y'),121.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Jun-07','%e-%b-%y'),119.65);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Jun-07','%e-%b-%y'),122.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-Jun-07','%e-%b-%y'),123);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('21-Jun-07','%e-%b-%y'),123.9);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('20-Jun-07','%e-%b-%y'),121.55);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('19-Jun-07','%e-%b-%y'),123.66);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-Jun-07','%e-%b-%y'),125.09);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-Jun-07','%e-%b-%y'),120.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-Jun-07','%e-%b-%y'),118.75);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('13-Jun-07','%e-%b-%y'),117.5);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('12-Jun-07','%e-%b-%y'),120.38);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-Jun-07','%e-%b-%y'),120.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-Jun-07','%e-%b-%y'),124.49);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-Jun-07','%e-%b-%y'),124.07);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('6-Jun-07','%e-%b-%y'),123.64);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('5-Jun-07','%e-%b-%y'),122.67);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-Jun-07','%e-%b-%y'),121.33);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('1-Jun-07','%e-%b-%y'),118.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('31-May-07','%e-%b-%y'),121.19);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('30-May-07','%e-%b-%y'),118.77);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('29-May-07','%e-%b-%y'),114.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('25-May-07','%e-%b-%y'),113.62);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-May-07','%e-%b-%y'),110.69);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('23-May-07','%e-%b-%y'),112.89);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('22-May-07','%e-%b-%y'),113.54);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('21-May-07','%e-%b-%y'),111.98);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('18-May-07','%e-%b-%y'),110.02);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('17-May-07','%e-%b-%y'),109.44);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('16-May-07','%e-%b-%y'),107.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('15-May-07','%e-%b-%y'),107.52);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('14-May-07','%e-%b-%y'),109.36);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('11-May-07','%e-%b-%y'),108.74);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('10-May-07','%e-%b-%y'),107.34);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('9-May-07','%e-%b-%y'),106.88);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('8-May-07','%e-%b-%y'),105.06);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('7-May-07','%e-%b-%y'),103.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('4-May-07','%e-%b-%y'),100.81);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('3-May-07','%e-%b-%y'),100.4);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('2-May-07','%e-%b-%y'),100.39);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series3',STR_TO_DATE('1-May-07','%e-%b-%y'),99.47);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('30-Apr-07','%e-%b-%y'),99.8);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('27-Apr-07','%e-%b-%y'),99.92);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('26-Apr-07','%e-%b-%y'),98.84);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series2',STR_TO_DATE('25-Apr-07','%e-%b-%y'),95.35);
+Insert into demo_line_chart (series, log_date, data_value) values ('Series1',STR_TO_DATE('24-Apr-07','%e-%b-%y'),93.24);
+
+-- DEMO_PIE_CHART
+Insert into demo_pie_chart (legend, data_value) values ('One', 5);
+Insert into demo_pie_chart (legend, data_value) values ('Two', 2);
+Insert into demo_pie_chart (legend, data_value) values ('Three', 9);
+Insert into demo_pie_chart (legend, data_value) values ('Four', 7);
+Insert into demo_pie_chart (legend, data_value) values ('Five', 4);
+Insert into demo_pie_chart (legend, data_value) values ('Six', 3);
+Insert into demo_pie_chart (legend, data_value) values ('Seven', .5);
+  
+  
+-- DEMO_SCATTER_CHART
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (4.1, 'Particulate', 122);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (4.3, 'Particulate', 117);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (5.7, 'Particulate', 112);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (5.4, 'Particulate', 114);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (5.9, 'Particulate', 110);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (5.0, 'Particulate', 114);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (3.6, 'Particulate', 128);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (1.9, 'Particulate', 137);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (7.3, 'Particulate', 104);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (6.9, 'Humidity', 119);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (7.9, 'Humidity', 118);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (9.8, 'Humidity', 103);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (4.9, 'Humidity', 137);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (6.8, 'Humidity', 102);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (4.7, 'Humidity', 89);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (2.7, 'Humidity', 98);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (3.7, 'Humidity', 145);
+Insert into demo_scatter_chart (rainfall, key_value, measurements) values (7.4, 'Humidity', 118);  
+
+-- DEMO_SCATTER_PLOT 
+
+-- SET DEFINE OFF;
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -46.5901128883449, -464.477370615131);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -85.0293361247543, -362.252178232471);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 70.9700275365898, 402.214363675566);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -50.1110580054506, -310.108907443154);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 85.043005750476, 813.481841353449);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -14.2356123424179, -134.200903707809);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -66.7014933188071, -445.754374526706);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -79.941582021797, -694.089097548454);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -64.4665101305822, -431.660620986243);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 13.718818366452, 100.010719918027);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 35.457456199233, 223.254643848734);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 55.2326402548387, 268.940835852805);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -32.9989160276248, -237.280626944034);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -0.464911506111831, -2.65656324666862);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -59.0205101710777, -498.895652307826);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 28.0939970575828, 117.200615553207);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 31.7305239061572, 186.662624012256);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 50.9035126419798, 440.937283203403);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 58.3875046571053, 547.879249694999);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 76.7846997917459, 525.020578968308);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 1.73485745801611, 7.28149474936192);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 15.304841061276, 71.2374666595537);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 75.1342455000693, 381.145932349436);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -58.2087417684623, -573.630956069476);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 76.7977837302114, 624.733726327778);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 56.3295585433654, 309.697529902676);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -9.27601440680639, -49.5126219388194);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 98.3002030040236, 765.653589829535);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -25.0987502451517, -174.651201240269);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 39.9215299020147, 337.889176256456);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 77.9225832868337, 356.183903852096);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 75.4311841137638, 14.5258766665983);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 58.9445375968278, 376.359576288564);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', 46.9521897141796, 3.5679984193934);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -49.0378307695689, -230.816092788509);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -96.2461776340861, -863.765255159092);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -96.3388912796447, -538.147283544646);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -21.4684477767032, -200.140077054848);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -30.3532837083366, -226.462637188158);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample0', -17.5055590488884, -118.709622452841);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 56.6394671790491, 385.48951169801);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 70.4622912302344, 356.986529538635);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 58.2647422222769, 489.418744916999);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -92.16093253903, -425.576081634713);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -2.64574970943097, -26.190027661226);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -16.7568654181289, -117.460886096034);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 68.215377945908, 606.917788617984);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 53.7387814434413, 367.53491797949);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -51.8861573715238, -289.998186955562);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -15.9721784074351, -75.335027134323);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 63.2540648905791, 602.546517566905);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -53.376167960458, -470.921238684285);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 40.8307443439851, 276.112653117961);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -13.0540977188468, -127.648158921993);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -43.7358336047599, -435.080470107322);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -74.5673321340732, -617.960236798371);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -6.47907144443936, -55.654651151187);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 68.1915507628225, 352.320728639801);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -23.5393521654339, -137.714557244391);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 28.3621412621467, 141.103859877604);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -99.5615230664525, -974.857161307048);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -77.7132553058204, -736.182131225006);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 95.9321864873013, 478.286112499176);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 97.7451855292708, 940.301427763062);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -10.2483179758141, -70.1145330070458);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -24.0750124187893, -113.523998470537);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -5.5721118558967, -43.8516395203455);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -55.5378338160537, -368.506951528332);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 52.6669516338013, 38.2926120131942);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -74.1981412067658, -436.990411988621);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -8.70511941690364, -71.3277811558721);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 63.2921735621378, 534.825008407329);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 97.9066635843841, 678.994971737474);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -83.1613916743288, -494.53303650568);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 23.4730547863992, 223.031148353333);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 40.6105099506845, 199.937366405274);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 35.4473225526307, 331.61786915261);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 27.2050975460142, 146.277993239147);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', -1.54684302938646, -12.6706471561247);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample1', 45.8386162291745, 401.780882699918);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 43.4241956158593, 228.71488367607);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -23.4517134254585, -165.958577325218);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -98.8954664030229, -829.964553125469);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 48.0527046113198, 451.527720751234);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -77.8912947988124, -416.867729852279);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 23.8325471824168, 206.907438743452);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 83.2787398847467, 814.01250022556);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 49.1572992549647, 451.03037365466);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -11.1351768833872, -57.3863334655361);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 71.1980242104626, 572.745863967841);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 15.0952976022392, 103.30274980367);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 75.0300005037414, 406.581640027236);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -82.0092720309019, -690.340287049552);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 40.2433497232209, 363.579616486762);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 26.8157962678174, 262.150124949525);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -83.9563210001448, -432.739081022174);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -20.6480437627346, -161.330015497217);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 37.1388896882226, 161.352404658606);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 20.2126667486174, 168.833789818416);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 58.3723632769494, 293.206814023827);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -20.2876832456236, -88.0090685884954);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 72.9768050433371, 691.684023528398);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -21.6612128833675, -130.834158714088);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 97.4870524045038, 806.47904449193);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 60.6688063197852, 255.749289305775);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -44.235772358471, -336.262226570567);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -47.39573087854, -321.133647936626);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -24.7522484346097, -204.548308435727);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -42.903238078129, -239.651563752902);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 20.4656734934697, 172.700213789797);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 56.0665747085147, 365.360390019834);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 31.9979219049038, 237.490140339893);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -29.9884426739069, -203.821484170813);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 13.5011085362703, 79.4784314297668);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 41.8402945507358, 297.04934398378);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -84.9323678979223, -345.2331996232);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', -42.2469964847455, -361.468816319656);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 98.1057699772752, 445.181262282444);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 95.5327901766563, 522.663100406047);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample2', 35.0916611161316, 246.796980313209);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 99.3987950082867, 401.97428571655);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -3.0419413965969, -14.5325761725203);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -79.388026451666, -701.817589967372);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -88.451242397524, -668.370526000304);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 34.3131838963851, 254.418322223563);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -61.518208630511, -347.521623572776);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 45.6124480237487, 356.33565541369);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -1.0716036518037, -7.80544934354423);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 31.7371714687412, 283.925868763573);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -76.771029786315, -626.268489584739);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -67.913690110843, -614.736930677921);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 34.9311671860034, 171.384205820777);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 94.3264454603021, 914.267819214392);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 76.7493996267558, 705.649611960615);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -87.795202856922, -749.505178721718);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 2.10914716736019, 15.4036733330536);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -50.456669557937, -318.410608422062);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -94.646644883092, -734.660992935541);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 34.9170862075359, 347.583881438806);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 44.3524585090071, 294.615219199443);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -67.191016143335, -609.956472872497);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -78.826443879164, -369.129912603377);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -50.427554400015, -418.144241602024);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -70.371769526721, -307.02193189609);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 16.3220947890044, 97.0997346831135);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -47.067245718878, -398.27032236792);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 5.91206661301702, 24.7239863780181);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -99.621681801868, -843.593457399484);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 87.4503492670535, 695.345037859433);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -91.176921118057, -683.305064255346);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -0.6632900001386, -5.34157539224209);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 2.98188785882178, 12.1181973600389);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 30.6008700087597, 205.922863867274);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 7.90348761612496, 65.5271597329641);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 40.3565229854156, 268.058138389501);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 37.6892733312091, 247.519083233639);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 16.4759733864001, 107.72661087278);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -53.578492311122, -369.768816039059);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', 77.1292326560541, 765.262108306778);
+Insert into demo_scatter_plot
+   (SERIES, VALUEX, VALUEY)
+ Values
+   ('Sample3', -79.566811593352, -677.545127214159);
+
+-- DEMO_UTIL_CHART
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-17','%Y-%m-%d'),53.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-10','%Y-%m-%d'),62.95747);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-21','%Y-%m-%d'),48.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-22','%Y-%m-%d'),51.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-11','%Y-%m-%d'),56.13373);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-23','%Y-%m-%d'),53.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-12','%Y-%m-%d'),57.05287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-24','%Y-%m-%d'),51.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-13','%Y-%m-%d'),55.78947);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-25','%Y-%m-%d'),54.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-14','%Y-%m-%d'),63.34907);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-26','%Y-%m-%d'),50.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-15','%Y-%m-%d'),52.21327);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-27','%Y-%m-%d'),48.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-16','%Y-%m-%d'),51.32080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-28','%Y-%m-%d'),50.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-17','%Y-%m-%d'),58.35720);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-29','%Y-%m-%d'),51.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-18','%Y-%m-%d'),57.62293);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-04-30','%Y-%m-%d'),67.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-19','%Y-%m-%d'),55.25000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-01','%Y-%m-%d'),59.89393);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-20','%Y-%m-%d'),58.79573);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-02','%Y-%m-%d'),61.20753);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-21','%Y-%m-%d'),54.09720);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-03','%Y-%m-%d'),58.98340);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-22','%Y-%m-%d'),59.95813);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-04','%Y-%m-%d'),59.55873);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-23','%Y-%m-%d'),62.03067);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-05','%Y-%m-%d'),58.73680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-24','%Y-%m-%d'),61.97620);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-06','%Y-%m-%d'),59.89967);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-25','%Y-%m-%d'),58.00207);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-07','%Y-%m-%d'),60.67973);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-26','%Y-%m-%d'),59.95440);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-08','%Y-%m-%d'),60.85913);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-27','%Y-%m-%d'),55.43747);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-09','%Y-%m-%d'),60.62460);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-28','%Y-%m-%d'),52.53933);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-10','%Y-%m-%d'),59.51887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-29','%Y-%m-%d'),57.46260);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-11','%Y-%m-%d'),61.57187);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-30','%Y-%m-%d'),60.04787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-12','%Y-%m-%d'),60.70000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-31','%Y-%m-%d'),58.79480);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-13','%Y-%m-%d'),69.85133);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-01','%Y-%m-%d'),54.40107);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-14','%Y-%m-%d'),68.99620);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-02','%Y-%m-%d'),62.26007);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-15','%Y-%m-%d'),67.64080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-03','%Y-%m-%d'),60.72360);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-16','%Y-%m-%d'),59.71433);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-04','%Y-%m-%d'),60.95847);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-17','%Y-%m-%d'),59.99667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-05','%Y-%m-%d'),59.45920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-18','%Y-%m-%d'),63.27207);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-06','%Y-%m-%d'),60.58620);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-19','%Y-%m-%d'),60.32080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-07','%Y-%m-%d'),61.94207);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-20','%Y-%m-%d'),57.32907);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-08','%Y-%m-%d'),59.03327);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-21','%Y-%m-%d'),59.76933);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-09','%Y-%m-%d'),62.83087);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-22','%Y-%m-%d'),59.12453);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-10','%Y-%m-%d'),59.36840);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-23','%Y-%m-%d'),57.10167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-11','%Y-%m-%d'),56.11480);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-24','%Y-%m-%d'),58.45820);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-12','%Y-%m-%d'),62.23393);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-25','%Y-%m-%d'),59.45440);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-13','%Y-%m-%d'),59.72313);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-26','%Y-%m-%d'),60.12807);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-14','%Y-%m-%d'),53.37093);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-27','%Y-%m-%d'),59.11760);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-15','%Y-%m-%d'),52.99233);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-28','%Y-%m-%d'),57.32020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-16','%Y-%m-%d'),55.99080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-29','%Y-%m-%d'),59.80360);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-17','%Y-%m-%d'),53.93853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-30','%Y-%m-%d'),66.73280);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-18','%Y-%m-%d'),55.99313);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-05-31','%Y-%m-%d'),58.78673);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-19','%Y-%m-%d'),68.23393);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-01','%Y-%m-%d'),58.82773);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-20','%Y-%m-%d'),61.86213);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-02','%Y-%m-%d'),63.12100);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-21','%Y-%m-%d'),61.20307);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-03','%Y-%m-%d'),59.70467);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-22','%Y-%m-%d'),61.05900);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-04','%Y-%m-%d'),58.85173);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-23','%Y-%m-%d'),58.41040);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-05','%Y-%m-%d'),61.21880);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-24','%Y-%m-%d'),59.15967);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-06','%Y-%m-%d'),58.99920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-25','%Y-%m-%d'),56.42153);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-07','%Y-%m-%d'),59.94693);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-26','%Y-%m-%d'),60.46580);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-08','%Y-%m-%d'),66.27293);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-27','%Y-%m-%d'),57.44333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-09','%Y-%m-%d'),61.46773);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-28','%Y-%m-%d'),56.88887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-10','%Y-%m-%d'),59.70467);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-29','%Y-%m-%d'),61.85773);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-11','%Y-%m-%d'),60.16000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-09-30','%Y-%m-%d'),61.96400);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-12','%Y-%m-%d'),61.20300);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-01','%Y-%m-%d'),65.88833);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-13','%Y-%m-%d'),60.95673);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-02','%Y-%m-%d'),62.67920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-14','%Y-%m-%d'),60.70207);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-03','%Y-%m-%d'),63.52047);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-15','%Y-%m-%d'),61.02520);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-04','%Y-%m-%d'),58.60280);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-16','%Y-%m-%d'),60.33953);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-05','%Y-%m-%d'),63.74487);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-17','%Y-%m-%d'),61.20300);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-06','%Y-%m-%d'),59.94880);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-18','%Y-%m-%d'),63.12100);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-07','%Y-%m-%d'),59.44380);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-23','%Y-%m-%d'),61.09153);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-08','%Y-%m-%d'),59.16320);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-24','%Y-%m-%d'),61.28867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-09','%Y-%m-%d'),60.84593);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-25','%Y-%m-%d'),60.95673);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-10','%Y-%m-%d'),58.84113);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-26','%Y-%m-%d'),60.61100);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-11','%Y-%m-%d'),62.59827);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-27','%Y-%m-%d'),61.22913);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-12','%Y-%m-%d'),60.94660);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-28','%Y-%m-%d'),58.88507);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-13','%Y-%m-%d'),59.37593);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-29','%Y-%m-%d'),59.73693);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-14','%Y-%m-%d'),67.21840);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-06-30','%Y-%m-%d'),62.45307);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-15','%Y-%m-%d'),68.56020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-01','%Y-%m-%d'),61.30167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-16','%Y-%m-%d'),57.56493);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-02','%Y-%m-%d'),62.92727);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-17','%Y-%m-%d'),57.02280);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-03','%Y-%m-%d'),60.05887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-18','%Y-%m-%d'),56.20947);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-06','%Y-%m-%d'),61.20100);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-19','%Y-%m-%d'),55.69353);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-07','%Y-%m-%d'),60.66120);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-20','%Y-%m-%d'),57.17640);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-08','%Y-%m-%d'),59.78180);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-21','%Y-%m-%d'),57.50867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-09','%Y-%m-%d'),58.74653);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-22','%Y-%m-%d'),61.67860);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-10','%Y-%m-%d'),59.77893);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-23','%Y-%m-%d'),57.34867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-11','%Y-%m-%d'),67.34500);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-24','%Y-%m-%d'),61.68080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-12','%Y-%m-%d'),57.07293);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-25','%Y-%m-%d'),55.55793);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-13','%Y-%m-%d'),57.37567);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-26','%Y-%m-%d'),55.81013);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-14','%Y-%m-%d'),63.97820);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-27','%Y-%m-%d'),59.85540);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-15','%Y-%m-%d'),56.06647);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-28','%Y-%m-%d'),61.05073);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-16','%Y-%m-%d'),53.66347);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-29','%Y-%m-%d'),59.81253);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-23','%Y-%m-%d'),56.50813);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-30','%Y-%m-%d'),61.02047);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-24','%Y-%m-%d'),53.19667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-10-31','%Y-%m-%d'),60.60413);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-25','%Y-%m-%d'),51.57133);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-01','%Y-%m-%d'),57.43067);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-26','%Y-%m-%d'),45.98160);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-02','%Y-%m-%d'),58.63027);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-27','%Y-%m-%d'),49.21113);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-03','%Y-%m-%d'),59.08127);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-28','%Y-%m-%d'),49.67213);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-04','%Y-%m-%d'),59.37373);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-29','%Y-%m-%d'),52.94053);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-05','%Y-%m-%d'),58.13413);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-30','%Y-%m-%d'),57.55727);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-06','%Y-%m-%d'),57.18893);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-07-31','%Y-%m-%d'),61.76900);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-07','%Y-%m-%d'),56.72853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-01','%Y-%m-%d'),56.51953);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-08','%Y-%m-%d'),56.47340);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-02','%Y-%m-%d'),61.04853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-09','%Y-%m-%d'),62.02333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-03','%Y-%m-%d'),70.06067);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-10','%Y-%m-%d'),61.21787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-04','%Y-%m-%d'),60.97787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-11','%Y-%m-%d'),62.01087);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-05','%Y-%m-%d'),59.25967);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-12','%Y-%m-%d'),62.67573);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-06','%Y-%m-%d'),56.12287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-13','%Y-%m-%d'),59.23993);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-07','%Y-%m-%d'),63.99913);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-14','%Y-%m-%d'),67.34973);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-08','%Y-%m-%d'),58.71127);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-15','%Y-%m-%d'),60.93753);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-08-09','%Y-%m-%d'),64.01913);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-16','%Y-%m-%d'),54.52607);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-17','%Y-%m-%d'),57.81127);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-18','%Y-%m-%d'),63.53027);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-19','%Y-%m-%d'),58.13000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-20','%Y-%m-%d'),58.46827);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-21','%Y-%m-%d'),65.27807);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-22','%Y-%m-%d'),53.74513);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-23','%Y-%m-%d'),60.99107);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-24','%Y-%m-%d'),60.45427);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-25','%Y-%m-%d'),56.16847);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-26','%Y-%m-%d'),59.04040);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-27','%Y-%m-%d'),54.62040);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-28','%Y-%m-%d'),56.34687);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-29','%Y-%m-%d'),54.81560);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-11-30','%Y-%m-%d'),60.22753);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-01','%Y-%m-%d'),59.07307);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-02','%Y-%m-%d'),59.73553);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-03','%Y-%m-%d'),68.69447);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-04','%Y-%m-%d'),68.91767);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-05','%Y-%m-%d'),67.86460);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-06','%Y-%m-%d'),64.43120);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-01','%Y-%m-%d'),61.22507);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-07','%Y-%m-%d'),60.67793);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-02','%Y-%m-%d'),63.27533);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-08','%Y-%m-%d'),62.47060);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-03','%Y-%m-%d'),69.88087);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-09','%Y-%m-%d'),58.26053);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-04','%Y-%m-%d'),66.84920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-10','%Y-%m-%d'),61.03340);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-05','%Y-%m-%d'),61.57367);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-11','%Y-%m-%d'),57.32620);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-06','%Y-%m-%d'),60.52293);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-12','%Y-%m-%d'),63.10353);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-07','%Y-%m-%d'),62.21027);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-13','%Y-%m-%d'),61.73167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-08','%Y-%m-%d'),63.20380);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-14','%Y-%m-%d'),65.31080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-09','%Y-%m-%d'),62.72427);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-15','%Y-%m-%d'),64.67620);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-10','%Y-%m-%d'),61.59373);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-16','%Y-%m-%d'),62.87287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-11','%Y-%m-%d'),61.21280);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-17','%Y-%m-%d'),60.14680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-12','%Y-%m-%d'),60.79787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-18','%Y-%m-%d'),63.01007);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-13','%Y-%m-%d'),60.00080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-19','%Y-%m-%d'),57.82680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-14','%Y-%m-%d'),60.82333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-20','%Y-%m-%d'),62.59173);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-15','%Y-%m-%d'),59.62020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-21','%Y-%m-%d'),61.65607);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-16','%Y-%m-%d'),60.27420);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-23','%Y-%m-%d'),61.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-17','%Y-%m-%d'),60.06200);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-24','%Y-%m-%d'),59.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-18','%Y-%m-%d'),60.88900);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-25','%Y-%m-%d'),50.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-19','%Y-%m-%d'),59.92547);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-26','%Y-%m-%d'),60.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-20','%Y-%m-%d'),59.99853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-27','%Y-%m-%d'),62.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-21','%Y-%m-%d'),58.65873);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-28','%Y-%m-%d'),61.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-22','%Y-%m-%d'),60.61000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-29','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-23','%Y-%m-%d'),59.92280);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-30','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-24','%Y-%m-%d'),59.52427);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2014-12-31','%Y-%m-%d'),62.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-25','%Y-%m-%d'),59.44887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-01','%Y-%m-%d'),60.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-26','%Y-%m-%d'),60.23540);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-02','%Y-%m-%d'),62.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-27','%Y-%m-%d'),61.18333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-03','%Y-%m-%d'),62.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-28','%Y-%m-%d'),60.88133);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-04','%Y-%m-%d'),60.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-29','%Y-%m-%d'),61.74160);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-06','%Y-%m-%d'),62.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-30','%Y-%m-%d'),60.25647);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-08','%Y-%m-%d'),61.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-03-31','%Y-%m-%d'),60.41220);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-09','%Y-%m-%d'),63.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-01','%Y-%m-%d'),59.21053);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-10','%Y-%m-%d'),61.82227);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-02','%Y-%m-%d'),55.04713);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-11','%Y-%m-%d'),61.89553);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-03','%Y-%m-%d'),56.08473);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-12','%Y-%m-%d'),60.90127);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-04','%Y-%m-%d'),64.51107);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-13','%Y-%m-%d'),62.23660);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-05','%Y-%m-%d'),56.75193);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-14','%Y-%m-%d'),61.76947);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-06','%Y-%m-%d'),61.64240);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-15','%Y-%m-%d'),63.08853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-07','%Y-%m-%d'),61.33653);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-16','%Y-%m-%d'),60.12627);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-08','%Y-%m-%d'),69.28867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-17','%Y-%m-%d'),60.60020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-09','%Y-%m-%d'),60.87507);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-18','%Y-%m-%d'),60.43440);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-10','%Y-%m-%d'),68.08707);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-19','%Y-%m-%d'),65.02820);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-11','%Y-%m-%d'),60.57680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-20','%Y-%m-%d'),62.95593);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-12','%Y-%m-%d'),61.52467);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-21','%Y-%m-%d'),61.23967);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-13','%Y-%m-%d'),58.06567);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-22','%Y-%m-%d'),62.61853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-14','%Y-%m-%d'),59.80807);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-23','%Y-%m-%d'),63.64227);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-15','%Y-%m-%d'),79.90007);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-24','%Y-%m-%d'),63.42147);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-16','%Y-%m-%d'),54.75020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-25','%Y-%m-%d'),60.82687);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-17','%Y-%m-%d'),65.69500);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-26','%Y-%m-%d'),60.66260);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-18','%Y-%m-%d'),68.56247);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-27','%Y-%m-%d'),60.12767);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-19','%Y-%m-%d'),72.67153);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-28','%Y-%m-%d'),60.51513);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-20','%Y-%m-%d'),71.30720);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-29','%Y-%m-%d'),61.71520);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-21','%Y-%m-%d'),57.75233);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-30','%Y-%m-%d'),60.89553);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-22','%Y-%m-%d'),59.04200);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-01-31','%Y-%m-%d'),63.50540);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-23','%Y-%m-%d'),62.30153);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-01','%Y-%m-%d'),62.37533);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-24','%Y-%m-%d'),67.68287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-02','%Y-%m-%d'),60.31400);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-25','%Y-%m-%d'),69.21800);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-03','%Y-%m-%d'),63.43920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-26','%Y-%m-%d'),69.75993);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-04','%Y-%m-%d'),61.20487);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-27','%Y-%m-%d'),64.64113);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-05','%Y-%m-%d'),62.11167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-28','%Y-%m-%d'),60.10053);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-06','%Y-%m-%d'),59.96140);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-29','%Y-%m-%d'),58.67653);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-07','%Y-%m-%d'),62.60727);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-04-30','%Y-%m-%d'),58.29180);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-08','%Y-%m-%d'),61.95493);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-01','%Y-%m-%d'),60.56173);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-09','%Y-%m-%d'),58.89653);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-02','%Y-%m-%d'),57.15840);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-10','%Y-%m-%d'),66.20167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-03','%Y-%m-%d'),54.49167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-11','%Y-%m-%d'),64.76873);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-04','%Y-%m-%d'),61.54087);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-12','%Y-%m-%d'),69.90680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-05','%Y-%m-%d'),63.86073);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-13','%Y-%m-%d'),68.49253);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-06','%Y-%m-%d'),64.13460);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-14','%Y-%m-%d'),63.19360);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-07','%Y-%m-%d'),65.30087);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-15','%Y-%m-%d'),63.35453);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-08','%Y-%m-%d'),64.46353);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-16','%Y-%m-%d'),59.78020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-09','%Y-%m-%d'),62.81193);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-17','%Y-%m-%d'),60.70760);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-10','%Y-%m-%d'),56.14480);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-18','%Y-%m-%d'),58.05167);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-11','%Y-%m-%d'),61.47853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-19','%Y-%m-%d'),57.12700);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-12','%Y-%m-%d'),63.39287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-20','%Y-%m-%d'),59.49013);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-13','%Y-%m-%d'),64.30640);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-21','%Y-%m-%d'),59.18607);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-14','%Y-%m-%d'),64.29447);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-22','%Y-%m-%d'),60.94680);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-15','%Y-%m-%d'),65.63307);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-23','%Y-%m-%d'),59.85807);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-16','%Y-%m-%d'),62.32887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-24','%Y-%m-%d'),60.06767);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-17','%Y-%m-%d'),56.52853);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-25','%Y-%m-%d'),61.60267);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-18','%Y-%m-%d'),70.26520);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-26','%Y-%m-%d'),60.94220);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-19','%Y-%m-%d'),64.38267);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-27','%Y-%m-%d'),59.99040);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-20','%Y-%m-%d'),63.01447);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-02-28','%Y-%m-%d'),63.05567);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-21','%Y-%m-%d'),61.89200);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-22','%Y-%m-%d'),62.06920);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-23','%Y-%m-%d'),68.49253);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-24','%Y-%m-%d'),69.98867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-25','%Y-%m-%d'),60.26940);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-26','%Y-%m-%d'),62.91493);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-09','%Y-%m-%d'),62.28433);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-27','%Y-%m-%d'),62.36827);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-10','%Y-%m-%d'),64.38787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-11','%Y-%m-%d'),61.17093);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-28','%Y-%m-%d'),60.33887);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-12','%Y-%m-%d'),57.17713);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-29','%Y-%m-%d'),83.89220);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-13','%Y-%m-%d'),57.69653);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-30','%Y-%m-%d'),60.96747);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-14','%Y-%m-%d'),55.97980);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-05-31','%Y-%m-%d'),57.80627);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-15','%Y-%m-%d'),62.08940);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-01','%Y-%m-%d'),61.60173);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-16','%Y-%m-%d'),83.81047);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-02','%Y-%m-%d'),63.23627);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-17','%Y-%m-%d'),61.32540);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-03','%Y-%m-%d'),58.39987);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-18','%Y-%m-%d'),61.08900);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-04','%Y-%m-%d'),69.51947);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-19','%Y-%m-%d'),67.26267);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-05','%Y-%m-%d'),69.67787);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-20','%Y-%m-%d'),58.71120);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-06','%Y-%m-%d'),62.40513);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-21','%Y-%m-%d'),55.77320);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-07','%Y-%m-%d'),61.01893);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-22','%Y-%m-%d'),59.99420);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-08','%Y-%m-%d'),61.34813);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-23','%Y-%m-%d'),60.83867);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-24','%Y-%m-%d'),59.57020);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-25','%Y-%m-%d'),63.20393);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-17','%Y-%m-%d'),67.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-26','%Y-%m-%d'),58.30480);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-18','%Y-%m-%d'),64.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-27','%Y-%m-%d'),58.79667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-19','%Y-%m-%d'),60.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-28','%Y-%m-%d'),54.04967);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-20','%Y-%m-%d'),57.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-29','%Y-%m-%d'),57.88313);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-21','%Y-%m-%d'),58.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-06-30','%Y-%m-%d'),56.94940);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-22','%Y-%m-%d'),59.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-01','%Y-%m-%d'),65.01080);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-23','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-02','%Y-%m-%d'),64.97013);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-24','%Y-%m-%d'),59.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-03','%Y-%m-%d'),65.06647);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-25','%Y-%m-%d'),59.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-04','%Y-%m-%d'),64.08287);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-26','%Y-%m-%d'),76.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-05','%Y-%m-%d'),65.40367);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-27','%Y-%m-%d'),59.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-06','%Y-%m-%d'),72.61373);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-28','%Y-%m-%d'),59.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-07','%Y-%m-%d'),72.53120);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-29','%Y-%m-%d'),58.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-08','%Y-%m-%d'),72.54133);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-26','%Y-%m-%d'),58.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-30','%Y-%m-%d'),54.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-01','%Y-%m-%d'),58.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-02','%Y-%m-%d'),59.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-03','%Y-%m-%d'),58.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-04','%Y-%m-%d'),60.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-05','%Y-%m-%d'),101.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-06','%Y-%m-%d'),58.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-07','%Y-%m-%d'),59.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-08','%Y-%m-%d'),56.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-09','%Y-%m-%d'),57.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-10','%Y-%m-%d'),65.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-11','%Y-%m-%d'),56.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-12','%Y-%m-%d'),54.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-13','%Y-%m-%d'),68.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-14','%Y-%m-%d'),69.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-15','%Y-%m-%d'),66.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-16','%Y-%m-%d'),58.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-17','%Y-%m-%d'),60.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-18','%Y-%m-%d'),58.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-19','%Y-%m-%d'),55.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-20','%Y-%m-%d'),55.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-21','%Y-%m-%d'),57.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-22','%Y-%m-%d'),57.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-23','%Y-%m-%d'),58.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-24','%Y-%m-%d'),57.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-25','%Y-%m-%d'),58.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-26','%Y-%m-%d'),61.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-27','%Y-%m-%d'),57.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-28','%Y-%m-%d'),58.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-29','%Y-%m-%d'),59.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-30','%Y-%m-%d'),55.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-10-31','%Y-%m-%d'),53.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-01','%Y-%m-%d'),56.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-02','%Y-%m-%d'),57.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-03','%Y-%m-%d'),55.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-04','%Y-%m-%d'),57.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-05','%Y-%m-%d'),65.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-06','%Y-%m-%d'),55.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-07','%Y-%m-%d'),57.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-08','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-09','%Y-%m-%d'),60.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-10','%Y-%m-%d'),58.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-11','%Y-%m-%d'),58.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-12','%Y-%m-%d'),57.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-13','%Y-%m-%d'),57.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-14','%Y-%m-%d'),55.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-15','%Y-%m-%d'),55.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-16','%Y-%m-%d'),58.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-17','%Y-%m-%d'),58.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-18','%Y-%m-%d'),64.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-19','%Y-%m-%d'),59.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-20','%Y-%m-%d'),57.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-21','%Y-%m-%d'),57.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-22','%Y-%m-%d'),59.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-23','%Y-%m-%d'),56.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-24','%Y-%m-%d'),58.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-25','%Y-%m-%d'),57.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-26','%Y-%m-%d'),57.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-27','%Y-%m-%d'),53.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-28','%Y-%m-%d'),58.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-29','%Y-%m-%d'),56.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-11-30','%Y-%m-%d'),58.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-01','%Y-%m-%d'),60.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-02','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-03','%Y-%m-%d'),58.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-04','%Y-%m-%d'),77.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-05','%Y-%m-%d'),56.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-06','%Y-%m-%d'),55.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-07','%Y-%m-%d'),57.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-08','%Y-%m-%d'),57.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-09','%Y-%m-%d'),71.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-10','%Y-%m-%d'),62.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-11','%Y-%m-%d'),59.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-12','%Y-%m-%d'),59.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-13','%Y-%m-%d'),62.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-14','%Y-%m-%d'),59.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-15','%Y-%m-%d'),59.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-16','%Y-%m-%d'),62.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-17','%Y-%m-%d'),66.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-18','%Y-%m-%d'),59.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-19','%Y-%m-%d'),60.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-20','%Y-%m-%d'),57.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-21','%Y-%m-%d'),60.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-22','%Y-%m-%d'),59.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-23','%Y-%m-%d'),61.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-24','%Y-%m-%d'),57.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-25','%Y-%m-%d'),52.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-09','%Y-%m-%d'),70.77980);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-10','%Y-%m-%d'),70.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-11','%Y-%m-%d'),60.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-12','%Y-%m-%d'),58.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-13','%Y-%m-%d'),58.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-14','%Y-%m-%d'),58.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-15','%Y-%m-%d'),68.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-16','%Y-%m-%d'),84.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-17','%Y-%m-%d'),61.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-18','%Y-%m-%d'),64.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-19','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-20','%Y-%m-%d'),77.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-21','%Y-%m-%d'),60.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-22','%Y-%m-%d'),65.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-23','%Y-%m-%d'),68.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-24','%Y-%m-%d'),58.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-25','%Y-%m-%d'),56.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-26','%Y-%m-%d'),58.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-27','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-28','%Y-%m-%d'),59.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-29','%Y-%m-%d'),58.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-30','%Y-%m-%d'),59.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-27','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-07-31','%Y-%m-%d'),57.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-28','%Y-%m-%d'),305.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-01','%Y-%m-%d'),59.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-29','%Y-%m-%d'),62.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-02','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-30','%Y-%m-%d'),60.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-03','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-12-31','%Y-%m-%d'),60.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-04','%Y-%m-%d'),83.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-01','%Y-%m-%d'),55.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-05','%Y-%m-%d'),59.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-02','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-06','%Y-%m-%d'),58.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-03','%Y-%m-%d'),61.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-07','%Y-%m-%d'),59.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-04','%Y-%m-%d'),62.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-08','%Y-%m-%d'),57.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-05','%Y-%m-%d'),61.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-09','%Y-%m-%d'),58.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-06','%Y-%m-%d'),61.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-10','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-07','%Y-%m-%d'),62.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-11','%Y-%m-%d'),58.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-08','%Y-%m-%d'),100.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-12','%Y-%m-%d'),57.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-09','%Y-%m-%d'),62.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-13','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-10','%Y-%m-%d'),66.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-14','%Y-%m-%d'),58.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-11','%Y-%m-%d'),61.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-15','%Y-%m-%d'),59.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-12','%Y-%m-%d'),60.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-16','%Y-%m-%d'),61.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-13','%Y-%m-%d'),61.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-17','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-14','%Y-%m-%d'),60.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-18','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-15','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-19','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-16','%Y-%m-%d'),61.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-20','%Y-%m-%d'),60.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-17','%Y-%m-%d'),70.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-21','%Y-%m-%d'),63.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-18','%Y-%m-%d'),61.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-22','%Y-%m-%d'),58.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-19','%Y-%m-%d'),61.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-23','%Y-%m-%d'),59.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-20','%Y-%m-%d'),61.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-24','%Y-%m-%d'),59.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-21','%Y-%m-%d'),61.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-25','%Y-%m-%d'),63.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-22','%Y-%m-%d'),60.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-26','%Y-%m-%d'),61.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-23','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-27','%Y-%m-%d'),60.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-24','%Y-%m-%d'),60.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-28','%Y-%m-%d'),57.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-25','%Y-%m-%d'),61.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-29','%Y-%m-%d'),59.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-26','%Y-%m-%d'),61.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-30','%Y-%m-%d'),57.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-27','%Y-%m-%d'),61.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-08-31','%Y-%m-%d'),59.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-28','%Y-%m-%d'),61.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-01','%Y-%m-%d'),58.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-29','%Y-%m-%d'),61.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-02','%Y-%m-%d'),61.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-30','%Y-%m-%d'),61.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-03','%Y-%m-%d'),59.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-01-31','%Y-%m-%d'),59.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-04','%Y-%m-%d'),59.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-01','%Y-%m-%d'),60.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-05','%Y-%m-%d'),59.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-02','%Y-%m-%d'),60.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-06','%Y-%m-%d'),61.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-03','%Y-%m-%d'),60.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-07','%Y-%m-%d'),59.20000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-04','%Y-%m-%d'),61.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-08','%Y-%m-%d'),61.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-05','%Y-%m-%d'),60.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-09','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-06','%Y-%m-%d'),60.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-10','%Y-%m-%d'),60.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-07','%Y-%m-%d'),60.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-11','%Y-%m-%d'),58.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-08','%Y-%m-%d'),61.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-12','%Y-%m-%d'),58.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-09','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-13','%Y-%m-%d'),58.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-10','%Y-%m-%d'),60.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-14','%Y-%m-%d'),60.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-11','%Y-%m-%d'),60.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-15','%Y-%m-%d'),62.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-12','%Y-%m-%d'),59.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2015-09-16','%Y-%m-%d'),65.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-13','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-14','%Y-%m-%d'),69.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-15','%Y-%m-%d'),59.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-16','%Y-%m-%d'),59.80000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-17','%Y-%m-%d'),60.46667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-18','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-19','%Y-%m-%d'),62.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-20','%Y-%m-%d'),60.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-21','%Y-%m-%d'),59.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-22','%Y-%m-%d'),61.40000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-23','%Y-%m-%d'),60.93333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-24','%Y-%m-%d'),64.13333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-25','%Y-%m-%d'),61.53333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-26','%Y-%m-%d'),59.06667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-27','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-28','%Y-%m-%d'),60.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-02-29','%Y-%m-%d'),61.00000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-01','%Y-%m-%d'),61.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-02','%Y-%m-%d'),61.66667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-03','%Y-%m-%d'),60.73333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-04','%Y-%m-%d'),61.26667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-05','%Y-%m-%d'),61.60000);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-06','%Y-%m-%d'),61.33333);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-07','%Y-%m-%d'),61.86667);
+INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-08','%Y-%m-%d'),62.00000);
+
+commit;
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_1710_to_1707_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_1710_to_1707_Common.sql
new file mode 100644
index 00000000..a378d506
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_1710_to_1707_Common.sql
@@ -0,0 +1,21 @@
+use ecomp_sdk;
+
+alter table fn_menu  
+add index fn_menu_function_cd (function_cd ASC);
+alter table fn_menu
+add constraint fk_fn_menu_ref_223_fn_funct
+foreign key (function_cd)
+references fn_function (function_cd);
+
+alter table fn_restricted_url  
+add index fk_restricted_url_function_cd (function_cd ASC);
+alter table fn_restricted_url
+add constraint fk_restricted_url_function_cd
+foreign key (function_cd)
+references fn_function (function_cd);
+
+
+alter table fn_role
+modify role_name varchar(50) NOT NULL;
+
+commit;
+\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_1707_to_1710_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_1707_to_1710_Common.sql
new file mode 100644
index 00000000..36c19658
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_1707_to_1710_Common.sql
@@ -0,0 +1,18 @@
+use ecomp_sdk;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+alter table fn_menu 
+drop foreign key fk_fn_menu_ref_223_fn_funct;
+alter table fn_menu 
+drop index fn_menu_function_cd;
+
+alter table fn_restricted_url 
+drop foreign key fk_restricted_url_function_cd;
+alter table fn_restricted_url 
+drop index fk_restricted_url_function_cd;
+
+alter table fn_role
+modify role_name varchar(300) NOT NULL;
+
+commit;
+\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/readme.txt b/ecomp-sdk/epsdk-app-common/db-scripts/readme.txt
deleted file mode 100644
index d128cbd3..00000000
--- a/ecomp-sdk/epsdk-app-common/db-scripts/readme.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-This Readme file contains a description of all the database scripts located in  
-
-  epsdk-app-common / db-scripts / 
-  
-***************************************************************************************************************************************
-
-Directions: 
-
-DDL
-EcompSdkDDLMySql_1707_Common.sql  - this is the DDL entries that are in common
- 
-DML
-EcompSdkDMLMySql_1707_Common.sql  - this is the DML entries that are in common
-
-
-***************************************************************************************************************************************
-  epsdk-app-common / db-scripts / 
-***************************************************************************************************************************************	
-5.EcompSdkDDLMySql_1707_Common.sql   		This script creates tables in the 1707 COMMON version of the ECOMP SDK application database.
-											Additional DDL scripts may be required for different versions!
-6.EcompSdkDMLMySql_1707_Common.sql   		This script populates tables in the 1707 COMMON version of the ECOMP SDK application database.
-											Additional DML scripts are required for different versions!
-
-
-*****************************************************
-Upgrading from 1607 SDK to 1610 SDK
-*****************************************************
-EcompSdkDDL_1610_Add.sql					This is the Upgrade script for the 1610 Version of the SDK database called ecomp_sdk; 
-											upgrading from the 1607 version
-EcompSdkDML_1610_Add.sql					This is the Upgrade script for the default data for the 1610 Version of the SDK database called ecomp_sdk; 
-											upgrading from the 1607 version
-*****************************************************
-Upgrading from 1610 SDK to 1702 SDK
-*****************************************************	
-If you are starting with a 1610 environment and want to bring it up to 1702,
-you can run the following scripts in this order:
-EcompSdkDML_1702_Add_1.sql
-EcompSdkDML_1702_Add_2.sql
-EcompSdkDML_1702_Add_3.sql
-EcompSdkDML_1702_Add_4.sql
-EcompSdkDML_1702_Add_5.sql
-
-You can roll back the changes from the corresponding 1702 Add scripts with these rollback scripts:
-EcompSdkDML_1702_Rollback_1.sql
-EcompSdkDML_1702_Rollback_2.sql
-EcompSdkDML_1702_Rollback_3.sql
-EcompSdkDML_1702_Rollback_4.sql
-EcompSdkDML_1702_Rollback_5.sql	
-									
-*****************************************************
-Complete Scripts for 1702
-*****************************************************											
-EcompSdkDDLMySql_1702.sql					This is for the 1702 DDL Version of SDK database called ecomp_sdk
-EcompSdkDMLMySql_1702.sql					This is for the default data for 1702 Version of SDK database called ecomp_sdk
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 9e314239..a2db1da1 100644
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -18,6 +18,8 @@ Version 1.3.0
 - PORTAL-19 Renaming the Group Id in the POM file to org.onap.portal.sdk
 - PORTAL-34 Restore required properties in fusion.properties file
 - PORTAL-64 Single sign-on from Portal fails for some applications
+- PORTAL-21 Added scripts to remove foreign keys of function code in fn_menu
+  and fn_restriced_url tables.
 
 Version 1.1.0
 - PORTAL-6 Updates to License and Trademark in the PORTAL Source Code
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_1710_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_1710_OS.sql
new file mode 100644
index 00000000..1b1ce059
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_1710_OS.sql
@@ -0,0 +1,12 @@
+-- ---------------------------------------------------------------------------------------------------------------
+-- This script adds tables for the 1707 OPEN-SOURCE version of the ECOMP SDK application database.
+-- The DDL 1707 COMMON script must be executed first!
+-- ---------------------------------------------------------------------------------------------------------------
+
+SET FOREIGN_KEY_CHECKS=1; 
+
+USE ecomp_sdk;
+
+-- No additional tables required at this time
+
+commit;
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_1710_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_1710_OS.sql
new file mode 100644
index 00000000..1c4a926a
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_1710_OS.sql
@@ -0,0 +1,39 @@
+-- ---------------------------------------------------------------------------------------------------------------
+-- This script populates tables in the 1707 OPEN-SOURCE version of the ECOMP SDK application database.
+-- The DML 1707 COMMON script must be executed first!
+-- ---------------------------------------------------------------------------------------------------------------
+
+SET FOREIGN_KEY_CHECKS=1; 
+USE ecomp_sdk;
+
+-- fn_menu 
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (1, 'Root', NULL, 10, NULL, 'menu_home', 'N', NULL, NULL, NULL, NULL, 'APP', 'N', NULL); --  we need even though it's inactive
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (5000, 'Sample Pages', 1, 30, 'sample.htm', 'menu_sample', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-documents-book');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (2, 'Home', 1, 10, 'welcome.htm', 'menu_home', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-building-home');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (8, 'Reports', 1, 40, 'report.htm', 'menu_reports', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-misc-piechart');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (9, 'Profile', 1, 90, 'userProfile', 'menu_profile', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-people-oneperson');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (10, 'Admin', 1, 110, 'role_list.htm', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', 'icon-content-star');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (84, 'All Reports', 8, 50, 'report', 'menu_reports', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/reports.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) values (87, 'Create Reports', 8, 120, 'report#/report_wizard', 'menu_reports', 'Y', NULL, 'r_action=report.create', NULL, NULL, 'APP', 'N', NULL);
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) values (88, 'Sample Dashboard', 8, 130, 'report_dashboard', 'menu_reports', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL);
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (89, 'Import', 8, 140, 'report#/report_import', 'menu_reports', 'N', null, null, null, null, 'APP', 'N', null); 
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (94, 'Self', 9, 40,'userProfile#/self_profile', 'menu_profile', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/profile.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (101, 'Roles', 10, 20, 'admin#/admin', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/users.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (102, 'Role Functions', 10, 30, 'admin#/role_function_list', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL);
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (105, 'Cache Admin', 10, 40, 'admin#/jcs_admin', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/cache.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (108, 'Usage', 10, 80, 'admin#/usage_list', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/users.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (121, 'Collaboration', 5000, 100, 'samplePage#/collaborate_list', 'menu_sample', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/bubble.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (930, 'Search', 9, 15, 'userProfile', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', '/static/fusion/images/search_profile.png');
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150022, 'Menus', 10, 60, 'admin#/admin_menu_edit', 'menu_admin', 'Y', NULL, NULL, NULL, NULL, 'APP', 'N', NULL);
+INSERT INTO fn_menu (MENU_ID, LABEL, PARENT_ID, SORT_ORDER, ACTION, FUNCTION_CD, ACTIVE_YN, SERVLET, QUERY_STRING, EXTERNAL_URL, TARGET, MENU_SET_CD, SEPARATOR_YN, IMAGE_SRC) VALUES (150038,'Notebook',5000,135,'samplePage#/notebook','menu_sample','Y',NULL,NULL,NULL,NULL,'APP','N',NULL);
+
+-- fn_user
+Insert into fn_user (USER_ID,ORG_ID,MANAGER_ID,FIRST_NAME,MIDDLE_NAME,LAST_NAME,PHONE,FAX,CELLULAR,EMAIL,ADDRESS_ID,ALERT_METHOD_CD,HRID,ORG_USER_ID,ORG_CODE,LOGIN_ID,LOGIN_PWD,LAST_LOGIN_DATE,ACTIVE_YN,CREATED_ID,CREATED_DATE,MODIFIED_ID,MODIFIED_DATE,IS_INTERNAL_YN,ADDRESS_LINE_1,ADDRESS_LINE_2,CITY,STATE_CD,ZIP_CODE,COUNTRY_CD,LOCATION_CLLI,ORG_MANAGER_USERID,COMPANY,DEPARTMENT_NAME,JOB_TITLE,TIMEZONE,DEPARTMENT,BUSINESS_UNIT,BUSINESS_UNIT_NAME,COST_CENTER,FIN_LOC_CODE,SILO_STATUS) values (1,null,null,'Demo',null,'User',null,null,null,'demo@email.com',null,null,null,'demo',null,'demo','demo',str_to_date('24-OCT-16','%d-%M-%Y'),'Y',null,str_to_date('17-OCT-16','%d-%M-%Y'),1,str_to_date('24-OCT-16','%d-%M-%Y'),'N',null,null,null,'NJ',null,'US',null,null,null,null,null,10,null,null,null,null,null,null);
+
+-- fn_app
+Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_URL,APP_ALTERNATE_URL,APP_REST_ENDPOINT,ML_APP_NAME,ML_APP_ADMIN_ID,MOTS_ID,APP_PASSWORD,OPEN,ENABLED,THUMBNAIL,APP_USERNAME,UEB_KEY,UEB_SECRET,UEB_TOPIC_NAME) VALUES (1,'Default',null,'Some Default Description','Some Default Note',null,null,null,'ECPP','?','1','okYTaDrhzibcbGVq5mjkVQ==','N','N',null,'Default',null,null,'ECOMP-PORTAL-INBOX');
+
+-- fn_user_role
+Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1);
+
+commit;
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/readme.txt b/ecomp-sdk/epsdk-app-os/db-scripts/readme.txt
index 5f1be1bc..093f77cc 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/readme.txt
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/readme.txt
@@ -7,30 +7,18 @@ This Readme file contains a description of open source scripts located in
 Directions: 
 
 DDL
-For an Opensource instance run only script EcompSdkDDLMySql_1707_Common.sql;
+For ONAP instance run EcompSdkDDLMySql_1710_Common.sql add script EcompSdkDDLMySql_1710_OS.sql.
 
-EcompSdkDDLMySql_1707_Common.sql  - common DDL entries
-EcompSdkDDLMySql_1707_OS.sql is only a placeholder at this time.
+EcompSdkDDLMySql_1710_Common.sql  - this is the DDL entries that both Opensource and AT&T have in common
+EcompSdkDDLMySql_1710_OS.sql -  this is the specific DDL entries that only OS needs
 
 DML
+For an ONAP instance run script EcompSdkDMLMySql_1710_Common.sql and script EcompSdkDMLMySql_1710_OS.sql.
 
-For an Opensource instance run  script EcompSdkDMLMySql_1707_Common.sql and script EcompSdkDMLMySql_1707_OS.sql; 
-
-EcompSdkDMLMySql_1707_Common.sql  - common DML entries
+EcompSdkDMLMySql_1707_Common.sql  - common DML entries 
 EcompSdkDMLMySql_1707_OS.sql - DML entries for Opensource needs
-	
-To Upgrade the OpenSource 1610.2 version to the 1707 version, run script EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql
-and to remove those changes run EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql.
-
-EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql
-EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql
 
+Our Existing Partner Apps can call the following scripts to upgrade from earlier version
 
-***************************************************************************************************************************************
-epsdk-app-os / db-scripts / 
-***************************************************************************************************************************************	
-EcompSdkDDLMySql_1707_OS.sql  			It is empty for now; just a logical placeholder
-EcompSdkDMLMySql_1707_OS.sql  			This script populates tables in the 1707 OPEN-SOURCE version of the ECOMP SDK application database.
-											After The DML 1707 COMMON script is run.
-EcompSdkMySql_Upgrade_1610.2_to_1707_OS.sql     This script upgrades the ECOMP SDK App database from version 1610.2 to 1707.
-EcompSdkMySql_Rollback_1707_to_1610.2_OS.sql   This script rolls-back the upgrade for the ECOMP SDK App database 
+EcompSdkMySql_Upgrade_1707_to_1710_Common.sql
+EcompSdkMySql_Rollback_1710_to_1707_Common.sql
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/flexslider.css b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/flexslider.css
deleted file mode 100644
index c459ef44..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/flexslider.css
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * jQuery FlexSlider v2.6.0
- * http://www.woothemes.com/flexslider/
- *
- * Copyright 2012 WooThemes
- * Free to use under the GPLv2 and later license.
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Contributing author: Tyler Smith (@mbmufffin)
- *
- */
-/* ====================================================================================================================
- * FONT-FACE
- * ====================================================================================================================*/
-@font-face {
-  font-family: 'flexslider-icon';
-  src: url('fonts/flexslider-icon.eot');
-  src: url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'), url('fonts/flexslider-icon.woff') format('woff'), url('fonts/flexslider-icon.ttf') format('truetype'), url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* ====================================================================================================================
- * RESETS
- * ====================================================================================================================*/
-.flex-container a:hover,
-.flex-slider a:hover {
-  outline: none;
-}
-.slides,
-.slides > li,
-.flex-control-nav,
-.flex-direction-nav {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-.flex-pauseplay span {
-  text-transform: capitalize;
-}
-/* ====================================================================================================================
- * BASE STYLES
- * ====================================================================================================================*/
-.flexslider {
-  margin: 0;
-  padding: 0;
-}
-.flexslider .slides > li {
-  display: none;
-  -webkit-backface-visibility: hidden;
-}
-.flexslider .slides img {
-  width: 100%;
-  display: block;
-}
-.flexslider .slides:after {
-  content: "\0020";
-  display: block;
-  clear: both;
-  visibility: hidden;
-  line-height: 0;
-  height: 0;
-}
-html[xmlns] .flexslider .slides {
-  display: block;
-}
-* html .flexslider .slides {
-  height: 1%;
-}
-.no-js .flexslider .slides > li:first-child {
-  display: block;
-}
-/* ====================================================================================================================
- * DEFAULT THEME
- * ====================================================================================================================*/
-.flexslider {
-  margin: 0 0 60px;
-  background: #ffffff;
-  border: 4px solid #ffffff;
-  position: relative;
-  zoom: 1;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  -o-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-}
-.flexslider .slides {
-  zoom: 1;
-}
-.flexslider .slides img {
-  height: auto;
-  -moz-user-select: none;
-}
-.flex-viewport {
-  max-height: 2000px;
-  -webkit-transition: all 1s ease;
-  -moz-transition: all 1s ease;
-  -ms-transition: all 1s ease;
-  -o-transition: all 1s ease;
-  transition: all 1s ease;
-}
-.loading .flex-viewport {
-  max-height: 300px;
-}
-.carousel li {
-  margin-right: 5px;
-}
-.flex-direction-nav {
-  *height: 0;
-}
-.flex-direction-nav a {
-  text-decoration: none;
-  display: block;
-  width: 40px;
-  height: 40px;
-  margin: -20px 0 0;
-  position: absolute;
-  top: 50%;
-  z-index: 10;
-  overflow: hidden;
-  opacity: 0;
-  cursor: pointer;
-  color: rgba(0, 0, 0, 0.8);
-  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
-  -webkit-transition: all 0.3s ease-in-out;
-  -moz-transition: all 0.3s ease-in-out;
-  -ms-transition: all 0.3s ease-in-out;
-  -o-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.flex-direction-nav a:before {
-  font-family: "flexslider-icon";
-  font-size: 40px;
-  display: inline-block;
-  content: '\f001';
-  color: rgba(0, 0, 0, 0.8);
-  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
-}
-.flex-direction-nav a.flex-next:before {
-  content: '\f002';
-}
-.flex-direction-nav .flex-prev {
-  left: -50px;
-}
-.flex-direction-nav .flex-next {
-  right: -50px;
-  text-align: right;
-}
-.flexslider:hover .flex-direction-nav .flex-prev {
-  opacity: 0.7;
-  left: 10px;
-}
-.flexslider:hover .flex-direction-nav .flex-prev:hover {
-  opacity: 1;
-}
-.flexslider:hover .flex-direction-nav .flex-next {
-  opacity: 0.7;
-  right: 10px;
-}
-.flexslider:hover .flex-direction-nav .flex-next:hover {
-  opacity: 1;
-}
-.flex-direction-nav .flex-disabled {
-  opacity: 0!important;
-  filter: alpha(opacity=0);
-  cursor: default;
-  z-index: -1;
-}
-.flex-pauseplay a {
-  display: block;
-  width: 20px;
-  height: 20px;
-  position: absolute;
-  bottom: 5px;
-  left: 10px;
-  opacity: 0.8;
-  z-index: 10;
-  overflow: hidden;
-  cursor: pointer;
-  color: #000;
-}
-.flex-pauseplay a:before {
-  font-family: "flexslider-icon";
-  font-size: 20px;
-  display: inline-block;
-  content: '\f004';
-}
-.flex-pauseplay a:hover {
-  opacity: 1;
-}
-.flex-pauseplay a.flex-play:before {
-  content: '\f003';
-}
-.flex-control-nav {
-  width: 100%;
-  position: absolute;
-  bottom: -40px;
-  text-align: center;
-}
-.flex-control-nav li {
-  margin: 0 6px;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-}
-.flex-control-paging li a {
-  width: 11px;
-  height: 11px;
-  display: block;
-  background: #666;
-  background: rgba(0, 0, 0, 0.5);
-  cursor: pointer;
-  text-indent: -9999px;
-  -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -o-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -webkit-border-radius: 20px;
-  -moz-border-radius: 20px;
-  border-radius: 20px;
-}
-.flex-control-paging li a:hover {
-  background: #333;
-  background: rgba(0, 0, 0, 0.7);
-}
-.flex-control-paging li a.flex-active {
-  background: #000;
-  background: rgba(0, 0, 0, 0.9);
-  cursor: default;
-}
-.flex-control-thumbs {
-  margin: 5px 0 0;
-  position: static;
-  overflow: hidden;
-}
-.flex-control-thumbs li {
-  width: 25%;
-  float: left;
-  margin: 0;
-}
-.flex-control-thumbs img {
-  width: 100%;
-  height: auto;
-  display: block;
-  opacity: .7;
-  cursor: pointer;
-  -moz-user-select: none;
-  -webkit-transition: all 1s ease;
-  -moz-transition: all 1s ease;
-  -ms-transition: all 1s ease;
-  -o-transition: all 1s ease;
-  transition: all 1s ease;
-}
-.flex-control-thumbs img:hover {
-  opacity: 1;
-}
-.flex-control-thumbs .flex-active {
-  opacity: 1;
-  cursor: default;
-}
-/* ====================================================================================================================
- * RESPONSIVE
- * ====================================================================================================================*/
-@media screen and (max-width: 860px) {
-  .flex-direction-nav .flex-prev {
-    opacity: 1;
-    left: 10px;
-  }
-  .flex-direction-nav .flex-next {
-    opacity: 1;
-    right: 10px;
-  }
-}
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot
deleted file mode 100644
index 97c4196f..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg
deleted file mode 100644
index 89fd1ab8..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="14"></iconset>
-</metadata>
-<defs>
-<font id="flexslider-icon" horiz-adv-x="448" >
-<font-face units-per-em="448" ascent="384" descent="-64" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode="&#xf001;" d="M 185.50-9.25l-163.00,162.75q-9.25,9.25 -9.25,22.625t 9.25,22.625l 163.00,162.75q 9.25,9.25 22.625,9.25t 22.625-9.25l 18.75-18.75q 9.25-9.25 9.25-22.625t-9.25-22.625l-121.50-121.50l 121.50-121.25q 9.25-9.50 9.25-22.75t-9.25-22.50l-18.75-18.75q-9.25-9.25 -22.625-9.25t-22.625,9.25z" horiz-adv-x="288"  />
-<glyph unicode="&#xf002;" d="M 274.75,176.00q0.00-13.00 -9.25-22.75l-163.00-162.75q-9.25-9.25 -22.50-9.25t-22.50,9.25l-19.00,18.75q-9.25,9.75 -9.25,22.75q0.00,13.25 9.25,22.50l 121.50,121.50l-121.50,121.25q-9.25,9.75 -9.25,22.75q0.00,13.25 9.25,22.50l 19.00,18.75q 9.00,9.50 22.50,9.50t 22.50-9.50l 163.00-162.75q 9.25-9.25 9.25-22.50z" horiz-adv-x="288"  />
-<glyph unicode="&#xf003;" d="M 346.00,152.25l-332.00-184.50q-5.75-3.25 -9.875-0.75t-4.125,9.00l0.00,368.00 q0.00,6.50 4.125,9.00t 9.875-0.75l 332.00-184.50q 5.75-3.25 5.75-7.75t-5.75-7.75z" horiz-adv-x="352"  />
-<glyph unicode="&#xf004;" d="M 384.00,336.00l0.00-352.00 q0.00-6.50 -4.75-11.25t-11.25-4.75l-128.00,0.00 q-6.50,0.00 -11.25,4.75t-4.75,11.25l0.00,352.00 q0.00,6.50 4.75,11.25t 11.25,4.75l 128.00,0.00 q 6.50,0.00 11.25-4.75t 4.75-11.25zM 160.00,336.00l0.00-352.00 q0.00-6.50 -4.75-11.25t-11.25-4.75l-128.00,0.00 q-6.50,0.00 -11.25,4.75t-4.75,11.25l0.00,352.00 q0.00,6.50 4.75,11.25t 11.25,4.75l 128.00,0.00 q 6.50,0.00 11.25-4.75t 4.75-11.25z" horiz-adv-x="384"  />
-<glyph unicode="&#xf005;" d="M 402.75,208.00q0.00-13.25 -9.25-22.50l-162.75-162.75q-9.50-9.50 -22.75-9.50q-13.50,0.00 -22.50,9.50l-162.75,162.75q-9.50,9.00 -9.50,22.50q0.00,13.25 9.50,22.75l 18.50,18.75q 9.75,9.25 22.75,9.25q 13.25,0.00 22.50-9.25l 121.50-121.50l 121.50,121.50q 9.25,9.25 22.50,9.25q 13.00,0.00 22.75-9.25l 18.75-18.75q 9.25-9.75 9.25-22.75z" horiz-adv-x="416"  />
-<glyph unicode="&#x20;" horiz-adv-x="224" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,384L 448 -64L0 -64 z" horiz-adv-x="0" />
-</font></defs></svg>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf
deleted file mode 100644
index 05432986..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff
deleted file mode 100644
index 10c4eeb8..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
deleted file mode 100644
index ac970bda..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-next.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-next.png
deleted file mode 100644
index 1a4f72c6..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-next.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-prev.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-prev.png
deleted file mode 100644
index 8211eba1..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/arrow-prev.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/copyicon.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/copyicon.png
deleted file mode 100644
index 6c1c3c15..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/copyicon.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/deleteicon.gif b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/deleteicon.gif
deleted file mode 100644
index 4b07af82..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/deleteicon.gif
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/example-frame.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/example-frame.png
deleted file mode 100644
index 31f2fe1c..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/example-frame.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/loading.gif b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/loading.gif
deleted file mode 100644
index cccb0fc9..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/images/loading.gif
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
deleted file mode 100644
index 5ad6c377..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * jQuery FlexSlider v2.6.0
- * Copyright 2012 WooThemes
- * Contributing Author: Tyler Smith
- */!function($){var e=!0;$.flexslider=function(t,a){var n=$(t);n.vars=$.extend({},$.flexslider.defaults,a);var i=n.vars.namespace,s=window.navigator&&window.navigator.msPointerEnabled&&window.MSGesture,r=("ontouchstart"in window||s||window.DocumentTouch&&document instanceof DocumentTouch)&&n.vars.touch,o="click touchend MSPointerUp keyup",l="",c,d="vertical"===n.vars.direction,u=n.vars.reverse,v=n.vars.itemWidth>0,p="fade"===n.vars.animation,m=""!==n.vars.asNavFor,f={};$.data(t,"flexslider",n),f={init:function(){n.animating=!1,n.currentSlide=parseInt(n.vars.startAt?n.vars.startAt:0,10),isNaN(n.currentSlide)&&(n.currentSlide=0),n.animatingTo=n.currentSlide,n.atEnd=0===n.currentSlide||n.currentSlide===n.last,n.containerSelector=n.vars.selector.substr(0,n.vars.selector.search(" ")),n.slides=$(n.vars.selector,n),n.container=$(n.containerSelector,n),n.count=n.slides.length,n.syncExists=$(n.vars.sync).length>0,"slide"===n.vars.animation&&(n.vars.animation="swing"),n.prop=d?"top":"marginLeft",n.args={},n.manualPause=!1,n.stopped=!1,n.started=!1,n.startTimeout=null,n.transitions=!n.vars.video&&!p&&n.vars.useCSS&&function(){var e=document.createElement("div"),t=["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"];for(var a in t)if(void 0!==e.style[t[a]])return n.pfx=t[a].replace("Perspective","").toLowerCase(),n.prop="-"+n.pfx+"-transform",!0;return!1}(),n.ensureAnimationEnd="",""!==n.vars.controlsContainer&&(n.controlsContainer=$(n.vars.controlsContainer).length>0&&$(n.vars.controlsContainer)),""!==n.vars.manualControls&&(n.manualControls=$(n.vars.manualControls).length>0&&$(n.vars.manualControls)),""!==n.vars.customDirectionNav&&(n.customDirectionNav=2===$(n.vars.customDirectionNav).length&&$(n.vars.customDirectionNav)),n.vars.randomize&&(n.slides.sort(function(){return Math.round(Math.random())-.5}),n.container.empty().append(n.slides)),n.doMath(),n.setup("init"),n.vars.controlNav&&f.controlNav.setup(),n.vars.directionNav&&f.directionNav.setup(),n.vars.keyboard&&(1===$(n.containerSelector).length||n.vars.multipleKeyboard)&&$(document).bind("keyup",function(e){var t=e.keyCode;if(!n.animating&&(39===t||37===t)){var a=39===t?n.getTarget("next"):37===t?n.getTarget("prev"):!1;n.flexAnimate(a,n.vars.pauseOnAction)}}),n.vars.mousewheel&&n.bind("mousewheel",function(e,t,a,i){e.preventDefault();var s=0>t?n.getTarget("next"):n.getTarget("prev");n.flexAnimate(s,n.vars.pauseOnAction)}),n.vars.pausePlay&&f.pausePlay.setup(),n.vars.slideshow&&n.vars.pauseInvisible&&f.pauseInvisible.init(),n.vars.slideshow&&(n.vars.pauseOnHover&&n.hover(function(){n.manualPlay||n.manualPause||n.pause()},function(){n.manualPause||n.manualPlay||n.stopped||n.play()}),n.vars.pauseInvisible&&f.pauseInvisible.isHidden()||(n.vars.initDelay>0?n.startTimeout=setTimeout(n.play,n.vars.initDelay):n.play())),m&&f.asNav.setup(),r&&n.vars.touch&&f.touch(),(!p||p&&n.vars.smoothHeight)&&$(window).bind("resize orientationchange focus",f.resize),n.find("img").attr("draggable","false"),setTimeout(function(){n.vars.start(n)},200)},asNav:{setup:function(){n.asNav=!0,n.animatingTo=Math.floor(n.currentSlide/n.move),n.currentItem=n.currentSlide,n.slides.removeClass(i+"active-slide").eq(n.currentItem).addClass(i+"active-slide"),s?(t._slider=n,n.slides.each(function(){var e=this;e._gesture=new MSGesture,e._gesture.target=e,e.addEventListener("MSPointerDown",function(e){e.preventDefault(),e.currentTarget._gesture&&e.currentTarget._gesture.addPointer(e.pointerId)},!1),e.addEventListener("MSGestureTap",function(e){e.preventDefault();var t=$(this),a=t.index();$(n.vars.asNavFor).data("flexslider").animating||t.hasClass("active")||(n.direction=n.currentItem<a?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction,!1,!0,!0))})})):n.slides.on(o,function(e){e.preventDefault();var t=$(this),a=t.index(),s=t.offset().left-$(n).scrollLeft();0>=s&&t.hasClass(i+"active-slide")?n.flexAnimate(n.getTarget("prev"),!0):$(n.vars.asNavFor).data("flexslider").animating||t.hasClass(i+"active-slide")||(n.direction=n.currentItem<a?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction,!1,!0,!0))})}},controlNav:{setup:function(){n.manualControls?f.controlNav.setupManual():f.controlNav.setupPaging()},setupPaging:function(){var e="thumbnails"===n.vars.controlNav?"control-thumbs":"control-paging",t=1,a,s;if(n.controlNavScaffold=$('<ol class="'+i+"control-nav "+i+e+'"></ol>'),n.pagingCount>1)for(var r=0;r<n.pagingCount;r++){if(s=n.slides.eq(r),void 0===s.attr("data-thumb-alt")&&s.attr("data-thumb-alt",""),altText=""!==s.attr("data-thumb-alt")?altText=' alt="'+s.attr("data-thumb-alt")+'"':"",a="thumbnails"===n.vars.controlNav?'<img src="'+s.attr("data-thumb")+'"'+altText+"/>":'<a href="#">'+t+"</a>","thumbnails"===n.vars.controlNav&&!0===n.vars.thumbCaptions){var c=s.attr("data-thumbcaption");""!==c&&void 0!==c&&(a+='<span class="'+i+'caption">'+c+"</span>")}n.controlNavScaffold.append("<li>"+a+"</li>"),t++}n.controlsContainer?$(n.controlsContainer).append(n.controlNavScaffold):n.append(n.controlNavScaffold),f.controlNav.set(),f.controlNav.active(),n.controlNavScaffold.delegate("a, img",o,function(e){if(e.preventDefault(),""===l||l===e.type){var t=$(this),a=n.controlNav.index(t);t.hasClass(i+"active")||(n.direction=a>n.currentSlide?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction))}""===l&&(l=e.type),f.setToClearWatchedEvent()})},setupManual:function(){n.controlNav=n.manualControls,f.controlNav.active(),n.controlNav.bind(o,function(e){if(e.preventDefault(),""===l||l===e.type){var t=$(this),a=n.controlNav.index(t);t.hasClass(i+"active")||(a>n.currentSlide?n.direction="next":n.direction="prev",n.flexAnimate(a,n.vars.pauseOnAction))}""===l&&(l=e.type),f.setToClearWatchedEvent()})},set:function(){var e="thumbnails"===n.vars.controlNav?"img":"a";n.controlNav=$("."+i+"control-nav li "+e,n.controlsContainer?n.controlsContainer:n)},active:function(){n.controlNav.removeClass(i+"active").eq(n.animatingTo).addClass(i+"active")},update:function(e,t){n.pagingCount>1&&"add"===e?n.controlNavScaffold.append($('<li><a href="#">'+n.count+"</a></li>")):1===n.pagingCount?n.controlNavScaffold.find("li").remove():n.controlNav.eq(t).closest("li").remove(),f.controlNav.set(),n.pagingCount>1&&n.pagingCount!==n.controlNav.length?n.update(t,e):f.controlNav.active()}},directionNav:{setup:function(){var e=$('<ul class="'+i+'direction-nav"><li class="'+i+'nav-prev"><a class="'+i+'prev" href="#">'+n.vars.prevText+'</a></li><li class="'+i+'nav-next"><a class="'+i+'next" href="#">'+n.vars.nextText+"</a></li></ul>");n.customDirectionNav?n.directionNav=n.customDirectionNav:n.controlsContainer?($(n.controlsContainer).append(e),n.directionNav=$("."+i+"direction-nav li a",n.controlsContainer)):(n.append(e),n.directionNav=$("."+i+"direction-nav li a",n)),f.directionNav.update(),n.directionNav.bind(o,function(e){e.preventDefault();var t;(""===l||l===e.type)&&(t=$(this).hasClass(i+"next")?n.getTarget("next"):n.getTarget("prev"),n.flexAnimate(t,n.vars.pauseOnAction)),""===l&&(l=e.type),f.setToClearWatchedEvent()})},update:function(){var e=i+"disabled";1===n.pagingCount?n.directionNav.addClass(e).attr("tabindex","-1"):n.vars.animationLoop?n.directionNav.removeClass(e).removeAttr("tabindex"):0===n.animatingTo?n.directionNav.removeClass(e).filter("."+i+"prev").addClass(e).attr("tabindex","-1"):n.animatingTo===n.last?n.directionNav.removeClass(e).filter("."+i+"next").addClass(e).attr("tabindex","-1"):n.directionNav.removeClass(e).removeAttr("tabindex")}},pausePlay:{setup:function(){var e=$('<div class="'+i+'pauseplay"><a href="#"></a></div>');n.controlsContainer?(n.controlsContainer.append(e),n.pausePlay=$("."+i+"pauseplay a",n.controlsContainer)):(n.append(e),n.pausePlay=$("."+i+"pauseplay a",n)),f.pausePlay.update(n.vars.slideshow?i+"pause":i+"play"),n.pausePlay.bind(o,function(e){e.preventDefault(),(""===l||l===e.type)&&($(this).hasClass(i+"pause")?(n.manualPause=!0,n.manualPlay=!1,n.pause()):(n.manualPause=!1,n.manualPlay=!0,n.play())),""===l&&(l=e.type),f.setToClearWatchedEvent()})},update:function(e){"play"===e?n.pausePlay.removeClass(i+"pause").addClass(i+"play").html(n.vars.playText):n.pausePlay.removeClass(i+"play").addClass(i+"pause").html(n.vars.pauseText)}},touch:function(){function e(e){e.stopPropagation(),n.animating?e.preventDefault():(n.pause(),t._gesture.addPointer(e.pointerId),T=0,c=d?n.h:n.w,f=Number(new Date),l=v&&u&&n.animatingTo===n.last?0:v&&u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:v&&n.currentSlide===n.last?n.limit:v?(n.itemW+n.vars.itemMargin)*n.move*n.currentSlide:u?(n.last-n.currentSlide+n.cloneOffset)*c:(n.currentSlide+n.cloneOffset)*c)}function a(e){e.stopPropagation();var a=e.target._slider;if(a){var n=-e.translationX,i=-e.translationY;return T+=d?i:n,m=T,x=d?Math.abs(T)<Math.abs(-n):Math.abs(T)<Math.abs(-i),e.detail===e.MSGESTURE_FLAG_INERTIA?void setImmediate(function(){t._gesture.stop()}):void((!x||Number(new Date)-f>500)&&(e.preventDefault(),!p&&a.transitions&&(a.vars.animationLoop||(m=T/(0===a.currentSlide&&0>T||a.currentSlide===a.last&&T>0?Math.abs(T)/c+2:1)),a.setProps(l+m,"setTouch"))))}}function i(e){e.stopPropagation();var t=e.target._slider;if(t){if(t.animatingTo===t.currentSlide&&!x&&null!==m){var a=u?-m:m,n=a>0?t.getTarget("next"):t.getTarget("prev");t.canAdvance(n)&&(Number(new Date)-f<550&&Math.abs(a)>50||Math.abs(a)>c/2)?t.flexAnimate(n,t.vars.pauseOnAction):p||t.flexAnimate(t.currentSlide,t.vars.pauseOnAction,!0)}r=null,o=null,m=null,l=null,T=0}}var r,o,l,c,m,f,g,h,S,x=!1,y=0,b=0,T=0;s?(t.style.msTouchAction="none",t._gesture=new MSGesture,t._gesture.target=t,t.addEventListener("MSPointerDown",e,!1),t._slider=n,t.addEventListener("MSGestureChange",a,!1),t.addEventListener("MSGestureEnd",i,!1)):(g=function(e){n.animating?e.preventDefault():(window.navigator.msPointerEnabled||1===e.touches.length)&&(n.pause(),c=d?n.h:n.w,f=Number(new Date),y=e.touches[0].pageX,b=e.touches[0].pageY,l=v&&u&&n.animatingTo===n.last?0:v&&u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:v&&n.currentSlide===n.last?n.limit:v?(n.itemW+n.vars.itemMargin)*n.move*n.currentSlide:u?(n.last-n.currentSlide+n.cloneOffset)*c:(n.currentSlide+n.cloneOffset)*c,r=d?b:y,o=d?y:b,t.addEventListener("touchmove",h,!1),t.addEventListener("touchend",S,!1))},h=function(e){y=e.touches[0].pageX,b=e.touches[0].pageY,m=d?r-b:r-y,x=d?Math.abs(m)<Math.abs(y-o):Math.abs(m)<Math.abs(b-o);var t=500;(!x||Number(new Date)-f>t)&&(e.preventDefault(),!p&&n.transitions&&(n.vars.animationLoop||(m/=0===n.currentSlide&&0>m||n.currentSlide===n.last&&m>0?Math.abs(m)/c+2:1),n.setProps(l+m,"setTouch")))},S=function(e){if(t.removeEventListener("touchmove",h,!1),n.animatingTo===n.currentSlide&&!x&&null!==m){var a=u?-m:m,i=a>0?n.getTarget("next"):n.getTarget("prev");n.canAdvance(i)&&(Number(new Date)-f<550&&Math.abs(a)>50||Math.abs(a)>c/2)?n.flexAnimate(i,n.vars.pauseOnAction):p||n.flexAnimate(n.currentSlide,n.vars.pauseOnAction,!0)}t.removeEventListener("touchend",S,!1),r=null,o=null,m=null,l=null},t.addEventListener("touchstart",g,!1))},resize:function(){!n.animating&&n.is(":visible")&&(v||n.doMath(),p?f.smoothHeight():v?(n.slides.width(n.computedW),n.update(n.pagingCount),n.setProps()):d?(n.viewport.height(n.h),n.setProps(n.h,"setTotal")):(n.vars.smoothHeight&&f.smoothHeight(),n.newSlides.width(n.computedW),n.setProps(n.computedW,"setTotal")))},smoothHeight:function(e){if(!d||p){var t=p?n:n.viewport;e?t.animate({height:n.slides.eq(n.animatingTo).height()},e):t.height(n.slides.eq(n.animatingTo).height())}},sync:function(e){var t=$(n.vars.sync).data("flexslider"),a=n.animatingTo;switch(e){case"animate":t.flexAnimate(a,n.vars.pauseOnAction,!1,!0);break;case"play":t.playing||t.asNav||t.play();break;case"pause":t.pause()}},uniqueID:function(e){return e.filter("[id]").add(e.find("[id]")).each(function(){var e=$(this);e.attr("id",e.attr("id")+"_clone")}),e},pauseInvisible:{visProp:null,init:function(){var e=f.pauseInvisible.getHiddenProp();if(e){var t=e.replace(/[H|h]idden/,"")+"visibilitychange";document.addEventListener(t,function(){f.pauseInvisible.isHidden()?n.startTimeout?clearTimeout(n.startTimeout):n.pause():n.started?n.play():n.vars.initDelay>0?setTimeout(n.play,n.vars.initDelay):n.play()})}},isHidden:function(){var e=f.pauseInvisible.getHiddenProp();return e?document[e]:!1},getHiddenProp:function(){var e=["webkit","moz","ms","o"];if("hidden"in document)return"hidden";for(var t=0;t<e.length;t++)if(e[t]+"Hidden"in document)return e[t]+"Hidden";return null}},setToClearWatchedEvent:function(){clearTimeout(c),c=setTimeout(function(){l=""},3e3)}},n.flexAnimate=function(e,t,a,s,o){if(n.vars.animationLoop||e===n.currentSlide||(n.direction=e>n.currentSlide?"next":"prev"),m&&1===n.pagingCount&&(n.direction=n.currentItem<e?"next":"prev"),!n.animating&&(n.canAdvance(e,o)||a)&&n.is(":visible")){if(m&&s){var l=$(n.vars.asNavFor).data("flexslider");if(n.atEnd=0===e||e===n.count-1,l.flexAnimate(e,!0,!1,!0,o),n.direction=n.currentItem<e?"next":"prev",l.direction=n.direction,Math.ceil((e+1)/n.visible)-1===n.currentSlide||0===e)return n.currentItem=e,n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),!1;n.currentItem=e,n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),e=Math.floor(e/n.visible)}if(n.animating=!0,n.animatingTo=e,t&&n.pause(),n.vars.before(n),n.syncExists&&!o&&f.sync("animate"),n.vars.controlNav&&f.controlNav.active(),v||n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),n.atEnd=0===e||e===n.last,n.vars.directionNav&&f.directionNav.update(),e===n.last&&(n.vars.end(n),n.vars.animationLoop||n.pause()),p)r?(n.slides.eq(n.currentSlide).css({opacity:0,zIndex:1}),n.slides.eq(e).css({opacity:1,zIndex:2}),n.wrapup(c)):(n.slides.eq(n.currentSlide).css({zIndex:1}).animate({opacity:0},n.vars.animationSpeed,n.vars.easing),n.slides.eq(e).css({zIndex:2}).animate({opacity:1},n.vars.animationSpeed,n.vars.easing,n.wrapup));else{var c=d?n.slides.filter(":first").height():n.computedW,g,h,S;v?(g=n.vars.itemMargin,S=(n.itemW+g)*n.move*n.animatingTo,h=S>n.limit&&1!==n.visible?n.limit:S):h=0===n.currentSlide&&e===n.count-1&&n.vars.animationLoop&&"next"!==n.direction?u?(n.count+n.cloneOffset)*c:0:n.currentSlide===n.last&&0===e&&n.vars.animationLoop&&"prev"!==n.direction?u?0:(n.count+1)*c:u?(n.count-1-e+n.cloneOffset)*c:(e+n.cloneOffset)*c,n.setProps(h,"",n.vars.animationSpeed),n.transitions?(n.vars.animationLoop&&n.atEnd||(n.animating=!1,n.currentSlide=n.animatingTo),n.container.unbind("webkitTransitionEnd transitionend"),n.container.bind("webkitTransitionEnd transitionend",function(){clearTimeout(n.ensureAnimationEnd),n.wrapup(c)}),clearTimeout(n.ensureAnimationEnd),n.ensureAnimationEnd=setTimeout(function(){n.wrapup(c)},n.vars.animationSpeed+100)):n.container.animate(n.args,n.vars.animationSpeed,n.vars.easing,function(){n.wrapup(c)})}n.vars.smoothHeight&&f.smoothHeight(n.vars.animationSpeed)}},n.wrapup=function(e){p||v||(0===n.currentSlide&&n.animatingTo===n.last&&n.vars.animationLoop?n.setProps(e,"jumpEnd"):n.currentSlide===n.last&&0===n.animatingTo&&n.vars.animationLoop&&n.setProps(e,"jumpStart")),n.animating=!1,n.currentSlide=n.animatingTo,n.vars.after(n)},n.animateSlides=function(){!n.animating&&e&&n.flexAnimate(n.getTarget("next"))},n.pause=function(){clearInterval(n.animatedSlides),n.animatedSlides=null,n.playing=!1,n.vars.pausePlay&&f.pausePlay.update("play"),n.syncExists&&f.sync("pause")},n.play=function(){n.playing&&clearInterval(n.animatedSlides),n.animatedSlides=n.animatedSlides||setInterval(n.animateSlides,n.vars.slideshowSpeed),n.started=n.playing=!0,n.vars.pausePlay&&f.pausePlay.update("pause"),n.syncExists&&f.sync("play")},n.stop=function(){n.pause(),n.stopped=!0},n.canAdvance=function(e,t){var a=m?n.pagingCount-1:n.last;return t?!0:m&&n.currentItem===n.count-1&&0===e&&"prev"===n.direction?!0:m&&0===n.currentItem&&e===n.pagingCount-1&&"next"!==n.direction?!1:e!==n.currentSlide||m?n.vars.animationLoop?!0:n.atEnd&&0===n.currentSlide&&e===a&&"next"!==n.direction?!1:n.atEnd&&n.currentSlide===a&&0===e&&"next"===n.direction?!1:!0:!1},n.getTarget=function(e){return n.direction=e,"next"===e?n.currentSlide===n.last?0:n.currentSlide+1:0===n.currentSlide?n.last:n.currentSlide-1},n.setProps=function(e,t,a){var i=function(){var a=e?e:(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo,i=function(){if(v)return"setTouch"===t?e:u&&n.animatingTo===n.last?0:u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:n.animatingTo===n.last?n.limit:a;switch(t){case"setTotal":return u?(n.count-1-n.currentSlide+n.cloneOffset)*e:(n.currentSlide+n.cloneOffset)*e;case"setTouch":return u?e:e;case"jumpEnd":return u?e:n.count*e;case"jumpStart":return u?n.count*e:e;default:return e}}();return-1*i+"px"}();n.transitions&&(i=d?"translate3d(0,"+i+",0)":"translate3d("+i+",0,0)",a=void 0!==a?a/1e3+"s":"0s",n.container.css("-"+n.pfx+"-transition-duration",a),n.container.css("transition-duration",a)),n.args[n.prop]=i,(n.transitions||void 0===a)&&n.container.css(n.args),n.container.css("transform",i)},n.setup=function(e){if(p)n.slides.css({width:"100%","float":"left",marginRight:"-100%",position:"relative"}),"init"===e&&(r?n.slides.css({opacity:0,display:"block",webkitTransition:"opacity "+n.vars.animationSpeed/1e3+"s ease",zIndex:1}).eq(n.currentSlide).css({opacity:1,zIndex:2}):0==n.vars.fadeFirstSlide?n.slides.css({opacity:0,display:"block",zIndex:1}).eq(n.currentSlide).css({zIndex:2}).css({opacity:1}):n.slides.css({opacity:0,display:"block",zIndex:1}).eq(n.currentSlide).css({zIndex:2}).animate({opacity:1},n.vars.animationSpeed,n.vars.easing)),n.vars.smoothHeight&&f.smoothHeight();else{var t,a;"init"===e&&(n.viewport=$('<div class="'+i+'viewport"></div>').css({overflow:"hidden",position:"relative"}).appendTo(n).append(n.container),n.cloneCount=0,n.cloneOffset=0,u&&(a=$.makeArray(n.slides).reverse(),n.slides=$(a),n.container.empty().append(n.slides))),n.vars.animationLoop&&!v&&(n.cloneCount=2,n.cloneOffset=1,"init"!==e&&n.container.find(".clone").remove(),n.container.append(f.uniqueID(n.slides.first().clone().addClass("clone")).attr("aria-hidden","true")).prepend(f.uniqueID(n.slides.last().clone().addClass("clone")).attr("aria-hidden","true"))),n.newSlides=$(n.vars.selector,n),t=u?n.count-1-n.currentSlide+n.cloneOffset:n.currentSlide+n.cloneOffset,d&&!v?(n.container.height(200*(n.count+n.cloneCount)+"%").css("position","absolute").width("100%"),setTimeout(function(){n.newSlides.css({display:"block"}),n.doMath(),n.viewport.height(n.h),n.setProps(t*n.h,"init")},"init"===e?100:0)):(n.container.width(200*(n.count+n.cloneCount)+"%"),n.setProps(t*n.computedW,"init"),setTimeout(function(){n.doMath(),n.newSlides.css({width:n.computedW,marginRight:n.computedM,"float":"left",display:"block"}),n.vars.smoothHeight&&f.smoothHeight()},"init"===e?100:0))}v||n.slides.removeClass(i+"active-slide").eq(n.currentSlide).addClass(i+"active-slide"),n.vars.init(n)},n.doMath=function(){var e=n.slides.first(),t=n.vars.itemMargin,a=n.vars.minItems,i=n.vars.maxItems;n.w=void 0===n.viewport?n.width():n.viewport.width(),n.h=e.height(),n.boxPadding=e.outerWidth()-e.width(),v?(n.itemT=n.vars.itemWidth+t,n.itemM=t,n.minW=a?a*n.itemT:n.w,n.maxW=i?i*n.itemT-t:n.w,n.itemW=n.minW>n.w?(n.w-t*(a-1))/a:n.maxW<n.w?(n.w-t*(i-1))/i:n.vars.itemWidth>n.w?n.w:n.vars.itemWidth,n.visible=Math.floor(n.w/n.itemW),n.move=n.vars.move>0&&n.vars.move<n.visible?n.vars.move:n.visible,n.pagingCount=Math.ceil((n.count-n.visible)/n.move+1),n.last=n.pagingCount-1,n.limit=1===n.pagingCount?0:n.vars.itemWidth>n.w?n.itemW*(n.count-1)+t*(n.count-1):(n.itemW+t)*n.count-n.w-t):(n.itemW=n.w,n.itemM=t,n.pagingCount=n.count,n.last=n.count-1),n.computedW=n.itemW-n.boxPadding,n.computedM=n.itemM},n.update=function(e,t){n.doMath(),v||(e<n.currentSlide?n.currentSlide+=1:e<=n.currentSlide&&0!==e&&(n.currentSlide-=1),n.animatingTo=n.currentSlide),n.vars.controlNav&&!n.manualControls&&("add"===t&&!v||n.pagingCount>n.controlNav.length?f.controlNav.update("add"):("remove"===t&&!v||n.pagingCount<n.controlNav.length)&&(v&&n.currentSlide>n.last&&(n.currentSlide-=1,n.animatingTo-=1),f.controlNav.update("remove",n.last))),n.vars.directionNav&&f.directionNav.update()},n.addSlide=function(e,t){var a=$(e);n.count+=1,n.last=n.count-1,d&&u?void 0!==t?n.slides.eq(n.count-t).after(a):n.container.prepend(a):void 0!==t?n.slides.eq(t).before(a):n.container.append(a),n.update(t,"add"),n.slides=$(n.vars.selector+":not(.clone)",n),n.setup(),n.vars.added(n)},n.removeSlide=function(e){var t=isNaN(e)?n.slides.index($(e)):e;n.count-=1,n.last=n.count-1,isNaN(e)?$(e,n.slides).remove():d&&u?n.slides.eq(n.last).remove():n.slides.eq(e).remove(),n.doMath(),n.update(t,"remove"),n.slides=$(n.vars.selector+":not(.clone)",n),n.setup(),n.vars.removed(n)},f.init()},$(window).blur(function(t){e=!1}).focus(function(t){e=!0}),$.flexslider.defaults={namespace:"flex-",selector:".slides > li",animation:"fade",easing:"swing",direction:"horizontal",reverse:!1,animationLoop:!0,smoothHeight:!1,startAt:0,slideshow:!0,slideshowSpeed:7e3,animationSpeed:600,initDelay:0,randomize:!1,fadeFirstSlide:!0,thumbCaptions:!1,pauseOnAction:!0,pauseOnHover:!1,pauseInvisible:!0,useCSS:!0,touch:!0,video:!1,controlNav:!0,directionNav:!0,prevText:"Previous",nextText:"Next",keyboard:!0,multipleKeyboard:!1,mousewheel:!1,pausePlay:!1,pauseText:"Pause",playText:"Play",controlsContainer:"",manualControls:"",customDirectionNav:"",sync:"",asNavFor:"",itemWidth:0,itemMargin:0,minItems:1,maxItems:0,move:0,allowOneSlide:!0,start:function(){},before:function(){},after:function(){},end:function(){},added:function(){},removed:function(){},init:function(){}},$.fn.flexslider=function(e){if(void 0===e&&(e={}),"object"==typeof e)return this.each(function(){var t=$(this),a=e.selector?e.selector:".slides > li",n=t.find(a);1===n.length&&e.allowOneSlide===!0||0===n.length?(n.fadeIn(400),e.start&&e.start(t)):void 0===t.data("flexslider")&&new $.flexslider(this,e)});var t=$(this).data("flexslider");switch(e){case"play":t.play();break;case"pause":t.pause();break;case"stop":t.stop();break;case"next":t.flexAnimate(t.getTarget("next"),!0);break;case"prev":case"previous":t.flexAnimate(t.getTarget("prev"),!0);break;default:"number"==typeof e&&t.flexAnimate(e,!0)}}}(jQuery);
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
deleted file mode 100644
index 1a1fcdd8..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-* Slides, A Slideshow Plugin for jQuery
-* Intructions: http://slidesjs.com
-* By: Nathan Searles, http://nathansearles.com
-* Version: 1.1.9
-* Updated: September 5th, 2011
-*
-* 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.
-*/
-(function(a){a.fn.slides=function(b){return b=a.extend({},a.fn.slides.option,b),this.each(function(){function w(g,h,i){if(!p&&o){p=!0,b.animationStart(n+1);switch(g){case"next":l=n,k=n+1,k=e===k?0:k,r=f*2,g=-f*2,n=k;break;case"prev":l=n,k=n-1,k=k===-1?e-1:k,r=0,g=0,n=k;break;case"pagination":k=parseInt(i,10),l=a("."+b.paginationClass+" li."+b.currentClass+" a",c).attr("href").match("[^#/]+$"),k>l?(r=f*2,g=-f*2):(r=0,g=0),n=k}h==="fade"?b.crossfade?d.children(":eq("+k+")",c).css({zIndex:10}).fadeIn(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1)}):d.children(":eq("+l+")",c).fadeOut(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing)}):d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing,function(){a.browser.msie&&a(this).get(0).style.removeAttribute("filter")}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+k+")").css({left:r,display:"block"}),b.autoHeight?d.animate({left:g,height:d.children(":eq("+k+")").outerHeight()},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1}):d.animate({left:g},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1})),b.pagination&&(a("."+b.paginationClass+" li."+b.currentClass,c).removeClass(b.currentClass),a("."+b.paginationClass+" li:eq("+k+")",c).addClass(b.currentClass))}}function x(){clearInterval(c.data("interval"))}function y(){b.pause?(clearTimeout(c.data("pause")),clearInterval(c.data("interval")),u=setTimeout(function(){clearTimeout(c.data("pause")),v=setInterval(function(){w("next",i)},b.play),c.data("interval",v)},b.pause),c.data("pause",u)):x()}a("."+b.container,a(this)).children().wrapAll('<div class="slides_control"/>');var c=a(this),d=a(".slides_control",c),e=d.children().size(),f=d.children().outerWidth(),g=d.children().outerHeight(),h=b.start-1,i=b.effect.indexOf(",")<0?b.effect:b.effect.replace(" ","").split(",")[0],j=b.effect.indexOf(",")<0?i:b.effect.replace(" ","").split(",")[1],k=0,l=0,m=0,n=0,o,p,q,r,s,t,u,v;if(e<2)return a("."+b.container,a(this)).fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()}),a("."+b.next+", ."+b.prev).fadeOut(0),!1;if(e<2)return;h<0&&(h=0),h>e&&(h=e-1),b.start&&(n=h),b.randomize&&d.randomize(),a("."+b.container,c).css({overflow:"hidden",position:"relative"}),d.children().css({position:"absolute",top:0,left:d.children().outerWidth(),zIndex:0,display:"none"}),d.css({position:"relative",width:f*3,height:g,left:-f}),a("."+b.container,c).css({display:"block"}),b.autoHeight&&(d.children().css({height:"auto"}),d.animate({height:d.children(":eq("+h+")").outerHeight()},b.autoHeightSpeed));if(b.preload&&d.find("img:eq("+h+")").length){a("."+b.container,c).css({background:"url("+b.preloadImage+") no-repeat 50% 50%"});var z=d.find("img:eq("+h+")").attr("src")+"?"+(new Date).getTime();a("img",c).parent().attr("class")!="slides_control"?t=d.children(":eq(0)")[0].tagName.toLowerCase():t=d.find("img:eq("+h+")"),d.find("img:eq("+h+")").attr("src",z).load(function(){d.find(t+":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){a(this).css({zIndex:5}),a("."+b.container,c).css({background:""}),o=!0,b.slidesLoaded()})})}else d.children(":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()});b.bigTarget&&(d.children().css({cursor:"pointer"}),d.children().click(function(){return w("next",i),!1})),b.hoverPause&&b.play&&(d.bind("mouseover",function(){x()}),d.bind("mouseleave",function(){y()})),b.generateNextPrev&&(a("."+b.container,c).after('<a href="#" class="'+b.prev+'">Prev</a>'),a("."+b.prev,c).after('<a href="#" class="'+b.next+'">Next</a>')),a("."+b.next,c).click(function(a){a.preventDefault(),b.play&&y(),w("next",i)}),a("."+b.prev,c).click(function(a){a.preventDefault(),b.play&&y(),w("prev",i)}),b.generatePagination?(b.prependPagination?c.prepend("<ul class="+b.paginationClass+"></ul>"):c.append("<ul class="+b.paginationClass+"></ul>"),d.children().each(function(){a("."+b.paginationClass,c).append('<li><a href="#'+m+'">'+(m+1)+"</a></li>"),m++})):a("."+b.paginationClass+" li a",c).each(function(){a(this).attr("href","#"+m),m++}),a("."+b.paginationClass+" li:eq("+h+")",c).addClass(b.currentClass),a("."+b.paginationClass+" li a",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$"),n!=q&&w("pagination",j,q),!1}),a("a.link",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$")-1,n!=q&&w("pagination",j,q),!1}),b.play&&(v=setInterval(function(){w("next",i)},b.play),c.data("interval",v))})},a.fn.slides.option={preload:!1,preloadImage:"/img/loading.gif",container:"slides_container",generateNextPrev:!1,next:"next",prev:"prev",pagination:!0,generatePagination:!0,prependPagination:!1,paginationClass:"pagination",currentClass:"current",fadeSpeed:350,fadeEasing:"",slideSpeed:350,slideEasing:"",start:1,effect:"slide",crossfade:!1,randomize:!1,play:0,pause:0,hoverPause:!1,autoHeight:!1,autoHeightSpeed:350,bigTarget:!1,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}},a.fn.randomize=function(b){function c(){return Math.round(Math.random())-.5}return a(this).each(function(){var d=a(this),e=d.children(),f=e.length;if(f>1){e.hide();var g=[];for(i=0;i<f;i++)g[g.length]=i;g=g.sort(c),a.each(g,function(a,c){var f=e.eq(c),g=f.clone(!0);g.show().appendTo(d),b!==undefined&&b(f,g),f.remove()})}})}})(jQuery)
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/spacegallery.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/spacegallery.js
deleted file mode 100644
index 69ab2ccc..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/js/spacegallery.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- *
- * Spacegallery
- * Author: Stefan Petre www.eyecon.ro
- * 
- */
-
-(function($){
-	EYE.extend({
-		
-		spacegallery: {
-			
-			//default options (many options are controled via CSS)
-			defaults: {
-				border: 6, // border arround the image
-				perspective: 140, // perpective height
-				minScale: 0.2, // minimum scale for the image in the back
-				duration: 800, // aimation duration
-				loadingClass: null, // CSS class applied to the element while looading images
-				before: function(){return false},
-				after: function(){return false}
-			},
-			
-			animated: false,
-			
-			//position images
-			positionImages: function(el) {
-				var top = 0;
-				EYE.spacegallery.animated = false;
-				$(el)
-					.find('a')
-						.removeClass(el.spacegalleryCfg.loadingClass)
-						.end()
-					.find('img')
-						.removeAttr('height')
-						.each(function(nr){
-							var newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * el.spacegalleryCfg.asins[nr];
-							$(this)
-								.css({
-									top: el.spacegalleryCfg.tops[nr] + 'px',
-									marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px',
-									opacity: 1 - el.spacegalleryCfg.asins[nr]
-								})
-								.attr('width', parseInt(newWidth));
-							this.spacegallery.next = el.spacegalleryCfg.asins[nr+1];
-							this.spacegallery.nextTop = el.spacegalleryCfg.tops[nr+1] - el.spacegalleryCfg.tops[nr];
-							this.spacegallery.origTop = el.spacegalleryCfg.tops[nr];
-							this.spacegallery.opacity = 1 - el.spacegalleryCfg.asins[nr];
-							this.spacegallery.increment = el.spacegalleryCfg.asins[nr] - this.spacegallery.next;
-							this.spacegallery.current = el.spacegalleryCfg.asins[nr];
-							this.spacegallery.width = newWidth;
-						})
-			},
-			
-			//animate to nex image
-			next: function(e) {
-				if (EYE.spacegallery.animated === false) {
-					EYE.spacegallery.animated = true;
-					var el = this.parentNode;
-					el.spacegalleryCfg.before.apply(el);
-					$(el)
-						.css('spacegallery', 0)
-						.animate({
-							spacegallery: 100
-						},{
-							easing: 'easeOut',
-							duration: el.spacegalleryCfg.duration,
-							complete: function() {
-								$(el)
-									.find('img:last')
-									.prependTo(el);
-								EYE.spacegallery.positionImages(el);
-								el.spacegalleryCfg.after.apply(el);
-							},
-							step: function(now) {
-								$('img', this)
-									.each(function(nr){
-										var newWidth, top, next;
-										if (nr + 1 == el.spacegalleryCfg.images) {
-											top = this.spacegallery.origTop + this.spacegallery.nextTop * 4 * now /100;
-											newWidth = this.spacegallery.width * top / this.spacegallery.origTop;
-											$(this)
-												.css({
-													top: top + 'px',
-													opacity: 0.7 - now/100,
-													marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-												})
-												.attr('width', newWidth);
-										} else {
-											next = this.spacegallery.current - this.spacegallery.increment * now /100;
-											newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * next;
-											$(this).css({
-												top: this.spacegallery.origTop + this.spacegallery.nextTop * now /100 + 'px',
-												opacity: 1 - next,
-												marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-											})
-											.attr('width', newWidth);
-										}
-									});
-							}
-						});
-				}
-					
-				this.blur();
-				return false;
-			},
-			
-			autoNext: function(el) {
-				
-				if (EYE.spacegallery.animated === false) {
-					EYE.spacegallery.animated = true;
-					el.spacegalleryCfg.before.apply(el); // run the "before" function
-					$(el)
-						.css('spacegallery', 0)
-						.animate({
-							spacegallery: 100
-						},{
-							easing: 'easeOut',
-							duration: el.spacegalleryCfg.duration,
-							complete: function() { // after animation is complete, move the front image to the back
-								$(el)
-									.find('img:last') // find the last image in this div
-									.prependTo(el); // and stick it at the beginning
-								EYE.spacegallery.positionImages(el); // run "position images"
-								el.spacegalleryCfg.after.apply(el); //run the "after" function
-							},
-							step: function(now) {
-								$('img', this)
-									.each(function(nr){
-										var newWidth, top, next;
-										if (nr + 1 == el.spacegalleryCfg.images) {
-											top = this.spacegallery.origTop + this.spacegallery.nextTop * 4 * now /100;
-											newWidth = this.spacegallery.width * top / this.spacegallery.origTop;
-											$(this)
-												.css({
-													top: top + 'px',
-													opacity: 0.7 - now/100,
-													marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-												})
-												.attr('width', newWidth);
-										} else {
-											next = this.spacegallery.current - this.spacegallery.increment * now /100;
-											newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * next;
-											$(this).css({
-												top: this.spacegallery.origTop + this.spacegallery.nextTop * now /100 + 'px',
-												opacity: 1 - next,
-												marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-											})
-											.attr('width', newWidth);
-										}
-									});
-							}
-						});
-				}
-					
-				return false;
-			},
-			
-			//constructor
-			init: function(opt) {
-				opt = $.extend({}, EYE.spacegallery.defaults, opt||{});
-				return this.each(function(){
-					var el = this;
-					if ($(el).is('.spacegallery')) {
-						$('<a href="#"></a>')
-							.appendTo(this)
-							.addClass(opt.loadingClass)
-							.bind('click', EYE.spacegallery.next);
-						el.spacegalleryCfg = opt;
-						el.spacegalleryCfg.images = el.getElementsByTagName('img').length;
-						el.spacegalleryCfg.loaded = 0;
-						el.spacegalleryCfg.asin = Math.asin(1);
-						el.spacegalleryCfg.asins = {};
-						el.spacegalleryCfg.tops = {};
-						el.spacegalleryCfg.increment = parseInt(el.spacegalleryCfg.perspective/el.spacegalleryCfg.images, 10);
-						var top = 0;
-						$('img', el)
-							.each(function(nr){
-								var imgEl = new Image();
-								var elImg = this;
-								el.spacegalleryCfg.asins[nr] = 1 - Math.asin((nr+1)/el.spacegalleryCfg.images)/el.spacegalleryCfg.asin;
-								top += el.spacegalleryCfg.increment - el.spacegalleryCfg.increment * el.spacegalleryCfg.asins[nr];
-								el.spacegalleryCfg.tops[nr] = top;
-								elImg.spacegallery = {};
-								imgEl.src = this.src;
-								if (imgEl.complete) {
-									el.spacegalleryCfg.loaded ++;
-									elImg.spacegallery.origWidth = imgEl.width;
-									elImg.spacegallery.origHeight = imgEl.height
-								} else {
-									imgEl.onload = function() {
-										el.spacegalleryCfg.loaded ++;
-										elImg.spacegallery.origWidth = imgEl.width;
-										elImg.spacegallery.origHeight = imgEl.height
-										if (el.spacegalleryCfg.loaded == el.spacegalleryCfg.images) {
-										
-											EYE.spacegallery.positionImages(el);
-										}
-									};
-								}
-							});
-						el.spacegalleryCfg.asins[el.spacegalleryCfg.images] = el.spacegalleryCfg.asins[el.spacegalleryCfg.images - 1] * 1.3;
-						el.spacegalleryCfg.tops[el.spacegalleryCfg.images] = el.spacegalleryCfg.tops[el.spacegalleryCfg.images - 1] * 1.3;
-						if (el.spacegalleryCfg.loaded == el.spacegalleryCfg.images) {
-							EYE.spacegallery.positionImages(el);
-							setInterval(function() { EYE.spacegallery.autoNext(el); }, 4000);
-						}
-					}
-				});
-			}
-		}
-	});
-	
-	$.fn.extend({
-	
-		/**
-		 * Create a space gallery
-		 * @name spacegallery
-		 * @description create a space gallery
-		 * @option	int			border			Images' border. Default: 6
-		 * @option	int			perspective		Perpective height. Default: 140
-		 * @option	float		minScale		Minimum scale for the image in the back. Default: 0.2
-		 * @option	int			duration		Animation duration. Default: 800
-		 * @option	string		loadingClass	CSS class applied to the element while looading images. Default: null
-		 * @option	function	before			Callback function triggered before going to the next image
-		 * @option	function	after			Callback function triggered after going to the next image
-		 */
-		spacegallery: EYE.spacegallery.init
-	});
-	$.extend($.easing,{
-		easeOut:function (x, t, b, c, d) {
-			return -c *(t/=d)*(t-2) + b;
-		}
-	});
-})(jQuery);
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css
deleted file mode 100644
index ffabe274..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/css/jquery.jOrgChart.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Basic styling */
-/* Draw the lines */
-.jOrgChart .line {
-  height                : 20px;
-  width                 : 4px;
-}
-
-.jOrgChart .down {
-  background-color 		: black;	
-  margin 				: 0px auto;
-}
-
-.jOrgChart .top {
-  border-top          : 3px solid black;
-}
-
-.jOrgChart .left {
-  border-right          : 2px solid black;
-}
-
-.jOrgChart .right {
-  border-left           : 2px solid black;
-}
-
-/* node cell */
-.jOrgChart td {
-  text-align            : center;
-  vertical-align        : top;
-  padding               : 0;
-}
-
-/* The node */
-.jOrgChart .node {
-  background-color 		: #35363B;
-  display               : inline-block;
-  width                 : 120px;
-  height                : 60px;
-  z-index 				: 10;
-  margin               : 0 2px;
-}
-
-/* jQuery drag 'n drop */
-
-.drag-active {
-  border-style			: dashed !important;
-}
-
-.drop-hover {
-  border-style			: solid !important;
-  border-color 			: #E05E00 !important;
-}
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example.html b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example.html
deleted file mode 100644
index 543b0f92..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title>jOrgChart - A jQuery OrgChart Plugin</title>
-    <link rel="stylesheet" href="css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="css/jquery.jOrgChart.css"/>
-    <link rel="stylesheet" href="css/custom.css"/>
-    <link href="css/prettify.css" type="text/css" rel="stylesheet" />
-
-    <script type="text/javascript" src="prettify.js"></script>
-    
-    <!-- jQuery includes -->
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
-    
-    <script src="jquery.jOrgChart.js"></script>
-
-    <script>
-    jQuery(document).ready(function() {
-        $("#org").jOrgChart({
-            chartElement : '#chart',
-            dragAndDrop  : true
-        });
-    });
-    </script>
-  </head>
-
-  <body onload="prettyPrint();">
-    <ul id="org" style="display:none">
-      <li>Product 1<br/>
-        <ul>
-          <li>Service 1<br/>
-            <ul>
-			  <li>Resource 1<br/></li>
-			  <li>Resource 2<br/></li>
-			  <li>Resource 3<br/></li>
-			  <li>Resource 4<br/></li>
-			  <li>Resource 5<br/></li>
-            </ul>
-          </li>
-          <li>Service 6<br/></li>
-          <li>Service 7<br/>
-            <ul>
-			  <li>Resource 8<br/></li>
-			  <li>Resource 9<br/></li>
-			  <li>Resource 10<br/></li>
-			  <li>Resource 11<br/></li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-   </ul>            
-    
-    <div id="chart" class="orgChart"></div>
-    
-    <script>
-        jQuery(document).ready(function() {
-            
-            /* Custom jQuery for the example */
-            $("#show-list").click(function(e){
-                e.preventDefault();
-                
-                $('#list-html').toggle('fast', function(){
-                    if($(this).is(':visible')){
-                        $('#show-list').text('Hide underlying list.');
-                        $(".topbar").fadeTo('fast',0.9);
-                    }else{
-                        $('#show-list').text('Show underlying list.');
-                        $(".topbar").fadeTo('fast',1);                  
-                    }
-                });
-            });
-            
-            $('#list-html').text($('#org').html());
-            
-            $("#org").bind("DOMSubtreeModified", function() {
-                $('#list-html').text('');
-                
-                $('#list-html').text($('#org').html());
-                
-                prettyPrint();                
-            });
-        });
-    </script>
-</body>
-</html>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html
deleted file mode 100644
index a2e3703d..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/example_vsp.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title>jOrgChart - A jQuery OrgChart Plugin</title>
-    <link rel="stylesheet" href="css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="css/jquery.jOrgChart.css"/>
-    <link rel="stylesheet" href="css/custom.css"/>
-    <link href="css/prettify.css" type="text/css" rel="stylesheet" />
-
-    <script type="text/javascript" src="prettify.js"></script>
-    
-    <!-- jQuery includes -->
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
-    
-    <script src="jquery.jOrgChart.js"></script>
-
-    <script>
-    jQuery(document).ready(function() {
-        $("#org").jOrgChart({
-            chartElement : '#chart',
-            dragAndDrop  : true
-        });
-    });
-    </script>
-  </head>
-
-  <body onload="prettyPrint();">
-    <ul id="org" style="display:none">
-      <li>Trinity<br/>
-        <ul>
-          <li>Call Forwarding<br/>
-            <ul>
-			  <li>Call Forwarding Busy<br/></li>
-			  <li>Call Forwarding Always<br/></li>
-			  <li>Call Forwarding Not Reachable<br/></li>
-            </ul>
-          </li>
-          <li>Dial Restrictions<br/>
-            <ul>
-			  <li>Outgoing Calls<br/></li>
-			  <li>Redirecting Calls<br/></li>
-			  <li>Incoming Calls<br/></li>
-            </ul>
-          </li>
-          <li>Messaging<br/>
-            <ul>
-			  <li>Voice Management<br/></li>
-			  <li>Greetings<br/></li>
-			  <li>Fax Messaging<br/></li>
-            </ul>
-          </li>
-        </ul>
-      </li>
-   </ul>            
-    
-    <div id="chart" class="orgChart"></div>
-    
-    <script>
-        jQuery(document).ready(function() {
-            
-            /* Custom jQuery for the example */
-            $("#show-list").click(function(e){
-                e.preventDefault();
-                
-                $('#list-html').toggle('fast', function(){
-                    if($(this).is(':visible')){
-                        $('#show-list').text('Hide underlying list.');
-                        $(".topbar").fadeTo('fast',0.9);
-                    }else{
-                        $('#show-list').text('Show underlying list.');
-                        $(".topbar").fadeTo('fast',1);                  
-                    }
-                });
-            });
-            
-            $('#list-html').text($('#org').html());
-            
-            $("#org").bind("DOMSubtreeModified", function() {
-                $('#list-html').text('');
-                
-                $('#list-html').text($('#org').html());
-                
-                prettyPrint();                
-            });
-        });
-    </script>
-  </body>
-</html>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
deleted file mode 100644
index 3bbaf5ee..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
deleted file mode 100644
index e79a0515..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js b/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js
deleted file mode 100644
index 89411b29..00000000
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/static/fusion/sample/org_chart/jquery.jOrgChart.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- * jQuery org-chart/tree plugin.
- *
- * Author: Wes Nolte
- * http://twitter.com/wesnolte
- *
- * Based on the work of Mark Lee
- * http://www.capricasoftware.co.uk 
- *
- * Copyright (c) 2011 Wesley Nolte
- * Dual licensed under the MIT and GPL licenses.
- *
- */
-(function($) {
-
-  $.fn.jOrgChart = function(options) {
-    var opts = $.extend({}, $.fn.jOrgChart.defaults, options);
-    var $appendTo = $(opts.chartElement);
-
-    // build the tree
-    $this = $(this);
-    var $container = $("<div class='" + opts.chartClass + "'/>");
-    if($this.is("ul")) {
-      buildNode($this.find("li:first"), $container, 0, opts);
-    }
-    else if($this.is("li")) {
-      buildNode($this, $container, 0, opts);
-    }
-    $appendTo.append($container);
-
-    // add drag and drop if enabled
-    if(opts.dragAndDrop){
-        $('div.node').draggable({
-            cursor      : 'move',
-            distance    : 40,
-            helper      : 'clone',
-            opacity     : 0.8,
-            revert      : true,
-            revertDuration : 100,
-            snap        : 'div.node.expanded',
-            snapMode    : 'inner',
-            stack       : 'div.node'
-        });
-        
-        $('div.node').droppable({
-            accept      : '.node',          
-            activeClass : 'drag-active',
-            hoverClass  : 'drop-hover'
-        });
-        
-      // Drag start event handler for nodes
-      $('div.node').bind("dragstart", function handleDragStart( event, ui ){
-        
-        var sourceNode = $(this);
-        sourceNode.parentsUntil('.node-container')
-                   .find('*')
-                   .filter('.node')
-                   .droppable('disable');
-      });
-
-      // Drag stop event handler for nodes
-      $('div.node').bind("dragstop", function handleDragStop( event, ui ){
-
-        /* reload the plugin */
-        $(opts.chartElement).children().remove();
-        $this.jOrgChart(opts);      
-      });
-    
-      // Drop event handler for nodes
-      $('div.node').bind("drop", function handleDropEvent( event, ui ) {    
-        var sourceNode = ui.draggable;
-        var targetNode = $(this);
-        
-        // finding nodes based on plaintext and html
-        // content is hard!
-        var targetLi = $('li').filter(function(){
-            
-            li = $(this).clone()
-                        .children("ul,li")
-                        .remove()
-                    .end();
-                    var attr = li.attr('id');
-                    if (typeof attr !== 'undefined' && attr !== false) {
-                        return li.attr("id") == targetNode.attr("id");
-                    }
-                    else {
-                        return li.html() == targetNode.html();
-                    }
-            
-        });     
-        
-        var sourceLi = $('li').filter(function(){
-            
-            li = $(this).clone()
-                        .children("ul,li")
-                        .remove()
-                    .end();
-                    var attr = li.attr('id');
-                    if (typeof attr !== 'undefined' && attr !== false) {
-                        return li.attr("id") == sourceNode.attr("id");
-                    }
-                    else {
-                        return li.html() == sourceNode.html();
-                    }
-            
-        });
-        
-        var sourceliClone = sourceLi.clone();
-        var sourceUl = sourceLi.parent('ul');
-        
-        if(sourceUl.children('li').size() > 1){
-            sourceLi.remove();          
-        }else{
-            sourceUl.remove();
-        }
-        
-        var id = sourceLi.attr("id");
-
-        if(targetLi.children('ul').size() >0){
-            if (typeof id !== 'undefined' && id !== false) {
-                targetLi.children('ul').append('<li id="'+id+'">'+sourceliClone.html()+'</li>');
-            }else{
-                targetLi.children('ul').append('<li>'+sourceliClone.html()+'</li>');        
-            }
-        }else{
-            if (typeof id !== 'undefined' && id !== false) {
-                targetLi.append('<ul><li id="'+id+'">'+sourceliClone.html()+'</li></ul>');
-            }else{
-                targetLi.append('<ul><li>'+sourceliClone.html()+'</li></ul>');                  
-            }
-        }
-        
-      }); // handleDropEvent
-        
-    } // Drag and drop
-  };
-
-  // Option defaults
-  $.fn.jOrgChart.defaults = {
-    chartElement : 'body',
-    depth      : -1,
-    chartClass : "jOrgChart",
-    dragAndDrop: false
-  };
-
-  // Method that recursively builds the tree
-  function buildNode($node, $appendTo, level, opts) {
-    var $table = $("<table cellpadding='0' cellspacing='0' border='0'/>");
-    var $tbody = $("<tbody/>");
-
-    // Construct the node container(s)
-    var $nodeRow = $("<tr/>").addClass("node-cells");
-    var $nodeCell = $("<td/>").addClass("node-cell").attr("colspan", 2);
-    var $childNodes = $node.children("ul:first").children("li");
-    var $nodeDiv;
-    
-    if($childNodes.length > 1) {
-      $nodeCell.attr("colspan", $childNodes.length * 2);
-    }
-    // Draw the node
-    // Get the contents - any markup except li and ul allowed
-    var $nodeContent = $node.clone()
-                            .children("ul,li")
-                            .remove()
-                        .end()
-                        .html();
-                        
-    var new_node_id = $node.attr("id");
-    if (typeof new_node_id !== 'undefined' && new_node_id !== false) {
-        $nodeDiv = $("<div>").addClass("node").attr("id", $node.attr("id")).append($nodeContent);
-    }else{
-        $nodeDiv = $("<div>").addClass("node").append($nodeContent);
-    }
-
-    // Expand and contract nodes
-    if ($childNodes.length > 0) {
-      $nodeDiv.click(function() {
-          var $this = $(this);
-          var $tr = $this.closest("tr");
-
-          if($tr.hasClass('contracted')){
-            $this.css('cursor','n-resize');
-            $tr.removeClass('contracted').addClass('expanded');
-            $tr.nextAll("tr").css('visibility', '');
-          }else{
-            $this.css('cursor','s-resize');
-            $tr.removeClass('expanded').addClass('contracted');
-            $tr.nextAll("tr").css('visibility', 'hidden');
-          }
-        });
-    }
-    
-    $nodeCell.append($nodeDiv);
-    $nodeRow.append($nodeCell);
-    $tbody.append($nodeRow);
-
-    if($childNodes.length > 0) {
-      // if it can be expanded then change the cursor
-      $nodeDiv.css('cursor','n-resize').addClass('expanded');
-    
-      // recurse until leaves found (-1) or to the level specified
-      if(opts.depth == -1 || (level+1 < opts.depth)) { 
-        var $downLineRow = $("<tr/>");
-        var $downLineCell = $("<td/>").attr("colspan", $childNodes.length*2);
-        $downLineRow.append($downLineCell);
-        
-        // draw the connecting line from the parent node to the horizontal line 
-        $downLine = $("<div></div>").addClass("line down");
-        $downLineCell.append($downLine);
-        $tbody.append($downLineRow);
-
-        // Draw the horizontal lines
-        var $linesRow = $("<tr/>");
-        $childNodes.each(function() {
-          var $left = $("<td>&nbsp;</td>").addClass("line left top");
-          var $right = $("<td>&nbsp;</td>").addClass("line right top");
-          $linesRow.append($left).append($right);
-        });
-
-        // horizontal line shouldn't extend beyond the first and last child branches
-        $linesRow.find("td:first")
-                    .removeClass("top")
-                 .end()
-                 .find("td:last")
-                    .removeClass("top");
-
-        $tbody.append($linesRow);
-        var $childNodesRow = $("<tr/>");
-        $childNodes.each(function() {
-           var $td = $("<td class='node-container'/>");
-           $td.attr("colspan", 2);
-           // recurse through children lists and items
-           buildNode($(this), $td, level+1, opts);
-           $childNodesRow.append($td);
-        });
-
-      }
-      $tbody.append($childNodesRow);
-    }
-
-    // any classes on the LI element get copied to the relevant node in the tree
-    // apart from the special 'collapsed' class, which collapses the sub-tree at this point
-    if ($node.attr('class') != undefined) {
-        var classList = $node.attr('class').split(/\s+/);
-        $.each(classList, function(index,item) {
-            if (item == 'collapsed') {
-                $nodeRow.nextAll('tr').css('display', 'none');
-                    $nodeRow.removeClass('expanded');
-                    $nodeRow.addClass('contracted');
-                    $nodeDiv.css('cursor','s-resize');
-            } else {
-                $nodeDiv.addClass(item);
-            }
-        });
-    }
-
-    $table.append($tbody);
-    $appendTo.append($table);
-    
-    /* Prevent trees collapsing if a link inside a node is clicked */
-    $nodeDiv.children('a').click(function(e){
-        console.log(e);
-        e.stopPropagation();
-    });
-  };
-
-})(jQuery);
diff --git a/ecomp-sdk/epsdk-app-overlay/README.md b/ecomp-sdk/epsdk-app-overlay/README.md
index 9bd382ab..1a0798f9 100644
--- a/ecomp-sdk/epsdk-app-overlay/README.md
+++ b/ecomp-sdk/epsdk-app-overlay/README.md
@@ -20,6 +20,7 @@ AngularJS version 1.5.0.
 Version 1.3.0
 - [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
 - [PORTAL-17] removing eye.js and utils.js - rework
+- [PORTAL-21] Increased Role name size in UI  
 
 Version 1.1.0
 [Portal-7] Improvements added as part of the rebasing process
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp
deleted file mode 100644
index 0bd373b7..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_header_include.jsp
+++ /dev/null
@@ -1,135 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page import="java.net.*" %>
-
-
-<script src='dwr/engine.js'></script>
-<script src='dwr/util.js'></script>
-<script src='dwr/interface/fusionAjax.js'></script>
-
-<%@ include file="/WEB-INF/fusion/jsp/include.jsp" %>
-
-<%
-   String url = request.getParameter("returnUrl");
-
-   if (url != null) {
-     request.setAttribute("returnUrl", URLDecoder.decode(url, "UTF-8"));
-   }
-
-%>
-
-<BODY height="100%">
-<form name="listForm" action="<%=request.getAttribute("returnUrl")%>" method="POST" target="_parent">
-  <input type="hidden" name="selected" value=""/>
-</form>
-
-
-<!-- Submit record action functionality -->
-<script type="text/javascript">
-  function submitAction(actionUrl, task, actionUrlParameters) {
-
-   var formFieldParameters = "";	  
-   var actionUrlHtml       = actionUrl;
-   
-   <!-- Keep track of form field params to ensure the refreshed list matches  -->
-   <c:if test="${(param['reset_action'] ne 'Y') && (param['reset_action'] ne 'y')}">
-     <c:forEach items="${param}" var="request_param">
- 	  <c:if test="${fn:startsWith(request_param.key,\"ff\")}">   
-	    <c:if test="${!empty request_param.value}">
-	      formFieldParameters += "&${request_param.key}=${v:decodeUrl(request_param.value)}";
-	    </c:if>   
-	  </c:if> 
-   </c:forEach>
- </c:if>   
-
-   if (task != null) {
-     actionUrlHtml += "?task=" + task;
-   }	     
-
-   if (actionUrlParameters != null) {
-    actionUrlHtml += "&" + actionUrlParameters; 
-   }	     
-
-   
-   document.listForm.action = actionUrlHtml + formFieldParameters; 
-   document.listForm.submit();	  
-  }
-</script>
-  
-<!-- Select Profile functionality -->
-<script type="text/javascript">
-  function submitSelection() {
-    var selectedProfiles = document.listForm.selected;
-    var      allProfiles = document.formd.selected;
-    var          numRows = null;
-
-    if (allProfiles) {
-      numRows = allProfiles.length;
-
-      if (numRows) {
-        for (i=0; i < numRows; i++) {
-          if (allProfiles[i].checked) {
-            selectedProfiles.value += allProfiles[i].value + ",";
-          }
-        }
-
-        if (selectedProfiles.value != '') {
-          selectedProfiles.value = selectedProfiles.value.substring(0, selectedProfiles.value.length-1);
-        }
-      }
-      else {
-        if (allProfiles.checked) {
-          selectedProfiles.value += allProfiles.value;
-        }
-      }
-    }
-
-    //alert(selectedProfiles.value);
-    document.listForm.submit();
-  }
-</script>
-
-
-<!-- Profile Search activation/deactivation functionality -->
-<script type="text/javascript">
-  function toggleUserActive(element, userId) {
-    var user_id = "'"+${user.id}+"'";
-	if(user_id.length == 0) user_id = 1;
-	else
-    fusionAjax.toggleUserActive(${user.id}, userId, toggleUserActiveCB);
-    return false;
-  }
-
-  function toggleUserActiveCB(data) {
-    var element = document.getElementById('user_active_' + data);
-    if(element.alt == "Activate") {
-      element.src = "static/fusion/images/active.gif";
-      element.alt = "Inactivate";
-    }
-    else {
-      element.src = "static/fusion/images/inactive.gif";
-      element.alt = "Activate";
-    }
-  }
-</script>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp
deleted file mode 100644
index 5abbb5ad..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/custom_js_include.jsp
+++ /dev/null
@@ -1,31 +0,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.
-  ================================================================================
-  --%>
-<%-- <!--<script>
-  function getSessionTime() {
-	  var session_Time = '<%=session.getMaxInactiveInterval()%>';
-	  if (session_Time.length <=0) {
-		session_Time = '1800';		  
-	  }
-	  return eval(session_Time);
-  }
-</script>-->
-
-<script type='text/javascript' src="static/inc/SessionWarningTimer.js"></script>
---%>   
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp
deleted file mode 100644
index fd2f9c36..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_end_field_run_sql.jsp
+++ /dev/null
@@ -1,38 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-<script language="JavaScript">
-   function postSQL() {
-	 document.formb.<%= AppConstants.RI_FORMATTED_SQL %>.value=window.opener.forma.rangeEndDateSQL.value;
-	 window.opener.setDefaultVerifyFlag();
-	 document.formb.submit();
-   }
-
-</script>
-<body onLoad="postSQL()">
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-  <input type="hidden" name="action" value="raptor">
-  <input type="hidden" name="r_action" value="report.popup.testrun.sql">
-  <input type="hidden" name="<%= AppConstants.RI_FORMATTED_SQL %>" value="">
-</form>
-</body>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp
deleted file mode 100644
index 69827262..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/date_start_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-<script language="JavaScript">
-  
-   function postSQL() {
-	 document.formb.<%= AppConstants.RI_FORMATTED_SQL %>.value=window.opener.forma.rangeStartDateSQL.value;
-	 window.opener.setDefaultVerifyFlag();
-	 document.formb.submit();
-   }
-
-</script>
-<body onLoad="postSQL()">
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-  <input type="hidden" name="action" value="raptor">
-  <input type="hidden" name="r_action" value="report.popup.testrun.sql">
-  <input type="hidden" name="<%= AppConstants.RI_FORMATTED_SQL %>" value="">
-</form>
-</body>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp
deleted file mode 100644
index 95c99f37..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/default_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-<script language="JavaScript">
-  
-   function postSQL() {
-	 document.formb.<%= AppConstants.RI_FORMATTED_SQL %>.value=window.opener.forma.fieldDefaultSQL.value;
-	 window.opener.setDefaultVerifyFlag();
-	 document.formb.submit();
-   }
-
-</script>
-<body onLoad="postSQL()">
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-  <input type="hidden" name="action" value="raptor">
-  <input type="hidden" name="r_action" value="report.popup.testrun.sql">
-  <input type="hidden" name="<%= AppConstants.RI_FORMATTED_SQL %>" value="">
-</form>
-</body>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp
deleted file mode 100644
index d5d25249..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/disclaimer.jsp
+++ /dev/null
@@ -1,38 +0,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.
-  ================================================================================
-  --%>
-<% if(org.openecomp.portalsdk.analytics.system.Globals.getShowDisclaimer()) { %>
-
-  <table width="100%" align="left" border="0" cellspacing="0" cellpadding="0">
-     <tr><td>&nbsp;</td></tr>
-     <%if(!org.openecomp.portalsdk.analytics.system.Globals.hideRaptorFooter()) { %>
-     <tr>
-     <td>&nbsp;&nbsp;&nbsp;</td>
-     	  
-     </tr>	 
-     <% } %>	 
-     <tr>
-        <td>&nbsp;&nbsp;&nbsp;</td>
-       
-     </tr>
-     <tr><td>&nbsp;</td></tr>
-  </table>
-
-<% } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp
deleted file mode 100644
index 8158e604..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_include.jsp
+++ /dev/null
@@ -1,58 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ArrayList alErrorList = (ArrayList) request.getAttribute(AppConstants.RI_ERROR_LIST);
-	if((alErrorList!=null)&&(alErrorList.size()>0)) { %>
-<br>
-<table width="94%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align="center">
-	<tr class=rbg7>
-		<td class=rtabletext colspan=2 align=center>
-			<b class=rerrortext>Validation Errors Found</b><br>
-			Following errors need to be corrected to continue:
-		</td>
-	</tr>
-<%		for(int i=0; i<alErrorList.size(); i++) {
-			String sErrorMsg = (String) alErrorList.get(i);
-			if(sErrorMsg!=null&&sErrorMsg.indexOf("|")>=0)
-				sErrorMsg = sErrorMsg.substring(sErrorMsg.indexOf("|")+1);
-			if((i%2)==0) { %>
-	<tr class=rbg6>
-<%			} %>
-		<td class=rtabletext width=50%>
-			<font class=rerrortextsm><li class=rerrortextsm><%= sErrorMsg %></font>
-		</td>
-<%			if((i%2)==1) { %>
-	</tr>
-<%			}
-		}	// for
-%>		
-<%		if((alErrorList.size()%2)==1) { %>
-	<tr> 
-		<td class=rtabletext width=50%>
-			<font class=rerrortextsm>&nbsp;</font>
-		</td>
-	</tr>
-<%		} %>
-</table>
-<%	}	// if 
-%>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp
deleted file mode 100644
index 8ee73be0..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/error_page.jsp
+++ /dev/null
@@ -1,229 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserAccessException"%>
-<%@ page import="org.openecomp.portalsdk.analytics.error.RaptorException"%>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserDefinedException"%>
-<%@ page isErrorPage="true" %>
-
-
-<% java.lang.Exception ex = (Exception) request.getAttribute(AppConstants.RI_EXCEPTION); %>
-<%	boolean showEditLink = false;
-	if(AppUtils.getRequestNvlValue(request, "r_action").equals("report.run")) {
-		ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-		if(rr!=null)
-			try {
-				rr.checkUserWriteAccess(request);
-				showEditLink = true;
-			} catch(Exception e) {}
-	}	// if
-%>
-
-
-
-<html>
-
-<head>
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/ral.css">
-	<title>Application Error</title>
-	</head>
-
-<body bgcolor="#FFFFFF">
-<%-- jsp:include page="custom_header_include.jsp" flush="true" /--%>
-
-<form name="forma" action="raptor.htm" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="r_action" value="report.edit">
-	<input type="hidden" name="c_master" value="<%= AppUtils.getRequestNvlValue(request, "c_master") %>">
-	<input type="hidden" name="source_page" value="report_run">
-
-<br>
-<table class="mTAB" width="94%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr class=rbg1>
-		<td width="90%" class=rtext2 nowrap>
-<% if(showEditLink) { %>
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit report" width="12" height="12">
-<% } %>
-			<b class=rtableheader>Error/User-Alert Message:</b>
-		</td>
-	</tr>
-<% if(ex!=null) { %>
-    <% if(ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)  { %>
-     <% if(AppUtils.isAdminUser(request)) { %>
-	<tr class=rowalt1>
-		<td width="90%" class=rtext2 nowrap>
-			<font class=rtabletext><b>Exception Class: </b><%= (ex!=null && ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?ex.getClass().toString():"" %></font>
-		</td>
-	</tr>
-	<% } %>
-	<tr class=rowalt2>
-		<td width="90%" class=rtext2 nowrap><font class=rtabletext><b>Message:</b>&nbsp;<%= (ex!=null && ex instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?ex.getMessage():"" %></font>
-		</td>
-	</tr>
-	<% }  %>
-		<% if(ex!=null) ex.printStackTrace(); %>
-			<%		if(AppUtils.isAdminUser(request)) {
-					if ((ex instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)||
-						(request.getAttribute("c_error_sql")!=null && !((String) request.getAttribute("c_error_sql")).trim().equals(""))) { 
-						String sql = "";
-						if(ex instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)
-							sql = ((org.openecomp.portalsdk.analytics.error.ReportSQLException) ex).getReportSQL(); 
-						else
-							sql = (String) request.getAttribute("c_error_sql"); %>
-						<% if (sql!=null && sql.length() > 0) { %>	
-						<tr class=rowalt1>
-							<td width="90%">
-								<b class=rtabletext>SQL Execution Error:</b>
-							</td>
-						</tr>
-						<tr class=rowalt2>
-							<td width="90%">
-								<font class=rtabletext><%= sql %></font>
-							</td>
-						</tr>
-			<% 			request.setAttribute("c_error_sql", sql);
-				%>
-				        <% }  %>
-				<tr class=rowalt1>
-					<td width="90%">
-						<b class=rtabletext>Error Message:</b><br>
-						<font class=rtabletext><%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %></font>
-					</td>
-				</tr>
-			<%		if(request.getAttribute("c_error_url")!=null && !((String) request.getAttribute("c_error_url")).trim().equals("")) { %>
-				<tr class=rowalt1>
-					<td width="90%">
-						<font class=rtabletext>Please <a href="<%= (String) request.getAttribute("c_error_url") %>">click here</a> to edit report definition.</font>
-					</td>
-				</tr>
-			<%		} // if %>
-			<% } else { // reportSQLException 
-				if (ex instanceof RaptorException) { %>
-					<tr class=rowalt1>
-					<td width="90%">
-						<b class=rtabletext>Error Message:</b><br>
-						<font class=rtabletext><%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %></font>
-					</td>
-				</tr>	                 
-			<%} %>
-			<% } %>
-			<% } else { 
-				if (ex instanceof UserAccessException) { %>
-					<tr class=rowalt1>
-					<td width="90%">
-						<b class=rtabletext>Error Message:</b><br>
-						<font class=rtabletext><%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %></font>
-					</td>
-				</tr>					
-			<%	} else if (ex instanceof UserDefinedException) { %>
-				<tr class=rowalt1>
-					<td width="90%">
-						<b class=rtabletext>Error Message:</b><br>
-						<font class=rtabletext><%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %></font>
-					</td>
-				</tr>	
-			<%	}
-			 } %>
-				<tr class=rowalt2>
-					<td width="90%">
-						<font class=rtabletext>** The system administrator has been notified for this error.</font>
-					</td>
-				</tr>		
-<% } else { %>
-<% if(exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)  { %>
-     <% if(AppUtils.isAdminUser(request)) { %>
-	<tr class=rowalt1>
-	<td width="90%" class=rtext2 nowrap>
-		<font class=rtabletext><b>Exception Class: </b><%= (exception!=null && exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?exception.getClass().toString():"" %></font>
-	</td>
-</tr>
-   <% } %>
-<tr class=rowalt2>
-	<td width="90%" class=rtext2 nowrap><font class=rtabletext><b>Message:</b>&nbsp;<%= (exception!=null && exception instanceof org.openecomp.portalsdk.analytics.error.RaptorSchedularException)?exception.getMessage():"" %></font>
-		</td>
-		<% if(exception!=null) exception.printStackTrace(); %>
-	</tr>
-<% } %>
-<%		if(AppUtils.isAdminUser(request)) {
-		if ((exception instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)||
-			(request.getAttribute("c_error_sql")!=null && !((String) request.getAttribute("c_error_sql")).trim().equals(""))) { 
-			String sql = "";
-			if(exception instanceof org.openecomp.portalsdk.analytics.error.ReportSQLException)
-				sql = ((org.openecomp.portalsdk.analytics.error.ReportSQLException) ex).getReportSQL(); 
-			else
-				sql = (String) request.getAttribute("c_error_sql"); %>
-				       <% if (sql!=null && sql.length() > 0) { %>					
-	<tr class=rowalt1>
-		<td width="90%">
-										<b class=rtabletext>SQL Execution Error:</b>
-		</td>
-	</tr>
-	<tr class=rowalt2>
-		<td width="90%">
-			<font class=rtabletext><%= sql %></font>
-		</td>
-	</tr>
-<% 			request.setAttribute("c_error_sql", sql);
-	%>
-				       <% } %> 
-	<tr class=rowalt1>
-		<td width="90%">
-			<b class=rtabletext>Error Message:</b><br>
-			<font class=rtabletext><%= AppUtils.getRequestNvlValue(request, "error_extra_msg") %><%= ex.getMessage() %></font>
-		</td>
-	</tr>
-<%		if(request.getAttribute("c_error_url")!=null && !((String) request.getAttribute("c_error_url")).trim().equals("")) { %>
-	<tr class=rowalt1>
-		<td width="90%">
-			<font class=rtabletext>Please <a href="<%= (String) request.getAttribute("c_error_url") %>">click here</a> to edit report definition.</font>
-		</td>
-	</tr>
-<%		} %>
-<% } %>
-<% } %>
-	<tr class=rowalt2>
-		<td width="90%">
-			<font class=rtabletext>** The system administrator has been notified for this error.</font>
-		</td>
-	</tr>
-<% if(AppUtils.isAdminUser(request))  { %>	
-<!-------------------------------------------------------
-EXCEPTION [<%= ex!=null? ex.getMessage():"" %>]
-<%	if(ex!=null) ex.printStackTrace(new PrintWriter(out)); %>
--------------------------------------------------------->
-<% } %>
-<% if(exception!=null) exception.printStackTrace(); %>
-
-<%	}	// else 
-%>
-</table>
-
-</form>
-
-</body>
-</html>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp
deleted file mode 100644
index c4fbe9e8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/footer.jsp
+++ /dev/null
@@ -1,25 +0,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.
-  ================================================================================
-  --%>
- <jsp:include page="disclaimer.jsp" flush="true" />
- 
- </body>
-</html>
-
-<%--<jsp:include page="prisms/footer.jsp" flush="true" />--%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp
deleted file mode 100644
index 6838f3ac..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_drill_down_report.jsp
+++ /dev/null
@@ -1,623 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); 
-	List reportCols  = rdef.getAllColumns();
-	List rFormFields = null;
-	if(rdef.getFormFieldList()!=null&&rdef.getFormFieldList().getFormField().size()>0)
-		rFormFields = rdef.getFormFieldList().getFormField();
-	
-	ReportFormFields ddReportFormFields = (ReportFormFields) request.getAttribute(AppConstants.RI_FORM_FIELDS); 
-	
-	String drillDownSuppress = AppUtils.getRequestNvlValue(request, "drillDownSuppress");
-	String drillDownParams   = AppUtils.getRequestNvlValue(request, "drillDownParams");
-	String drillDownRequest   = AppUtils.getRequestNvlValue(request, "drillDownRequest");
-	
-	Hashtable paramDefinitions = new Hashtable();
-	StringTokenizer st = new StringTokenizer(drillDownParams, "&");
-	//Added for passing request parameters in Drill Down
-    String[] reqParameters = Globals.getRequestParams().split(",");	
-    int icnt=0;
-    //
-	while(st.hasMoreTokens()) {
-		String param = st.nextToken();
-		DrillDownParamDef paramDef = new DrillDownParamDef(param);
-		if(paramDef.getFieldName().length()>0)
-			paramDefinitions.put(paramDef.getFieldName(), paramDef);
-	}	// while
-%>
-
-<html>
-<head>
-	<title>Drill-down Parameters Configuration</title>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-
-<script language="JavaScript">
-<!--
-	var bCloseWindow = false;
-
-	function setParams(newParams) {
-		var suppressValue = document.dataform.v_suppress.value;
-		var showInPopup;
-		if(document.dataform.showInPopup.checked)
-			showInPopup = "true";
-		window.opener.document.forma.drillDownPopUp.value = showInPopup;
-		window.opener.setDrillDownValuesSuppress(newParams, suppressValue);
-		window.close();
-	}   // setParams
-
-	function resetDrillDown() {
-		window.opener.document.forma.drillDownCtl.selectedIndex = 0;
-		window.opener.document.forma.drillDownURL.value         = "";
-		window.opener.document.forma.drillDownParams.value      = "";
-		window.opener.document.forma.drillDownSuppress.value    = "";
-		window.opener.document.forma.drillDownPopUp.value    	= "";
-	}   // setParams
-
-
-
-	
-	window.onbeforeunload = check;
-	function check()
-	{
-		var opener = window.opener;
-		var newParams = collectValues();
-		//alert(newParams);
-		//console.log(newParams);
-		if(!newParams) {
-			if(opener) {
-			    var oDom = opener.document;
-			    var elem = oDom.getElementById("drillDownCtl");
-			    var elements = elem.options;
-	
-			    for(var i = 0; i < elements.length; i++){
-			      elements[i].selected = false;
-			    }
-			    
-			}
-		}
-	}	//-->
-</script>
-
-</head>
-<body onLoad="if(bCloseWindow) setParams('');">
-
-<form name="dataform" onSubmit="return false;">
-<table class="mTAB" width="94%" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan="2">
-			<b class=rtableheader>DRILL-DOWN PARAMETERS CONFIGURATION</b>
-		</td>
-	</tr>
-
-<%	if(ddReportFormFields!=null)
-		for(ddReportFormFields.resetNext(); ddReportFormFields.hasNext(); ) {
-			FormField ff = ddReportFormFields.getNext(); 
-			if(!ff.getFieldType().equals(FormField.FFT_BLANK)) {
-			
-			DrillDownParamDef paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName());
-			if(paramDef==null)
-				paramDef = new DrillDownParamDef(""); %>
-             
-            <% if (ff!=null && (ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) ) {
-            %>
-	<tr>
-		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-			&nbsp;<%= ff.getFieldDisplayName() %>
-			<input type="hidden" name="paramName" value="<%= ff.getFieldName() %>"></b></td> 
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" width="33%" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="None"<%= paramDef.getValType().equals("0")?" checked":"" %>>No value </font>
-		</td>
-		<td class=rbg3 align="left" width="67%" nowrap>
-			<font class=rtabletext>Accept default</font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="Fixed"<%= paramDef.getValType().equals("1")?" checked":"" %>>Fixed value </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<input type="text" size="30" maxlength="100" name="v_<%= ff.getFieldName() %>" value="<%= java.net.URLDecoder.decode(paramDef.getValValue(),"UTF8") %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[1].click();"></font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="Column"<%= paramDef.getValType().equals("2")?" checked":"" %>>Value of column </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<select name="c_<%= ff.getFieldName() %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[2].click();">
-			    <option value="this">--- Current drill-down column ---
-<% 			for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-				DataColumnType dct = (DataColumnType) iter.next(); 
-				//if(dct.isVisible()) { 
-				%>
-			    <option value="<%= dct.getColId() %>"<%= paramDef.getValColId().equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-<%				//} 
-%>
-<% 			} %>
-			</select></font>
-		</td>
-	</tr>
-<%			if(rFormFields!=null) { %>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="FormField"<%= paramDef.getValType().equals("3")?" checked":"" %>>Value of form field </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<select name="f_<%= ff.getFieldName() %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[3].click();">
-<% 				for(Iterator iter=rFormFields.iterator(); iter.hasNext(); ) { 
-					FormFieldType fft = (FormFieldType) iter.next(); %>
-			    <option value="<%= fft.getFieldId() %>"<%= paramDef.getValFieldId().equals(fft.getFieldId())?" selected":"" %>><%= fft.getFieldName() %>
-<% 				} %>
-			</select></font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="ColFormSet"<%= paramDef.getValType().equals("4")?" checked":"" %>>Value set </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			Pass the value of the selected column if not empty,<br>
-			otherwise pass the value of the selected form field</font>
-		</td>
-	</tr>
-<%					}	// if
-					
-%>
-<!--  END -->
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Hr");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	<tr>
-        		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-        			&nbsp;<%= ff.getFieldDisplayName() %> (Hour)
-        			<input type="hidden" name="paramName" value="<%= ff.getFieldName() %>_Hr"></b></td> 
-        		</tr>
-				<tr>
-					<td class=rbg2 align="left" width="33%" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Hr" value="None"<%= paramDef.getValType().equals("0")?" checked":"" %>>No value </font>
-					</td>
-					<td class=rbg3 align="left" width="67%" nowrap>
-						<font class=rtabletext>Accept default</font>
-					</td>
-				</tr>
-				<tr>
-					<td class=rbg2 align="left" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Hr" value="Column" <%= paramDef.getValType().equals("2")?" checked":"" %> >Value of column </font>
-					</td>
-					<td class=rbg3 align="left" nowrap>
-						<font class=rtabletext>
-							<select name="c_<%= ff.getFieldName() %>_Hr" onChange="document.dataform.r_<%= ff.getFieldName() %>_Hr[1].click();">
-			    				<option value="this">--- Current drill-down column ---
-					<% 			for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-									DataColumnType dct = (DataColumnType) iter.next(); 
-									//if(dct.isVisible()) { 
-					%>
-			    					<option value="<%= dct.getColId() %>"<%= paramDef.getValColId().equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-		<%				//} 
-		%>
-<% 								} %>
-							</select>
-					</font>
-					</td>
-			</tr>
-<%
- 				  if (ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Min");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	<tr>
-        		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-        			&nbsp;<%= ff.getFieldDisplayName() %> (Minutes)
-        			<input type="hidden" name="paramName" value="<%= ff.getFieldName() %>_Min"></b></td> 
-        		</tr>
-				<tr>
-					<td class=rbg2 align="left" width="33%" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Min" value="None"<%= paramDef.getValType().equals("0")?" checked":"" %>>No value </font>
-					</td>
-					<td class=rbg3 align="left" width="67%" nowrap>
-						<font class=rtabletext>Accept default</font>
-					</td>
-				</tr>
-				<tr>
-					<td class=rbg2 align="left" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Min" value="Column" <%= paramDef.getValType().equals("2")?" checked":"" %>>Value of column </font>
-					</td>
-					<td class=rbg3 align="left" nowrap>
-						<font class=rtabletext>
-							<select name="c_<%= ff.getFieldName() %>_Min" onChange="document.dataform.r_<%= ff.getFieldName() %>_Min[1].click();">
-			    				<option value="this">--- Current drill-down column ---
-					<% 			for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-									DataColumnType dct = (DataColumnType) iter.next(); 
-									//if(dct.isVisible()) { 
-					%>
-			    					<option value="<%= dct.getColId() %>"<%= paramDef.getValColId().equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-		<%				//} 
-		%>
-<% 								} %>
-							</select>
-					</font>
-					</td>
-			</tr>
-<% 					  
- 				  }
-				  if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				<%
-				paramDef = (DrillDownParamDef) paramDefinitions.get(ff.getFieldName()+"_Sec");
-				if(paramDef==null)
-					paramDef = new DrillDownParamDef("");
-				%>
-            	<tr>
-        		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-        			&nbsp;<%= ff.getFieldDisplayName() %> (Seconds)
-        			<input type="hidden" name="paramName" value="<%= ff.getFieldName() %>_Sec"></b></td> 
-        		</tr>
-				<tr>
-					<td class=rbg2 align="left" width="33%" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Sec" value="None"<%= paramDef.getValType().equals("0")?" checked":"" %>>No value </font>
-					</td>
-					<td class=rbg3 align="left" width="67%" nowrap>
-						<font class=rtabletext>Accept default</font>
-					</td>
-				</tr>
-				<tr>
-					<td class=rbg2 align="left" height="30" nowrap>
-						<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-						<input type="radio" name="r_<%= ff.getFieldName() %>_Sec" value="Column" <%= paramDef.getValType().equals("2")?" checked":"" %>>Value of column </font>
-					</td>
-					<td class=rbg3 align="left" nowrap>
-						<font class=rtabletext>
-							<select name="c_<%= ff.getFieldName() %>_Sec" onChange="document.dataform.r_<%= ff.getFieldName() %>_Sec[1].click();">
-			    				<option value="this">--- Current drill-down column ---
-					<% 			for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-									DataColumnType dct = (DataColumnType) iter.next(); 
-									//if(dct.isVisible()) { 
-					%>
-			    					<option value="<%= dct.getColId() %>"<%= paramDef.getValColId().equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-		<%				//} 
-		%>
-<% 								} %>
-							</select>
-					</font>
-					</td>
-			</tr>
-<% 					  
- 		
-				  }
-				  	                  
-               } else { 	
-%> 
-	<tr>
-		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-			&nbsp;<%= ff.getFieldDisplayName() %>
-			<input type="hidden" name="paramName" value="<%= ff.getFieldName() %>"></b></td> 
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" width="33%" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="None"<%= paramDef.getValType().equals("0")?" checked":"" %>>No value </font>
-		</td>
-		<td class=rbg3 align="left" width="67%" nowrap>
-			<font class=rtabletext>Accept default</font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="Fixed"<%= paramDef.getValType().equals("1")?" checked":"" %>>Fixed value </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<input type="text" size="30" maxlength="100" name="v_<%= ff.getFieldName() %>" value="<%= java.net.URLDecoder.decode(paramDef.getValValue(),"UTF8") %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[1].click();"></font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="Column"<%= paramDef.getValType().equals("2")?" checked":"" %>>Value of column </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<select name="c_<%= ff.getFieldName() %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[2].click();">
-			    <option value="this">--- Current drill-down column ---
-<% 			for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-				DataColumnType dct = (DataColumnType) iter.next(); 
-				//if(dct.isVisible()) { 
-				%>
-			    <option value="<%= dct.getColId() %>"<%= paramDef.getValColId().equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-<%				//} 
-%>
-<% 			} %>
-			</select></font>
-		</td>
-	</tr>
-<%			if(rFormFields!=null) { %>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="FormField"<%= paramDef.getValType().equals("3")?" checked":"" %>>Value of form field </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<select name="f_<%= ff.getFieldName() %>" onChange="document.dataform.r_<%= ff.getFieldName() %>[3].click();">
-<% 				for(Iterator iter=rFormFields.iterator(); iter.hasNext(); ) { 
-					FormFieldType fft = (FormFieldType) iter.next(); %>
-			    <option value="<%= fft.getFieldId() %>"<%= paramDef.getValFieldId().equals(fft.getFieldId())?" selected":"" %>><%= fft.getFieldName() %>
-<% 				} %>
-			</select></font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="radio" name="r_<%= ff.getFieldName() %>" value="ColFormSet"<%= paramDef.getValType().equals("4")?" checked":"" %>>Value set </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			Pass the value of the selected column if not empty,<br>
-			otherwise pass the value of the selected form field</font>
-		</td>
-	</tr>
-<%			}	// if
-               } // else
-			} // if BLANK 	   
-		}   // for 
-%>
-
-<script language="JavaScript">
-<!--
-<% if(ddReportFormFields==null||ddReportFormFields.getFieldCount()==0) { %>
-	bCloseWindow = true;
-<% } %>
-	function replaceSC(strValue) {
-		var newValue = "";
-		
-		for(var i=0; i<strValue.length; i++) {
-			var ch = strValue.charAt(i);
-			
-			if(ch=='@')
-				newValue += "%40";
-			else if(ch=='+')
-				newValue += "%2B";
-			else if(ch=='/')
-				newValue += "%2F";
-			else
-				newValue += ch;
-		}	// for
-		
-		return newValue;
-	}	// replaceSC
-
-	function collectValues() {
-		var newParams = "";
-          newParams += setCheckBoxValues();
-<%	if(ddReportFormFields!=null) {
-		for(ddReportFormFields.resetNext(); ddReportFormFields.hasNext(); ) {
-			FormField ff = ddReportFormFields.getNext(); 
-			if(!ff.getFieldType().equals(FormField.FFT_BLANK)) {
-			String fieldName = ff.getFieldName(); 
-			
-			if (ff!=null && !(ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) ) {
-%>				
-		if(document.dataform.r_<%= fieldName %>[1].checked||document.dataform.r_<%= fieldName %>[2].checked<%= (rFormFields!=null)?"||document.dataform.r_"+fieldName+"[3].checked||document.dataform.r_"+fieldName+"[4].checked":"" %>) {
-			if(newParams!="")
-				newParams += "&";
-			newParams += "<%= fieldName %>=";
-			if(document.dataform.r_<%= fieldName %>[1].checked) {
-				newParams += replaceSC(escape(document.dataform.v_<%= fieldName %>.value));
-			} else if(document.dataform.r_<%= fieldName %>[2].checked) {
-				newParams += "["+escape(document.dataform.c_<%= fieldName %>.options[document.dataform.c_<%= fieldName %>.selectedIndex].value)+"]";
-			<% if(rFormFields!=null) { %>
-			} else if(document.dataform.r_<%= fieldName %>[3].checked) {
-				newParams += "[!"+escape(document.dataform.f_<%= fieldName %>.options[document.dataform.f_<%= fieldName %>.selectedIndex].value)+"]";
-			} else if(document.dataform.r_<%= fieldName %>[4].checked) {
-				newParams += "["+escape(document.dataform.c_<%= fieldName %>.options[document.dataform.c_<%= fieldName %>.selectedIndex].value)+"!"+escape(document.dataform.f_<%= fieldName %>.options[document.dataform.f_<%= fieldName %>.selectedIndex].value)+"]";
-			<% } %>
-			}
-		}   // if
-<%	
- } //if non-timestamp
-			if (ff!=null && (ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) ) {
- 
-			if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_HR) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-		if(document.dataform.r_<%= fieldName %>[1].checked||document.dataform.r_<%= fieldName %>[2].checked<%= (rFormFields!=null)?"||document.dataform.r_"+fieldName+"[3].checked||document.dataform.r_"+fieldName+"[4].checked":"" %>) {
-			if(newParams!="")
-				newParams += "&";
-			newParams += "<%= fieldName %>=";
-			if(document.dataform.r_<%= fieldName %>[1].checked) {
-				newParams += replaceSC(escape(document.dataform.v_<%= fieldName %>.value));
-			} else if(document.dataform.r_<%= fieldName %>[2].checked) {
-				newParams += "["+escape(document.dataform.c_<%= fieldName %>.options[document.dataform.c_<%= fieldName %>.selectedIndex].value)+"]";
-			<% if(rFormFields!=null) { %>
-			} else if(document.dataform.r_<%= fieldName %>[3].checked) {
-				newParams += "[!"+escape(document.dataform.f_<%= fieldName %>.options[document.dataform.f_<%= fieldName %>.selectedIndex].value)+"]";
-			} else if(document.dataform.r_<%= fieldName %>[4].checked) {
-				newParams += "["+escape(document.dataform.c_<%= fieldName %>.options[document.dataform.c_<%= fieldName %>.selectedIndex].value)+"!"+escape(document.dataform.f_<%= fieldName %>.options[document.dataform.f_<%= fieldName %>.selectedIndex].value)+"]";
-			<% } %>
-			}
-		}   // if				
-
-				if(document.dataform.r_<%= fieldName %>_Hr[1].checked) {
-					if(newParams!="")
-						newParams += "&";
-					newParams += "<%= fieldName %>_Hr=";
-					if(document.dataform.r_<%= fieldName %>_Hr[1].checked) {
-						newParams += "["+escape(document.dataform.c_<%= fieldName %>_Hr.options[document.dataform.c_<%= fieldName %>_Hr.selectedIndex].value)+"]";
-					}
-				}   // if				
-<%
-			}//hour
-%>
-<%				
-			if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_MIN) || ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				if(document.dataform.r_<%= fieldName %>_Min[1].checked) {
-					if(newParams!="")
-						newParams += "&";
-					newParams += "<%= fieldName %>_Min=";
-					if(document.dataform.r_<%= fieldName %>_Min[1].checked) {
-						newParams += "["+escape(document.dataform.c_<%= fieldName %>_Min.options[document.dataform.c_<%= fieldName %>_Min.selectedIndex].value)+"]";
-     }
-			}   // if
-			<%
-			} // min
-			if(ff.getValidationType().equals(FormField.VT_TIMESTAMP_SEC)) {
-%>
-				if(document.dataform.r_<%= fieldName %>_Sec[1].checked) {
-					if(newParams!="")
-						newParams += "&";
-					newParams += "<%= fieldName %>_Sec=";
-					if(document.dataform.r_<%= fieldName %>_Sec[1].checked) {
-						newParams += "["+escape(document.dataform.c_<%= fieldName %>_Sec.options[document.dataform.c_<%= fieldName %>_Sec.selectedIndex].value)+"]";
-				}
-			}   // if							
-<%
-		} // sec
-		}
-	} // BLANK
-		}	// for 
-     }
-%>
-        //alert(newParams);
-        return newParams;
- 		
-	}   // collectValues
-
-	function setCheckBoxValues() {
-		var newValues ="";
-<%
-        icnt=0;
-        if(reqParameters.length>0) {
-%>
-         if(document.dataform.requestParam) {  
-          for (i=0;i<document.dataform.requestParam.length;i++) {
-            <% icnt++;%>          
-            if(document.dataform.requestParam[i].checked) {
-              newValues += escape("<%=reqParameters[icnt-1]%>")+"="+"[#"+escape("<%=reqParameters[icnt-1]%>")+"]";
-            }
-         }
-         }
-<% } %>
-      return newValues;
-	} 
-
-//-->
-</script>
-
-	<tr>
-		<td colspan="2">&nbsp;</td> 
-	</tr>
-	<tr>
-		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-			&nbsp;Parameter values not to be passed to the drill-down report</b></td> 
-	</tr>
-	<tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			Suppress values </font>
-		</td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<input type="text" size="30" maxlength="100" name="v_suppress" value="<%= drillDownSuppress %>">
-			<br>separate by | if multiple values</font>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">&nbsp;</td> 
-	</tr>
-	<% if(!Globals.getPassRequestParamInDrilldown() && (!(reqParameters.length==1 && reqParameters[0].length()<=0))) { 
-		%>
-	<tr>
-		<td class=rbg1 colspan="2" height="30" align="left"><b class=rtableheader>
-			&nbsp;Request Parameter values to be passed to the drill-down report</b></td> 
-	</tr>
-	<!-- <tr>
-		<td class=rbg2 align="left" height="30" nowrap>
-			<font class=rtabletext>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			Request values </font>
-		</td>
-	 </tr>
-	 -->
-		<%
-        icnt=0;
- 
-        for (int i = 0; i < reqParameters.length; i++) { 
-          icnt++;
-                       
-        %>
-        <tr<%= (icnt%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<!--<td align="center" height="30"><font class=rtabletext><%= icnt %></font></td>-->
-		<td><font class=rtabletext><%= reqParameters[i]%></font></td>
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-          <input type="checkbox" name="requestParam" <%= ((drillDownRequest!=null)&&(drillDownRequest.indexOf(reqParameters[i])!=-1))?"checked":""%>>
-		</td>
-		</tr>
-		<%
-		} //for
-		%>
-		 <input type="hidden" name="requestParam">
-		<%
-		} // if requestParam 
-		%>
-        <tr> 
-			<td class=rbg3 align="left" nowrap><font class=rtabletext>
-          		 Show Drilled Down Report In Popup Window: <input type="checkbox" name="showInPopup">
-			</td>
-		</tr>
-
-	<tr>
-		<td colspan="3" align="center"><input type="Button" class=button value="Complete" onClick="setParams(collectValues())"></td>
-	</tr>
-</table>
-</form>
-	<br><br>
- <script>
-    if(window.opener.document.forma.drillDownPopUp.value == 'true')
-    	document.dataform.showInPopup.checked = true;
-        
- </script>
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp
deleted file mode 100644
index d73a7fe2..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_import_semaphore.jsp
+++ /dev/null
@@ -1,80 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ArrayList importedList = (ArrayList) request.getAttribute(AppConstants.RI_DATA_SET); %>
-
-<html>
-<head>
-	<title>Advanced Display Formatting</title>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	
-<script language=JavaScript>
-<!--
-	function updateOpenerList() {
-<%	if(importedList!=null&&importedList.size()>0) 
-		for(Iterator iter=importedList.iterator(); iter.hasNext(); ) { 
-			IdNameValue value = (IdNameValue) iter.next(); %>
-			window.opener.updateSemaphoreList("<%= value.getId() %>", "<%= value.getName() %>");
-<%		} %>
-	}	// updateOpenerList
-//-->
-</script>
-	
-</head>
-<body onLoad="updateOpenerList()">
-<br>
-
-<table width=94% class="tableBorder" border=0 cellspacing=1 align=center>
-	<tr class=rbg1>
-		<td valign="middle" height="24"><b class=rtableheader>&nbsp;Advanced Display Formatting Import</b></td>
-	</tr>
-	<tr>
-		<td class=rbg3 align="center" valign="middle" height="100"><font class=rtabletext>
-<%	if(importedList!=null&&importedList.size()>0) { %>
-			<%= importedList.size() %> Advanced Display Formattings successfully imported.
-<%	} else { %>
-			The selected report does not have Advanced Display Formattings <br>
-			defined. No Advanced Display Formattings were imported.
-<%	} %>
-			</font></td>
-	</tr>
-	<tr>
-		<td colspan="10" align="center">
-			<br>
-			<input type="Button" class=button value="Close" onClick="window.close();">
-		</td>
-	</tr>
-</table>
-
-</form>
-
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp
deleted file mode 100644
index 39eafb24..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_semaphore.jsp
+++ /dev/null
@@ -1,419 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); 
-	
-	String semaphoreId = AppUtils.getRequestNvlValue(request, "semaphoreId");
-	String semaphoreType = AppUtils.getRequestNvlValue(request, "semaphoreType");	
-	SemaphoreType semaphore = rdef.getSemaphoreById(semaphoreId);
-	String semaphoreName = null;
-	List listColumns = rdef.getAllColumns();
-	if(semaphore!=null)
-		semaphoreName = semaphore.getSemaphoreName();
-	else
-		if(rdef.getSemaphoreList()!=null)
-			semaphoreName = "Display Formatting "+(rdef.getSemaphoreList().getSemaphore().size()+1);
-		else
-			semaphoreName = "Display Formatting 1";	
-	
-	String submitBtn = AppUtils.getRequestNvlValue(request, "submit_btn"); %>
-
-<html>
-<head>
-	<title>Advanced Display Formatting</title>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	
-<% if(submitBtn.startsWith("Save")) { %>
-<script language=JavaScript>
-<!--
-	function updateOpenerList() {	// Returns the position of the current semaphore in the list
-		return window.opener.updateSemaphoreList("<%= semaphoreId %>", "<%= semaphoreName %>");
-	}	// updateOpenerList
-	
-	function saveAndClose() {
-		var idx = 0;
-		idx = updateOpenerList();
-		window.opener.document.forma.semaphore.selectedIndex = idx;
-		window.opener.document.forma.semaphoreTypeHidden.value='<%=semaphoreType%>';
-		window.close();
-	}	// saveAndClose
-//-->
-</script>
-<% } %>
-	
-<% if(submitBtn.equals("Save")) { %>
-</head>
-<body onLoad="saveAndClose()">
-	<b class=rerrortext>Please wait...</b>
-<% } else { %>
-
-<script language=JavaScript>
-<!--
-	function setBold(iCount) {
-		var flag = document.dataform.boldChk[iCount].checked;
-		document.dataform.bold[iCount].value = (flag?"Y":"N");
-		document.getElementById("preview"+iCount).style.fontWeight = (flag?"bold":"normal");
-	}   // setBold
-	
-	function setItalic(iCount) {
-		var flag = document.dataform.italicChk[iCount].checked;
-		document.dataform.italic[iCount].value = (flag?"Y":"N");
-		document.getElementById("preview"+iCount).style.fontStyle = (flag?"italic":"normal");
-	}   // setItalic
-	
-	function setUnderline(iCount) {
-		var flag = document.dataform.underlineChk[iCount].checked;
-		document.dataform.underline[iCount].value = (flag?"Y":"N");
-		document.getElementById("preview"+iCount).style.textDecorationUnderline = flag;
-	}   // setUnderline
-	
-	function setBgColor(iCount) {
-		var value = document.dataform.bgColor[iCount].options[document.dataform.bgColor[iCount].selectedIndex].value;
-		document.getElementById("preview"+iCount).style.backgroundColor = value;
-	}   // setBgColor
-	
-	function setFontColor(iCount) {
-		var value = document.dataform.fontColor[iCount].options[document.dataform.fontColor[iCount].selectedIndex].value;
-		document.getElementById("preview"+iCount).style.color = value;
-	}   // setFontColor
-	
-	function setFontFace(iCount) {
-		var value = document.dataform.fontFace[iCount].options[document.dataform.fontFace[iCount].selectedIndex].value;
-		document.getElementById("preview"+iCount).style.fontFamily = value;
-	}   // setFontFace
-	
-	function setFontSize(iCount) {
-		var value = document.dataform.fontSize[iCount].options[document.dataform.fontSize[iCount].selectedIndex].value;
-		document.getElementById("preview"+iCount).style.fontSize = value+"px";
-	}   // setFontSize
-	
-/*	function setAlignment(iCount) {
-		var value = document.dataform.alignment[iCount].options[document.dataform.alignment[iCount].selectedIndex].value;
-		document.getElementById("preview"+iCount).style.textAlign = value;
-	}   // setAlignment
-*/	
-	var semaphoreIds   = new Array(<%= 2+((rdef.getSemaphoreList()==null)?0:rdef.getSemaphoreList().getSemaphore().size()) %>);
-	var semaphoreNames = new Array(<%= 2+((rdef.getSemaphoreList()==null)?0:rdef.getSemaphoreList().getSemaphore().size()) %>);
-	<%	int iCount = 0;
-		if(rdef.getSemaphoreList()!=null)
-			for(Iterator iter=rdef.getSemaphoreList().getSemaphore().iterator(); iter.hasNext(); iCount++) {
-				SemaphoreType sem = (SemaphoreType) iter.next(); %>
-	semaphoreIds[<%= iCount %>]   = "<%= sem.getSemaphoreId() %>";
-	semaphoreNames[<%= iCount %>] = "<%= sem.getSemaphoreName() %>";
-	<%		}	// for 
-	%>
-	semaphoreIds[<%= iCount %>]     = "-";
-	semaphoreNames[<%= iCount++ %>] = "-";
-	semaphoreIds[<%= iCount %>]     = "-";
-	semaphoreNames[<%= iCount++ %>] = "-";
-	
-	function dataValidate() {
-		if(document.dataform.semaphoreName.value=="") {
-			alert("Please enter Display Name");
-			document.forma.semaphoreName.focus();
-			document.forma.semaphoreName.select();
-			
-			return false;
-		}	// if
-		
-		for(var i=0; i<semaphoreIds.length; i++)
-			if((document.dataform.semaphoreName.value==semaphoreNames[i])&&(semaphoreIds[i]!="<%= semaphoreId %>")) {
-				alert("Advanced Formatting with that name already exists.\nPlease select another name");
-				document.dataform.semaphoreName.focus();
-				document.dataform.semaphoreName.select();
-				
-				return false;
-			}   // if
-		
-		for(var i=0; i<document.dataform.lessThanValue.length; i++)
-			for(var j=i+1; j<document.dataform.lessThanValue.length; j++)
-				if(	document.dataform.lessThanValue[i].value!=""&&
-					document.dataform.lessThanValue[j].value!=""&&
-					document.dataform.lessThanValue[i].value==document.dataform.lessThanValue[j].value) {
-					alert("You cannot have duplicate values in the list.\nPlease change one of the values ["+document.dataform.lessThanValue[j].value+"]");
-					document.dataform.lessThanValue[j].focus();
-					document.dataform.lessThanValue[j].select();
-					
-					return false;
-				}   // if
-		
-		return true;
-	}	// dataValidate
-	
-	function doInit() {
-	<% if(submitBtn.startsWith("Save")) { %>
-		updateOpenerList();
-	<% } %>
-		
-<%	for(int i = 0; i<3+((semaphore==null)?2:semaphore.getFormatList().getFormat().size()); i++) { 
-		FormatType ft = null;
-		if(semaphore!=null&&i<semaphore.getFormatList().getFormat().size())
-			ft = (FormatType) semaphore.getFormatList().getFormat().get(i);
-		if(ft!=null) { %>
-		setBold(<%= i %>);
-		setItalic(<%= i %>);
-		setUnderline(<%= i %>);
-		setBgColor(<%= i %>);
-		setFontColor(<%= i %>);
-		setFontFace(<%= i %>);
-		setFontSize(<%= i %>);
-		//setAlignment(<%= i %>);
-	<%	}	// if
-	}	// for 
-%>
-	}   // doInit
-//-->
-</script>
-
-</head>
-<body onLoad="doInit()">
-
-<form name="dataform" action="<%= AppUtils.getBaseURL() %>" method="post" onSubmit="return dataValidate()">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.popup.semaphore.save">
-
-<table class="mTAB" width=94% border=0 cellspacing=1 align=center>
-	<tr class=rbg1>
-		<td valign="middle" colspan="10" height="24"><b class=rtableheader>&nbsp;Advanced Display Formatting Definition</b></td>
-	</tr>
-	<tr>
-		<td class=rbg2 colspan="4" align="right" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Display Name: </font></td> 
-		<td class=rbg3 colspan="6" align="left"><font class=rtabletext>
-			<input type="hidden" name="semaphoreId" value="<%= semaphoreId %>">
-			<input type="text" size="30" maxlength="30" name="semaphoreName" value="<%= semaphoreName %>"></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 colspan="4" align="right" height="30"><font class=rtabletext>Apply Formatting To: </font></td> 
-		<td class=rbg3 colspan="6" align="left"><font class=rtabletext>
-			<%	String sValue = AppConstants.ST_CELL; 
-				if(semaphore!=null)
-					sValue = nvl(semaphore.getSemaphoreType(), AppConstants.ST_CELL); %>
-			<select name="semaphoreType">
-			  <%
-				for (Iterator iterC = listColumns.iterator(); iterC.hasNext();) {
-					DataColumnType dc = (DataColumnType) iterC.next();
-					if(dc.isVisible()) {
-			  %>
-			     <option value="<%= AppConstants.ST_CELL+"|"+dc.getColId() %>"<%= sValue.equals(AppConstants.ST_CELL+"|"+dc.getColId() )?" selected":"" %>><%=dc.getColName() %>
-			  <%			
- 				    }
-     			}
-			  %>
-				<option value="<%= AppConstants.ST_CELL %>"<%= sValue.equals(AppConstants.ST_CELL)?" selected":"" %>>Current Value Only
-				<option value="<%= AppConstants.ST_ROW %>"<%=  sValue.equals(AppConstants.ST_ROW) ?" selected":"" %>>The Entire Row
-			</select></font></td>
-	</tr>
-	<tr>
-		<td colspan="10">&nbsp;</td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="middle" colspan=2 height="30"><b class=rtableheader>Column Value Is</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Bold?</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Italic?</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Under-<br>line?</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Background Color</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Font Color</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Font Face</b></td>
-		<td align="center" valign="middle"><b class=rtableheader>Font Size</b></td>
-		<!--td align="center" valign="middle"><b class=rtableheader>Alignment</b></td-->
-		<td align="center" valign="middle"><b class=rtableheader>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Preview&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></td>
-	</tr>
-<%	for(int i = 0; i<3+((semaphore==null)?2:semaphore.getFormatList().getFormat().size()); i++) { 
-		FormatType ft = null;
-		if(semaphore!=null&&i<semaphore.getFormatList().getFormat().size())
-			ft = (FormatType) semaphore.getFormatList().getFormat().get(i); %>
-	<tr<%= (i%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<% if(i==0) { %>
-		<td align="center" valign="middle" colspan=2 height="30">
-			<font class=rtabletext>Any Other</font>
-			<input type="hidden" name="formatId" value="<%= (ft==null)?"":ft.getFormatId() %>">
-			<input type="hidden" name="expression" value="">
-			<input type="hidden" name="lessThanValue" value="">
-			<!-- <input type="hidden" name="anyFmt" value="Y"> -->
-		</td>
-		<% } else { %>
-		<!-- <input type="hidden" name="anyFmt" value="N"> -->
-		<td align="center" valign="middle" height="30">
-			<input type="hidden" name="formatId" value="<%= (ft==null)?"":ft.getFormatId() %>">
-			<%	sValue = "="; 
-				if(ft!=null)
-					sValue = nvl(ft.getExpression(), "="); %>
-			<select name="expression">
-				<option value="="<%=        sValue.equals("=") ?" selected":"" %>>=
-				<option value="&lt;&gt;"<%= sValue.equals("<>")?" selected":"" %>>&lt;&gt;
-				<option value="&gt;"<%=     sValue.equals(">") ?" selected":"" %>>&gt;
-				<option value="&gt;="<%=    sValue.equals(">=")?" selected":"" %>>&gt;=
-				<option value="&lt;"<%=     sValue.equals("<") ?" selected":"" %>>&lt;
-				<option value="&lt;="<%=    sValue.equals("<=")?" selected":"" %>>&lt;=
-			</select>
-		</td>
-		<td align="center" valign="middle">
-			<input type="text" size="10" name="lessThanValue" value="<%= (ft==null)?"":ft.getLessThanValue() %>">
-		</td>
-		<% } %>
-		<td align="center" valign="middle">
-			<%	boolean bValue = false; 
-				if(ft!=null)
-					bValue = ft.isBold(); %>
-			<input type="hidden" name="bold" value="<%= bValue?"Y":"N" %>">
-			<input type="checkbox" name="boldChk" value="Y"<%= bValue?" checked":"" %> onClick="setBold(<%= i %>)">
-		</td>
-		<td align="center" valign="middle">
-			<%	bValue = false; 
-				if(ft!=null)
-					bValue = ft.isItalic(); %>
-			<input type="hidden" name="italic" value="<%= bValue?"Y":"N" %>">
-			<input type="checkbox" name="italicChk" value="Y"<%= bValue?" checked":"" %> onClick="setItalic(<%= i %>)">
-		</td>
-		<td align="center" valign="middle">
-			<%	bValue = false; 
-				if(ft!=null)
-					bValue = ft.isUnderline(); %>
-			<input type="hidden" name="underline" value="<%= bValue?"Y":"N" %>">
-			<input type="checkbox" name="underlineChk" value="Y"<%= bValue?" checked":"" %> onClick="setUnderline(<%= i %>)">
-		</td>
-		<td align="center" valign="middle">
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getBgColor()); %>
-			<select name="bgColor" onChange="setBgColor(<%= i %>)">
-				<option value=""<%=        sValue.equals("")       ?" selected":"" %>>
-				<option value="#00FFFF"<%= sValue.equals("#00FFFF")?" selected":"" %>>Aqua
-				<option value="#000000"<%= sValue.equals("#000000")?" selected":"" %>>Black
-				<option value="#0000FF"<%= sValue.equals("#0000FF")?" selected":"" %>>Blue
-				<option value="#FF00FF"<%= sValue.equals("#FF00FF")?" selected":"" %>>Fuchsia
-				<option value="#808080"<%= sValue.equals("#808080")?" selected":"" %>>Gray
-				<option value="#008000"<%= sValue.equals("#008000")?" selected":"" %>>Green
-				<option value="#00FF00"<%= sValue.equals("#00FF00")?" selected":"" %>>Lime
-				<option value="#800000"<%= sValue.equals("#800000")?" selected":"" %>>Maroon
-				<option value="#000080"<%= sValue.equals("#000080")?" selected":"" %>>Navy
-				<option value="#808000"<%= sValue.equals("#808000")?" selected":"" %>>Olive
-				<option value="#FF9900"<%= sValue.equals("#FF9900")?" selected":"" %>>Orange
-				<option value="#800080"<%= sValue.equals("#800080")?" selected":"" %>>Purple
-				<option value="#FF0000"<%= sValue.equals("#FF0000")?" selected":"" %>>Red
-				<option value="#C0C0C0"<%= sValue.equals("#C0C0C0")?" selected":"" %>>Silver
-				<option value="#008080"<%= sValue.equals("#008080")?" selected":"" %>>Teal
-				<option value="#FFFFFF"<%= sValue.equals("#FFFFFF")?" selected":"" %>>White
-				<option value="#FFFF00"<%= sValue.equals("#FFFF00")?" selected":"" %>>Yellow
-			</select>
-		</td>
-		<td align="center" valign="middle">
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontColor()); %>
-			<select name="fontColor" onChange="setFontColor(<%= i %>)">
-				<option value=""<%=        sValue.equals("")       ?" selected":"" %>>
-				<option value="#00FFFF"<%= sValue.equals("#00FFFF")?" selected":"" %>>Aqua
-				<option value="#000000"<%= sValue.equals("#000000")?" selected":"" %>>Black
-				<option value="#0000FF"<%= sValue.equals("#0000FF")?" selected":"" %>>Blue
-				<option value="#FF00FF"<%= sValue.equals("#FF00FF")?" selected":"" %>>Fuchsia
-				<option value="#808080"<%= sValue.equals("#808080")?" selected":"" %>>Gray
-				<option value="#008000"<%= sValue.equals("#008000")?" selected":"" %>>Green
-				<option value="#00FF00"<%= sValue.equals("#00FF00")?" selected":"" %>>Lime
-				<option value="#800000"<%= sValue.equals("#800000")?" selected":"" %>>Maroon
-				<option value="#000080"<%= sValue.equals("#000080")?" selected":"" %>>Navy
-				<option value="#808000"<%= sValue.equals("#808000")?" selected":"" %>>Olive
-				<option value="#FF9900"<%= sValue.equals("#FF9900")?" selected":"" %>>Orange
-				<option value="#800080"<%= sValue.equals("#800080")?" selected":"" %>>Purple
-				<option value="#FF0000"<%= sValue.equals("#FF0000")?" selected":"" %>>Red
-				<option value="#C0C0C0"<%= sValue.equals("#C0C0C0")?" selected":"" %>>Silver
-				<option value="#008080"<%= sValue.equals("#008080")?" selected":"" %>>Teal
-				<option value="#FFFFFF"<%= sValue.equals("#FFFFFF")?" selected":"" %>>White
-				<option value="#FFFF00"<%= sValue.equals("#FFFF00")?" selected":"" %>>Yellow
-			</select>
-		</td>
-		<td align="center" valign="middle">
-			<%	sValue = ""; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontFace()); %>
-			<select name="fontFace" onChange="setFontFace(<%= i %>)">
-				<option value=""<%=                                    sValue.equals("")                                   ?" selected":"" %>>--- Default ---
-				<option value="Arial,Helvetica,sans-serif"<%=          sValue.equals("Arial,Helvetica,sans-serif")         ?" selected":"" %>>Arial
-				<option value="Courier New,Courier,mono"<%=            sValue.equals("Courier New,Courier,mono")           ?" selected":"" %>>Courier New
-				<option value="Geneva,Arial,Helvetica,sans-serif"<%=   sValue.equals("Geneva,Arial,Helvetica,sans-serif")  ?" selected":"" %>>Geneva
-				<option value="Georgia,Times New Roman,Times,serif"<%= sValue.equals("Georgia,Times New Roman,Times,serif")?" selected":"" %>>Georgia
-				<option value="Times New Roman,Times,serif"<%=         sValue.equals("Times New Roman,Times,serif")        ?" selected":"" %>>Times New Roman
-				<option value="Verdana,Arial,Helvetica,sans-serif"<%=  sValue.equals("Verdana,Arial,Helvetica,sans-serif") ?" selected":"" %>>Verdana
-			</select>
-		</td>
-		<td align="center" valign="middle">
-			<%	sValue = "11"; 
-				if(ft!=null)
-					sValue = nvl(ft.getFontSize(), "11"); %>
-			<select name="fontSize" onChange="setFontSize(<%= i %>)">
-				<option value="6"<%=  sValue.equals("6") ?" selected":"" %>>6
-				<option value="8"<%=  sValue.equals("8") ?" selected":"" %>>8
-				<option value="9"<%=  sValue.equals("9") ?" selected":"" %>>9
-				<option value="10"<%= sValue.equals("10")?" selected":"" %>>10
-				<option value="11"<%= sValue.equals("11")?" selected":"" %>>11
-				<option value="12"<%= sValue.equals("12")?" selected":"" %>>12
-				<option value="14"<%= sValue.equals("14")?" selected":"" %>>14
-				<option value="16"<%= sValue.equals("16")?" selected":"" %>>16
-				<option value="18"<%= sValue.equals("18")?" selected":"" %>>18
-				<option value="24"<%= sValue.equals("24")?" selected":"" %>>24
-				<option value="36"<%= sValue.equals("36")?" selected":"" %>>36
-				<option value="48"<%= sValue.equals("48")?" selected":"" %>>48
-				<option value="72"<%= sValue.equals("72")?" selected":"" %>>72
-			</select>
-		</td>
-		<!--td align="center" valign="middle">
-			< %	sValue = "left"; 
-				if(ft!=null)
-					sValue = nvl(ft.getAlignment(), "left"); % >
-			<select name="alignment" onChange="setAlignment(< %= i % >)">
-				<option value="left"  < %= sValue.equals("left")  ?" selected":"" % >>Left
-				<option value="center"< %= sValue.equals("center")?" selected":"" % >>Center
-				<option value="right" < %= sValue.equals("right") ?" selected":"" % >>Right
-			</select>
-		</td-->
-		<td valign="middle">
-			<span id="preview<%= i %>" style="font-family:Arial,Helvetica,sans-serif;font-size:11px;color:#000000;width:100">Sample</span>
-		</td>
-	</tr>
-<%	}	// for 
-%>
-	<tr>
-		<td colspan="10" align="center">
-			<br>
-			<input type="Submit" class=button name="submit_btn" value="Save">
-			<input type="Submit" class=button name="submit_btn" value="Save & More Rows">
-			<input type="Button" class=button value="Cancel" onClick="window.close();">
-		</td>
-	</tr>
-</table>
-
-</form>
-
-<% }	// if(submitBtn.equals("Save")) { ... } else { 
-%>
-
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp
deleted file mode 100644
index c685bb13..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_sql.jsp
+++ /dev/null
@@ -1,55 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<html>
-<head>
-	<title><%= nvl((String) request.getAttribute(AppConstants.RI_PAGE_TITLE)) %></title>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-</head>
-<body>
-<table width="94%" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 width="100%" valign="Middle">
-			<b class=rtableheader><%= nvl((String) request.getAttribute(AppConstants.RI_PAGE_SUBTITLE), nvl((String) request.getAttribute(AppConstants.RI_PAGE_TITLE))) %></b>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2<%= nvl((String) request.getAttribute("msg_align")) %>>
-			<font class=rtabletext><%= nvl((String) request.getAttribute(AppConstants.RI_FORMATTED_SQL)) %></font>
-		</td>
-	</tr>
-	<tr>
-		<td align="center">
-			<br>
-			<input type="Submit" class=rsmallbutton value="Close" onClick="window.close();">
-		</td>
-	</tr>
-</table>
-<br>
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp
deleted file mode 100644
index 9dec6a53..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_table_cols.jsp
+++ /dev/null
@@ -1,171 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	String tableName = AppUtils.getRequestValue(request, AppConstants.RI_TABLE_NAME);
-	String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-	Vector tableSources = null;
-	Vector dbColumns = null;
-	if(tableName==null) {
-		tableSources = DataCache.getReportTableSources(remoteDbPrefix);
-		if(tableSources.size()>0)
-		tableName = ((TableSource) DataCache.getReportTableSources(remoteDbPrefix).get(0)).getTableName();
-	}
-	    if(tableName!=null)  
-			dbColumns = DataCache.getReportTableDbColumns(tableName.toUpperCase(),remoteDbPrefix); 
-	
-	
-	boolean isSingleValueChoice      = AppUtils.getRequestFlag(request, "single_value");
-	boolean includeTableNameInResult = AppUtils.getRequestFlag(request, "return_table_name");
-	boolean includeColTypeInResult   = AppUtils.getRequestFlag(request, "return_col_type"); %>
-
-<html>
-<head>
-	<title>Table Columns</title>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/ral.css">
-
-<script language=JavaScript>
-<!--
-	function setValue(newValue) {
-		window.opener.addText(newValue);
-		window.close();
-	}   // setValue
-
-	function clearValue() {
-		window.opener.clearText();
-		window.close();
-	}   // clearValue	
-//-->
-</script>
-
-</head>
-<body>
-
-<% if(! isSingleValueChoice) { %>
-<script language=JavaScript>
-<!--
-	function getSelection() {
-		var selList = "";
-		<% if(dbColumns!=null) { %>
-		for(var i=0; i<<%= dbColumns.size() %>; i++)
-			if(document.dataform.dataChk[i].checked)
-				selList += ((selList=="")?"":", ")+document.dataform.dataChk[i].value;
-		<% } %>
-		
-		setValue(selList);
-		
-		return false;
-	}   // getSelection
-//-->
-</script>
-<% }	// if 
-%>
-
-
-<form name="dataform" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.popup.table.cols">
-<% if(isSingleValueChoice) { %>
-	<input type="hidden" name="single_value" value="Y">
-<% } %>
-<% if(includeTableNameInResult) { %>
-	<input type="hidden" name="return_table_name" value="Y">
-<% } %>
-<% if(includeColTypeInResult) { %>
-	<input type="hidden" name="return_col_type" value="Y">
-<% } %>
-
-<table class="mTAB" width=94% border=0 cellspacing=1 align=center>
-	<tr class=rbg1>
-		<td align="center" valign="middle" height="30">&nbsp;
-		<% if(! isSingleValueChoice) { %>
-			<input type=image src='<%= AppUtils.getImgFolderURL() %>downloadicon.gif' alt='Store selection' width=12 height=12 border=0 onClick="return getSelection()">&nbsp;
-		<% } %>
-		</td>
-		<td colspan="2" valign="middle" nowrap>
-			<select name="<%= AppConstants.RI_TABLE_NAME %>" onChange="document.dataform.submit()">
-			<%	for(Iterator iter=DataCache.getReportTableSources(remoteDbPrefix).iterator(); iter.hasNext(); ) { 
-					String iTableName = ((TableSource) iter.next()).getTableName(); %>
-			    <option value="<%= iTableName %>"<%= iTableName.equals(tableName)?" selected":"" %>><%= iTableName %>
-			<%	}	// for 
-			%>
-			</select>
-			<b class=rtableheader> DB Table Columns</b>
-		</td>
-	</tr>
-	<%	int rNum = 0;
-		if(dbColumns!=null)
-			for(rNum=0; rNum<dbColumns.size(); rNum++) {
-				DBColumnInfo dbCol = (DBColumnInfo) dbColumns.get(rNum); 
-				String sValue   = (includeTableNameInResult?(tableName+"."):"")+dbCol.getColName()+(includeColTypeInResult?("|"+dbCol.getColType()):""); 
-				String sDisplay = "["+tableName+"]."+dbCol.getColName(); %>
-	<tr<%= (rNum%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" height="30"><font class=rtabletext><%= (rNum+1) %></font></td>
-	<%			if(isSingleValueChoice) { %>
-		<td colspan="2"><font class=rtabletext><a href="javascript:setValue('<%= sValue %>')"><%= sDisplay %></a></font></td>
-	<%			} else { %>
-		<td align="center" valign="middle">
-			<input type="checkbox" name="dataChk" value="<%= sValue %>">
-		</td>
-		<td><font class=rtabletext><%= sDisplay %></font></td>
-	<%			}	// else 
-	%>
-	</tr>
-	<%		}	// for 
-		if(rNum==0) { %>
-	<tr class=rbg3>
-		<td align="center" height="30" colspan="3"><font class=rtabletext>No columns found for table [<%= tableName %>]</font></td>
-	</tr>
-	<%	} else {	// if
-	%>
-	<tr class=rbg3>
-		<td colspan="3"><font class=rtabletext><a href="javascript:clearValue()"><%= "CLEAR VALUE" %></a></font></td>
-	</tr>	
-	<%	
-	}
-	%>
-	<tr class=rbg1>
-		<td align="center" valign="middle" height="30">&nbsp;
-		<% if(! isSingleValueChoice) { %>
-			<input type=image src='<%= AppUtils.getImgFolderURL() %>downloadicon.gif' alt='Store selection' width=12 height=12 border=0 onClick="return getSelection()">&nbsp;
-		<% } %>
-		</td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-</table>
-
-	<input type="hidden" name="dataChk" value="">
-	<input type="hidden" name="dataChk" value="">
-</form>
-
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp
deleted file mode 100644
index a5dbd502..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/popup_testrun_sql.jsp
+++ /dev/null
@@ -1,103 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%	Exception ex = (Exception) request.getAttribute(AppConstants.RI_EXCEPTION);
-	DataSet   ds = (DataSet)   request.getAttribute(AppConstants.RI_DATA_SET); %>
-
-<html>
-<head>
-<title>SQL Statement Test Run</title>
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-<script language="JavaScript">
-<!--
-function setOpenerConfirm() {
-<%	if(AppUtils.getRequestNvlValue(request, AppConstants.RI_CHK_FIELD_SQL).equals("Y")&&ex==null) { %>
-	window.opener.setVerifyFlag();
-<%	} %>
-}	// setOpenerConfirm
-//-->
-</script>
-</head>
-<body onLoad="setOpenerConfirm()">
-<table class="mTAB" width="94%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 width="100%" valign="Middle"<%= (ds==null)?"":(" colspan="+(ds.getColumnCount()+1)) %>>
-			<b class=rtableheader>SQL Execution <%= (ex==null)?"Result - Success":"Generated Exception" %></b>
-		</td>
-	</tr>
-<% if(ex!=null) { %>
-	<tr>
-		<td class=rbg2>
-			<br>
-			<font class=rtabletext><%= nvl(ex.getMessage(), "&nbsp;") %></font>
-			<br><br>
-<!-------------------------------------------------------
-EXCEPTION [<%= ex.getMessage() %>]
-<%		ex.printStackTrace(new PrintWriter(out)); %>
--------------------------------------------------------->
-		</td>
-	</tr>
-<% } else if(ds!=null) { %>
-	<tr class=rbg1>
-		<td>&nbsp;</td>
-	<%	for(int c=0; c<ds.getColumnCount(); c++) { %>
-		<td align="center" valign="Middle"><b class=rtabletext><%= ds.getColumnName(c) %></b></td>
-	<%	} %>
-	</tr>
-	<%	for(int r=0; r<Math.min(ds.getRowCount(), Globals.getDefaultPageSize()); r++) { %>
-	<tr<%= (r%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" valign="Middle"><font class=rtabletext><%= (r+1) %></font></td>
-		<%	for(int c=0; c<ds.getColumnCount(); c++) { %>
-		<td valign="Middle"><font class=rtabletext><%= nvl(ds.getString(r, c), "&nbsp;") %></font></td>
-		<%	} %>
-	</tr>
-	<%	}	// for r 
-		if(ds.getRowCount()>Globals.getDefaultPageSize()) {	%>
-	<tr<%= (Globals.getDefaultPageSize()%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" valign="Middle"><font class=rtabletext><%= (Globals.getDefaultPageSize()+1) %></font></td>
-		<td align="left" valign="Middle" colspan="<%= ds.getColumnCount() %>"><font class=rtabletext>...</font></td>
-	</tr>
-	<%	} else if(ds.getRowCount()==0) { %>
-	<tr class=rbg3>
-		<td align="center" valign="Middle" colspan="<%= ds.getColumnCount()+1 %>"><font class=rtabletext>No data found</font></td>
-	</tr>
-	<%	}	// else if
-	}	// else if 
-%>
-	<tr>
-		<td align="center"<%= (ds==null)?"":(" colspan="+(ds.getColumnCount()+1)) %>>
-			<br>
-			<input type="Submit" class=button value="Close" onClick="window.close();">
-		</td>
-	</tr>
-</table>
-<br>
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp
deleted file mode 100644
index 81158047..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_csv.jsp
+++ /dev/null
@@ -1,89 +0,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.
-  ================================================================================
-  --%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="java.util.*" %><%@ page import="java.text.*" %><%@ page import="java.io.*" %><%@ page import="org.openecomp.portalsdk.analytics.model.*" %><%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %><%@ page import="org.openecomp.portalsdk.analytics.view.*" %><%@ page import="org.openecomp.portalsdk.analytics.system.*" %><%@ page import="org.openecomp.portalsdk.analytics.util.*" %><%
-	ReportRuntime rr = null;
-	ReportData    rd = null;
-	String parent = "";
-	int parentFlag = 0;
-	if(!nvl(request.getParameter("parent"), "").equals("N")) parent = nvl(request.getParameter("parent"), "");
-	if(parent.startsWith("parent_")) parentFlag = 1;
-	if(parentFlag == 1) {
-		rr = (ReportRuntime) request.getSession().getAttribute(parent+"_rr");
-		rd = (ReportData) request.getSession().getAttribute(parent+"_rd");
-	}
-	if(rr==null) rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	if(rd==null) rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-    String formattedReportName = new HtmlStripper().stripSpecialCharacters(rr.getReportName());
-    String formattedDate = new SimpleDateFormat("MMddyyyyHHmm").format(new Date());
-	String fName = formattedReportName+formattedDate+AppUtils.getUserID(request);
-	boolean raw = AppUtils.getRequestFlag(request, "raw");
-	if(true && !raw) 
-		response.setContentType("application/octet-stream");
-	else
-		response.setContentType("application/csv");
-	String fileName = fName+".csv";
-	String sql_whole = (String) request.getAttribute(AppConstants.RI_REPORT_SQL_WHOLE);
-	if(true && !raw) 
-	 	response.setHeader("Content-disposition","attachment;filename="+fName+".zip");
-	else
-		 response.setHeader("Content-disposition","attachment;filename="+fName+".csv");
-	try {(new ReportHandler()).createCSVFileContent(out, rd, rr, sql_whole, request,fName);
-	//out.flush();
-	//out.close();
-	    if(true) {
-	    //	response.reset();
-	    	ServletOutputStream outS = response.getOutputStream();
-			java.io.File file = null;
-			if(true && !raw) {
-				response.setContentType("application/octet-stream");
-				response.setHeader("Content-disposition","attachment;filename="+fName+".zip");
-				file = new java.io.File(AppUtils.getTempFolderPath()+""+fName+".zip");
-			} else {
-				response.setContentType("application/csv");
-				response.setHeader("Content-disposition","attachment;filename="+fName+".csv");
-				file = new java.io.File(AppUtils.getTempFolderPath()+""+fName+".csv");
-			}
-	    	FileInputStream fileIn = new FileInputStream(file);
-	    	int c;
-			while((c=fileIn.read()) != -1){
-	    		outS.write(c);
-	    		}
-	    		outS.flush();
-	    		outS.close();
-	    		fileIn.close();
-
-	    	 
-	    	/*byte[] outputByte = new byte[4096];
-	    	//copy binary contect to output stream
-	    	while(fileIn.read(outputByte, 0, 4096) != -1) {
-	    		outS.write(outputByte, 0, 4096);
-	    	}
-	    	fileIn.close();
-	    	outS.flush();
-	    	outS.close();*/
-	    }
-	} catch(Exception e) {
-		e.printStackTrace();
-		Log.write("Fatal error [report_download_csv.jsp]: "+e.getMessage());
-	}
-%>
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp
deleted file mode 100644
index e5ae9dde..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_pdf.jsp
+++ /dev/null
@@ -1,40 +0,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.
-  ================================================================================
-  --%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.pdf.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.view.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%
-	ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	ReportData    rd = (ReportData)     request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-	try {
-		new PdfReportHandler().createPdfFileContent(request,response, 3);
-	} catch(Exception e) {
-		Log.write("Fatal error [report_download_pdf.jsp]: "+e.getMessage());
-		e.printStackTrace();
-	}
-	out.clear();
-	out = pageContext.pushBody(); 
-%>
-
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp
deleted file mode 100644
index a82470d8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_download_xls.jsp
+++ /dev/null
@@ -1,64 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.view.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%
-ReportRuntime rr = null;
-ReportData    rd = null;
-String parent = "";
-int parentFlag = 0;
-if(!nvl(request.getParameter("parent"), "").equals("N")) parent = nvl(request.getParameter("parent"), "");
-if(parent.startsWith("parent_")) parentFlag = 1;
-if(parentFlag == 1) {
-	rr = (ReportRuntime) request.getSession().getAttribute(parent+"_rr");
-	rd = (ReportData) request.getSession().getAttribute(parent+"_rd");
-}
-if(rr==null) rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-if(rd==null) rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-
-	if(rr != null && rr.getReportType().equals(AppConstants.RT_DASHBOARD)) {
-		//rr = (ReportRuntime) request.getSession().getAttribute("FirstDashReport");
-	} else if (rr == null)
-		rr = (ReportRuntime) request.getSession().getAttribute("FirstDashReport");
-	//rd = (ReportData)    request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
-	
-	//response.setContentType("application/vnd.ms-excel");
-	//response.setHeader("Content-disposition","attachment;filename=download_all_"+AppUtils.getUserID(request)+".xls");
-	String user_id = AppUtils.getUserID(request);
-	try {
-/*		if (rr.getReportType().equals(AppConstants.RT_CROSSTAB))  {
-			int downloadLimit = (rr.getMaxRowsInExcelDownload()>0)?rr.getMaxRowsInExcelDownload():Globals.getDownloadLimit();
-			rd 		= rr.loadReportData(-1, AppUtils.getUserID(request), downloadLimit,request);
-		}
-*/
-		new ReportHandler().createExcelFileContent(out, rd, rr, request, response, user_id, 3); //3 whole
-	} catch(Exception e) {
-		e.printStackTrace();
-		Log.write("Fatal error [report_download_xls.jsp]: "+e.getMessage());
-	}
-	out.clear();
-	out = pageContext.pushBody(); 
-%>
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp
deleted file mode 100644
index 8d42b65b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_ebz.jsp
+++ /dev/null
@@ -1,179 +0,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.
-  ================================================================================
-  --%>
-<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/angular-touch.js"></script>
-<script src="app/fusion/external/ebz/angular_js/angular-animate.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>
-
-
-<script src="static/fusion/raptor/ebz/dynamicform.js"></script>
-<script src="static/fusion/raptor/ebz/multiselect.js"></script>
-<script src="static/fusion/raptor/ebz/report_search.js"></script>
-<script src="static/fusion/raptor/ebz/report_run.js"></script>
-<script src="static/fusion/raptor/ebz/quick_links.js"></script>
-
-<script src="static/fusion/raptor/uigrid/vfs_fonts.js"></script>
-<script src="static/fusion/raptor/uigrid/ui-grid.js"></script>
-
-<script src="static/fusion/raptor/ebz/report_chart_wizard.js"></script>
-
-
-<script src="app/fusion/scripts/controllers/modelpopupController.js"></script>
-
-<script src="static/fusion/raptor/ebz/date_time_picker.js"></script>
-<script src="static/fusion/raptor/ebz/moment.js"></script>
-<link rel="stylesheet" href="static/fusion/raptor/ebz/date_time_picker.css"/>
-
-
-<link rel="stylesheet" href="static/fusion/raptor/uigrid/ui-grid.css" type="text/css">
-
-<div ng-controller="reportMainController">
-	<div ng-if='isViewRendering || isDataLoading' style="font-size:50px;color:#2ca02c">Loading...</div>
-	<div ng-view style="min-height: 400px;"></div>
-</div>
-<div ng-include src="app/fusion/scripts/view-models/profile-page/popup_modal.html"></div>
-
-<style>
-#accBar .att-accordion__heading span{
-	font-weight:bold;
-	position:relative;
-	margin:-10px;
-}
-#accTimeChart .att-accordion__heading span{
-	font-weight:bold;
-	position:relative;
-	margin:-10px;
-}
-#accFlexTimeChart .att-accordion__heading span{
-	font-weight:bold;
-	position:relative;
-	margin:-10px;
-}
-#accCommonOptions .att-accordion__heading span{
-	font-weight:bold;
-	position:relative;
-	margin:-10px;
-}
-
-#additionalOptions .att-accordion__heading span{
-	font-weight:bold;
-	position:relative;
-	margin:-10px;
-}
-
-
-
-</style>
-<script>
-angular.module('abs').requires.push('quantum', 'ngAnimate', 'ngTouch', 'ngRoute', 'ui.grid',
-		'ui.grid.pagination','ui.grid.resizeColumns', 
-		'ui.grid.pinning');
-app.config(['$routeProvider',
-                  function($routeProvider) {
-                    $routeProvider.
-                      when('/report_search', {
-                	templateUrl: 'static/fusion/raptor/ebz/report_search.html',
-                	controller: 'reportSearchController'
-                      }).
-                      when('/report_run/:reportUrlParams*', {
-                      	templateUrl: 'static/fusion/raptor/ebz/report_run.html',
-                      	controller: 'reportRunController'
-                      }).
-                      when('/report_chart_wizard/:reportId', {
-                        templateUrl: 'static/fusion/raptor/ebz/report_chart_wizard.html',
-                        controller: 'ChartController'
-                      }).
-                      otherwise({
-                	redirectTo: '/report_search'
-                      });
-                }]);
-
-app.factory('redirectInterceptor',['$q','$location','$window','$rootScope', function($q,$location,$window,$rootScope){
-    return  {
-    	'request':function(config){
-    		$rootScope.isDataLoading = true;
-    		return config;
-        },
-    	'response':function(response,config){
-    		if(typeof response.data === 'string' && response.data=="session has timed out for user") {
-                $window.location.href = 'login.htm';
-                return $q.reject(response);
-            }else{
-        		//console.log('Inside response else ');
-            	$rootScope.isDataLoading = false;
-                return response;
-            }
-        }
-    }
-}]);
-
-app.config(['$httpProvider',function($httpProvider) {
-    $httpProvider.interceptors.push('redirectInterceptor');
-}]);
-
-app.controller("reportMainController", [ '$scope', '$rootScope', '$parse', 'Grid', function($scope,$rootScope,$parse,Grid) {
-	$rootScope.isViewRendering = true;
-	$rootScope.$on('$routeChangeStart', function() {
-		$rootScope.isViewRendering = true;
-		});
-	
-	Grid.prototype.getCellValue = function getCellValue(row, col){
-		 if(col.field.indexOf('==')>-1){
-			 var customField = col.field.split('==');
-			 var obj = row.entity.filter(function(d){if(d.columnId==customField[0]) return true; });
-			 if(obj.length>0){
-			   return obj[0].searchresultField[customField[1]];
-			 }
-		 }
-		 if ( typeof(row.entity[ '$$' + col.uid ]) !== 'undefined' ) {
-		   return row.entity[ '$$' + col.uid].rendered;
-		 } else if (this.options.flatEntityAccess && typeof(col.field) !== 'undefined' ){
-		   return row.entity[col.field];
-		 } else {
-		   if (!col.cellValueGetterCache) {
-		     col.cellValueGetterCache = $parse(row.getEntityQualifiedColField(col));
-		   }
-		   return col.cellValueGetterCache(row);
-		 }
-	};
-
-}]);
-</script>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp
deleted file mode 100644
index bb62def0..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_import.jsp
+++ /dev/null
@@ -1,84 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<html>
-<head>
-	<title>Import</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	<style>
-		#page-content {
-			width:80%
-		} 
-		
-		table#pageContentTable,
-		table#pageContentTable td,
-		table#pageContentTable tr
-		{
-		 border: none !important;
-		}
-	</style>
-</head>
-
-
-<br><br>
-
-<body>
-<div id="page-content" style="margin-right:20px">
-<form name="forma" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.import.save">
-
-<table width=94% class="tableBorder" border=0 cellspacing=1 cellpadding=3 align=center>
-	<tr class=rbg1>
-		<td>
-			<b class=rtableheader><%= Globals.getBaseTitle() %> > IMPORT REPORT XML</b>
-		</td>
-	</tr>
-	<tr class=rbg3>
-		<td align="center">
-			<font class=rtabletext>
-			<textarea name="reportXML" cols="62" rows="16"></textarea>
-			</font>
-		</td>
-	</tr>
-	<tr>
-		<td align="center">
-			<br>
-			<input type="Submit" class=button value="Import" onClick="if(document.forma.reportXML.value=='') { alert('Please provide report XML.'); return false; }">
-		</td>
-	</tr>
-</table>	
-	
-	
-
-</form>
-
-<%-- <jsp:include page="disclaimer.jsp" flush="true" /> --%>
-</div>
-</body>
-</html>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp
deleted file mode 100644
index cfbfad14..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_sample.jsp
+++ /dev/null
@@ -1,40 +0,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.
-  ================================================================================
-  --%>
-<h1 class="heading1" style="margin-bottom:20px">Customizable Analytics Dashboard</h1>
-	<iframe src="report_embedded#/report_run/c_master=3356&refresh=Y&hideGrid=true&width=550&height=400&leftMargin=0" 
-	        width="500" height="470"
-			scrolling="no" style="border: none; background-color: #f2f2f2; opacity: 1;"></iframe>
-
-	<iframe src="report_embedded#/report_run/c_master=3321&refresh=Y&hideGrid=true&width=550&height=300" 
-	        width="450" height="450"
-			scrolling="no" style="border: none; background-color: #f2f2f2; opacity: 1;"></iframe>
-
-<!-- 	<iframe src="report_embedded#/report_run/c_master=3323&refresh=Y&hideFormFields=true&ff1=2&ff1=4&ff1=5&ff1=6&ff1=7&ff1=8&display_content=Y&r_page=0" 
-	        width="625" height="250"
-			scrolling="no" style="border: none; background-color: #f2f2f2; opacity: 1;"></iframe>
- -->
-	<iframe src="report_embedded#/report_run/c_master=3324&refresh=Y&hideFormFields=true&ff1=12/10/2015&display_content=Y&r_page=0" 
-	        width="625" height="425"
-			scrolling="no" style="border: none; background-color: #f2f2f2; opacity: 1;"></iframe>
-
-<!-- 	<iframe src="report_embedded#/report_run/c_master=3327&refresh=Y&hideFormFields=true&ff1=6&ff2=1&display_content=Y&r_page=0" 
-	        width="625" height="250"
-			scrolling="no" style="border: none; background-color: #f2f2f2; opacity: 1;"></iframe>
- -->
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp
deleted file mode 100644
index 480bdbcb..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_search.jsp
+++ /dev/null
@@ -1,2432 +0,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.
-  ================================================================================
-  --%>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-touch.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-animate.js"></script>
-<script src="http://ui-grid.info/release/ui-grid.js"></script>
-<link rel="stylesheet" href="http://ui-grid.info/release/ui-grid.css" type="text/css">
-
-<style></style>
-
-<div ng-controller="reportSearchController">
-		<div id="grid1" ui-grid="gridOptions" ui-grid-pagination ui-grid-selection ui-grid-exporter class="grid"></div>
-</div>
-	
-<script>
-angular.module('abs').requires.push('ngAnimate', 'ngTouch', 'ui.grid','ui.grid.pagination','ui.grid.selection', 'ui.grid.exporter');
-app.controller("reportSearchController", function ($scope,$http,$parse,uiGridConstants,Grid) { 
-    $scope.searchdData = {
-    		  "metaReport" : {
-    			    "pagination" : true,
-    			    "pageSize" : 20,
-    			    "totalSize" : 9,
-    			    "pageNo" : -1
-    			  },
-    			  "columns" : [ [ {
-    			    "columnId" : "no",
-    			    "columnTitle" : "No",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "No",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "columnTitle" : "Report ID",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Report ID",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "columnTitle" : "Report Name",
-    			    "columnWidth" : "25%",
-    			    "alignment" : "Left",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Report Name",
-    			    "columnWidthHtml" : " width=25%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "descr",
-    			    "columnTitle" : "Description",
-    			    "columnWidth" : "30%",
-    			    "alignment" : "Left",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Description",
-    			    "columnWidthHtml" : " width=30%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "owner",
-    			    "columnTitle" : "Report Owner",
-    			    "columnWidth" : "10%",
-    			    "alignment" : "Center",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Report Owner",
-    			    "columnWidthHtml" : " width=10%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "columnTitle" : "Create Date",
-    			    "columnWidth" : "10%",
-    			    "alignment" : "Center",
-    			    "linkURL" : null,
-    			    "linkTitle" : null,
-    			    "linkForm" : null,
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : null,
-    			    "linkImgWidth" : null,
-    			    "linkImgHeight" : null,
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Create Date",
-    			    "columnWidthHtml" : " width=10%",
-    			    "linkImgSizeHtml" : ""
-    			  }, {
-    			    "columnId" : "copy",
-    			    "columnTitle" : "&nbsp;&nbsp;Copy&nbsp;&nbsp;",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : "document.forma.r_action.value='report.copy';",
-    			    "linkTitle" : "Copy report",
-    			    "linkForm" : "forma",
-    			    "linkConfirmMsg" : "Are you sure you want to create a copy of this report?",
-    			    "linkImg" : "static/fusion/raptor/images/modify_icon.gif",
-    			    "linkImgWidth" : "13",
-    			    "linkImgHeight" : "12",
-    			    "copyLink" : true,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "&nbsp;&nbsp;Copy&nbsp;&nbsp;",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : " width=\"13\" height=\"12\""
-    			  }, {
-    			    "columnId" : "edit",
-    			    "columnTitle" : "&nbsp;&nbsp;Edit&nbsp;&nbsp;",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : "document.forma.r_action.value='report.edit';",
-    			    "linkTitle" : "Edit report",
-    			    "linkForm" : "forma",
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : "static/fusion/raptor/images/pen_paper.gif",
-    			    "linkImgWidth" : "12",
-    			    "linkImgHeight" : "12",
-    			    "copyLink" : false,
-    			    "editLink" : true,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "&nbsp;&nbsp;Edit&nbsp;&nbsp;",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : " width=\"12\" height=\"12\""
-    			  }, {
-    			    "columnId" : "delete",
-    			    "columnTitle" : "Delete",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : "document.forma.r_action.value='report.delete';",
-    			    "linkTitle" : "Delete report",
-    			    "linkForm" : "forma",
-    			    "linkConfirmMsg" : "Are you sure you want to delete this report?",
-    			    "linkImg" : "static/fusion/raptor/images/deleteicon.gif",
-    			    "linkImgWidth" : "12",
-    			    "linkImgHeight" : "12",
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : true,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "Delete",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : " width=\"12\" height=\"12\""
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "columnTitle" : "Schedule",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : "document.forma.r_action.value='report.schedule.report.submit_wmenu';",
-    			    "linkTitle" : "Schedule report",
-    			    "linkForm" : "forma",
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : "static/fusion/raptor/images/calendar_icon.gif",
-    			    "linkImgWidth" : "20",
-    			    "linkImgHeight" : "20",
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : true,
-    			    "columnTitleHtml" : "Schedule",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : " width=\"20\" height=\"20\""
-    			  }, {
-    			    "columnId" : "run",
-    			    "columnTitle" : "&nbsp;&nbsp;Run&nbsp;&nbsp;",
-    			    "columnWidth" : "5%",
-    			    "alignment" : "Center",
-    			    "linkURL" : "document.forma.r_action.value='report.run';",
-    			    "linkTitle" : "Run report",
-    			    "linkForm" : "forma",
-    			    "linkConfirmMsg" : null,
-    			    "linkImg" : "static/fusion/raptor/images/test_run.gif",
-    			    "linkImgWidth" : "12",
-    			    "linkImgHeight" : "12",
-    			    "copyLink" : false,
-    			    "editLink" : false,
-    			    "deleteLink" : false,
-    			    "scheduleLink" : false,
-    			    "columnTitleHtml" : "&nbsp;&nbsp;Run&nbsp;&nbsp;",
-    			    "columnWidthHtml" : " width=5%",
-    			    "linkImgSizeHtml" : " width=\"12\" height=\"12\""
-    			  } ] ],
-    			  "rows" : [ [ [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "1",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "1",
-    			      "displayValueHtml" : "1",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "610",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "610",
-    			      "displayValueHtml" : "610",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "610",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "610",
-    			      "displayValueHtml" : "610",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"610\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 1</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/02/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/02/2009",
-    			      "displayValueHtml" : "03/02/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/02/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/02/2009",
-    			      "displayValueHtml" : "03/02/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='610'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "2",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "2",
-    			      "displayValueHtml" : "2",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "630",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "630",
-    			      "displayValueHtml" : "630",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "630",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "630",
-    			      "displayValueHtml" : "630",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"630\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 2</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/03/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/03/2009",
-    			      "displayValueHtml" : "03/03/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/03/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/03/2009",
-    			      "displayValueHtml" : "03/03/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='630'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3",
-    			      "displayValueHtml" : "3",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "637",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "637",
-    			      "displayValueHtml" : "637",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "637",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "637",
-    			      "displayValueHtml" : "637",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"637\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Dashboard Type: Report 3 </a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/04/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/04/2009",
-    			      "displayValueHtml" : "03/04/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/04/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/04/2009",
-    			      "displayValueHtml" : "03/04/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='637'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "4",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "4",
-    			      "displayValueHtml" : "4",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3321",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3321",
-    			      "displayValueHtml" : "3321",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3321",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3321",
-    			      "displayValueHtml" : "3321",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3321\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_BAR_CHART_INTERACTIVE</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/06/2013",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/06/2013",
-    			      "displayValueHtml" : "03/06/2013",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/06/2013",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/06/2013",
-    			      "displayValueHtml" : "03/06/2013",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3321'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "5",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "5",
-    			      "displayValueHtml" : "5",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "1012",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "1012",
-    			      "displayValueHtml" : "1012",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "1012",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "1012",
-    			      "displayValueHtml" : "1012",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"1012\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Demo: Dashboard - 2</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "05/06/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "05/06/2009",
-    			      "displayValueHtml" : "05/06/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "05/06/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "05/06/2009",
-    			      "displayValueHtml" : "05/06/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Schedule report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/calendar_icon.gif\" width=\"20\" height=\"20\" border=\"0\" alt=\"Schedule report\" onClick=\"document.forma.r_action.value='report.schedule.report.submit_wmenu'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Schedule report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='1012'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "6",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "6",
-    			      "displayValueHtml" : "6",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3322",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3322",
-    			      "displayValueHtml" : "3322",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3322",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3322",
-    			      "displayValueHtml" : "3322",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3322\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_LINE_CHART_INTERACTIVE</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/06/2013",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/06/2013",
-    			      "displayValueHtml" : "03/06/2013",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "03/06/2013",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "03/06/2013",
-    			      "displayValueHtml" : "03/06/2013",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3322'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "7",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "7",
-    			      "displayValueHtml" : "7",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3304",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3304",
-    			      "displayValueHtml" : "3304",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "3304",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "3304",
-    			      "displayValueHtml" : "3304",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"3304\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>DEMO_PIE_CHART</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "12/11/2012",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "12/11/2012",
-    			      "displayValueHtml" : "12/11/2012",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "12/11/2012",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "12/11/2012",
-    			      "displayValueHtml" : "12/11/2012",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='3304'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "8",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "8",
-    			      "displayValueHtml" : "8",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "526",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "526",
-    			      "displayValueHtml" : "526",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "526",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "526",
-    			      "displayValueHtml" : "526",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"526\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>RS Report CrossTab 3</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "CrossTab ",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "CrossTab ",
-    			      "displayValueHtml" : "CrossTab ",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "CrossTab ",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "CrossTab ",
-    			      "displayValueHtml" : "CrossTab ",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "01/29/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "01/29/2009",
-    			      "displayValueHtml" : "01/29/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "01/29/2009",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "01/29/2009",
-    			      "displayValueHtml" : "01/29/2009",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='526'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ], [ {
-    			    "columnId" : "no",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "9",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "9",
-    			      "displayValueHtml" : "9",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "2671",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "2671",
-    			      "displayValueHtml" : "2671",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_id",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "2671",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "2671",
-    			      "displayValueHtml" : "2671",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "rep_name",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "displayValueHtml" : "<a class=\"hyperref1\" href='#' onClick='document.forma.r_action.value=\"report.run\";document.forma.c_master.value=\"2671\";document.forma.refresh.value=\"Y\";document.forma.submit();return false;'>Test: CROSSTAB</a>",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "descr",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "owner",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Super User",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "Super User",
-    			      "displayValueHtml" : "Super User",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "09/22/2010",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "09/22/2010",
-    			      "displayValueHtml" : "09/22/2010",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "create_date",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "09/22/2010",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "09/22/2010",
-    			      "displayValueHtml" : "09/22/2010",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "copy",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Copy report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/modify_icon.gif\" width=\"13\" height=\"12\" border=\"0\" alt=\"Copy report\" onClick=\"if(! confirm('Are you sure you want to create a copy of this report?')) return false; document.forma.r_action.value='report.copy'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Copy report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "edit",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "delete",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "schedule",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "",
-    			      "alignment" : "Left",
-    			      "drillDownLink" : null,
-    			      "displayValueLinkHtml" : "&nbsp;",
-    			      "displayValueHtml" : "&nbsp;",
-    			      "alignmentHtml" : " align=Left"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  }, {
-    			    "columnId" : "run",
-    			    "searchresultField" : {
-    			      "columnId" : null,
-    			      "displayValue" : "Run report",
-    			      "alignment" : "Center",
-    			      "drillDownLink" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueLinkHtml" : "<input type=\"image\" src=\"static/fusion/raptor/images/test_run.gif\" width=\"12\" height=\"12\" border=\"0\" alt=\"Run report\" onClick=\"document.forma.r_action.value='report.run'; document.forma.c_master.value='2671'; document.forma.refresh.value='Y';\">",
-    			      "displayValueHtml" : "Run report",
-    			      "alignmentHtml" : " align=Center"
-    			    }
-    			  } ] ] ]
-    			};
-    var getByColumnId = function(input, id) {
-  		    var i=0, len=input.length;
-  		    for (; i<len; i++) {
-  		      if (+input[i].columnId == +id) {
-  		        return input[i];
-  		      }
-  		    }
-  		    return null;
-  		  };
-
-
-	var paginationOptions = {
-		    pageNumber: 1,
-		    pageSize: 25,
-		    sort: null
-		  };
-	  Grid.prototype.getCellValue = function getCellValue(row, col){
-			 if(col.field.indexOf('==')>-1){
-				 var obj = row.entity.filter(function(d){if(d.columnId==col.field.substring(2)) return true; });
-				 if(obj.length>0){
-				   return obj[0].searchresultField.displayValue;
-				 }
-			 }
-	    if ( typeof(row.entity[ '$$' + col.uid ]) !== 'undefined' ) {
-	      return row.entity[ '$$' + col.uid].rendered;
-	    } else if (this.options.flatEntityAccess && typeof(col.field) !== 'undefined' ){
-	      return row.entity[col.field];
-	    } else {
-
-	      if (!col.cellValueGetterCache) {
-	        col.cellValueGetterCache = $parse(row.getEntityQualifiedColField(col));
-	      }
-	      return col.cellValueGetterCache(row);
-	    }
-	  };
-	  
-		  $scope.gridOptions = {
-		    paginationPageSizes: [25, 50, 75],
-		    paginationPageSize: 25,
-		    enableGridMenu: true,
-		    enableSelectAll: true,
-		    exporterCsvFilename: 'myFile.csv',
-		    exporterPdfDefaultStyle: {fontSize: 9},
-		    exporterPdfTableStyle: {margin: [30, 30, 30, 30]},
-		    exporterPdfTableHeaderStyle: {fontSize: 10, bold: true, italics: true, color: 'red'},
-		    exporterPdfHeader: { text: "My Header", style: 'headerStyle' },
-		    exporterPdfFooter: function ( currentPage, pageCount ) {
-		      return { text: currentPage.toString() + ' of ' + pageCount.toString(), style: 'footerStyle' };
-		    },
-		    exporterPdfCustomFormatter: function ( docDefinition ) {
-		      docDefinition.styles.headerStyle = { fontSize: 22, bold: true };
-		      docDefinition.styles.footerStyle = { fontSize: 10, bold: true };
-		      return docDefinition;
-		    },
-		    exporterPdfOrientation: 'portrait',
-		    exporterPdfPageSize: 'LETTER',
-		    exporterPdfMaxGridWidth: 500,
-		    exporterCsvLinkElement: angular.element(document.querySelectorAll(".custom-csv-link-location")),
-		    onRegisterApi: function(gridApi){
-		      $scope.gridApi = gridApi;
-		    },
-		    useExternalPagination: true,
-		    useExternalSorting: true,
-		    columnDefs: [  ],
-		    onRegisterApi: function(gridApi) {
-		      $scope.gridApi = gridApi;
-		      $scope.gridApi.core.on.sortChanged($scope, function(grid, sortColumns) {
-		        if (sortColumns.length == 0) {
-		          paginationOptions.sort = null;
-		        } else {
-		          paginationOptions.sort = sortColumns[0].sort.direction;
-		        }
-		        getPage();
-		      });
-		      gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) {
-		        paginationOptions.pageNumber = newPage;
-		        paginationOptions.pageSize = pageSize;
-		        getPage();
-		      });
-		    }
-		  };
-		  
-		  //$scope.getCellValue = function() {
-		//	  $scope.gridOptions.data = $scope.searchdData.rows[0];
-		//	  console.log($scope.gridOptions.data[1][0].displayValue);
-		 // };
-		 
-
-
-		  var getPage = function() {
-		  };
-		  $scope.searchdData.columns[0].forEach(function(entry) {
-			  $scope.gridOptions.columnDefs.push({ displayName: entry.columnTitle, field: '=='+entry.columnId});
-		  }); 
-		  $scope.gridOptions.data = $scope.searchdData.rows[0].splice(1,8);
-
-		  getPage();
-
-});
-
-</script>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp
deleted file mode 100644
index 8448b249..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/report_wizard.jsp
+++ /dev/null
@@ -1,322 +0,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.
-  ================================================================================
-  --%>
-<%--
- Name: report_wizard.jsp
- Use : Master JSP which navigates to specific JSP when different tab is selected. Default it navigates to the wizard_definition.jsp 
- 
- Change Log
- ==========
- 
- 22-Jun-2009 : Version 8.4 (Sundar); 
- 				
- 				<UL> 
- 				<LI> Save button is suppressed from showing when wizard is in the last page (Run page).</LI>
- 				<LI> width of the content_iframe is changed back to default one when navigated from >100% report's run page.</LI>
- 				</UL>
---%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %> 
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-<script language="Javascript" src="<%= AppUtils.getBaseFolderURL() %>js/form-field-tooltip.js"></script>
-<script language="Javascript" src="<%= AppUtils.getBaseFolderURL() %>js/other_scripts.js"></script>
-<style>
-td, th {
-    padding: 0px;
-}
-</style>
-<script>
-	<%
-		String paramString = "";
-		Enumeration en = request.getParameterNames();
-		if (en != null) {
-		while (en.hasMoreElements()) {
-			String name = (String) en.nextElement();
-			String values[] = request.getParameterValues(name);
-			if (name.equals(AppConstants.RI_ACTION) == false 
-				&& name.equals("c_master") == false && name.equals("action") == false
-				&& values != null) {
-				for (int i = 0; i < values.length; i++) {
-					//values[i] = values[i].replaceAll("=", "%3d");
-					//values[i] = values[i].replaceAll("\\?", "%3f");
-					//values[i] = values[i].replaceAll("&", "%26");	
-					//System.out.println(name + " (" + i + "): [" + values[i] + "]");
-					paramString = paramString + "&" + name + "=" + java.net.URLEncoder.encode(values[i],"UTF8");
-				}
-			}
-		}
-		}
-
-	%>	
-	if (window.parent.document.getElementById('content_Iframe') || window.document.getElementById('content_Iframe')){
-	}else{
-		//window.location="<%= AppUtils.getRaptorActionURL() %>report.create.container&c_master=<%=request.getParameter("c_master")%><%=paramString%>";
-	}
-</script>
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	WizardSequence ws = rdef.getWizardSequence();
-	
-	String curStep    = ws.getCurrentStep();
-	String curSubStep = ws.getCurrentSubStep();
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	String title = (reportID.equals("-1")?"Create Report":"Edit Report");
-	String navTitle = Globals.getBaseTitle()+" > " + title;
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-<!--  Set All variable to request, to enable included jsp to access it -->	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- <link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
- <link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/ral.css">
- 
- 
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
- 
-<jsp:include page="error_include.jsp" flush="true" />
-
-
-<style>
-#page-content {
-	width:80%
-} 
-
-table#pageContentTable,
-table#pageContentTable td,
-table#pageContentTable tr
-{
- border: none !important;
-}
-</style>
-<div id="page-content">
-<table id="pageContentTable" width="100%" >
-<tr><td id="folderTreeContainer" width="1%" height='300' valign='top' ><table>
-		<!--<jsp:include page="tree/folderNav.jsp" flush="true" >	
-        	<jsp:param name="doCollapseTree" value="Y" />
-       	</jsp:include>-->
-	</table>
-</td>
-<td id="searchContentContainer" valign='top' >
-<div id="contentDiv" style="position:absoulte;overflow:auto;">
-<jsp:include page="custom_js_include.jsp" flush="true" />
-<form id="forma" name="forma" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.wizard">
-	<input type="hidden" name="<%= AppConstants.RI_REPORT_ID %>" value="<%= reportID %>">
-	<input type="hidden" name="<%= AppConstants.RI_DETAIL_ID %>" id="<%= AppConstants.RI_DETAIL_ID %>" value="<%= AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID) %>">
-	<input type="hidden" id="<%= AppConstants.RI_GO_TO_STEP %>" name="<%= AppConstants.RI_GO_TO_STEP %>" value="">
-	<input type="hidden" id="<%= AppConstants.RI_WIZARD_ACTION %>" name="<%= AppConstants.RI_WIZARD_ACTION %>" value="<%= AppConstants.WA_BACK %>">
-	<input type="hidden" name="<%= AppConstants.RI_JAVASCRIPT_ITEM_ID %>" value="">
-
-<table style="border: none !important;" width="94%" border="0" cellspacing="0" cellpadding="0" align=center>
-<tr><td>
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" style="margin: 0px;">
-		<tr>
-<%		for(ws.resetNext(); ws.hasNext(); ) { 
-			String sTab = ws.getNext(); %>
-			<td width="9" align="right"><img border="0" src="<%= AppUtils.getImgFolderURL() %><%= sTab.equals(curStep)?"tab_left_sel.gif":"tab_left.gif" %>" width="9" height="24"></td>
-			<td class=<%= sTab.equals(curStep)?"rbg1":"rbg1d" %> align="center" valign="middle">
-			<%	if(sTab.equals(curStep)) { %>
-				&nbsp;<a href="javascript:document.forma.submit()" class=rtabselected onClick="document.getElementById('<%= AppConstants.RI_GO_TO_STEP %>').value='<%= sTab %>';"><%= clearSpaces(sTab) %></a>&nbsp;
-			<%	} else if(reportID.equals("-1")) { %>	
-				&nbsp;<b class=rtabtext><%= clearSpaces(sTab) %></b>&nbsp;
-			<%	} else { %>	
-				&nbsp;<a href="javascript:document.forma.submit()" class=rtabtext onClick="document.getElementById('<%= AppConstants.RI_GO_TO_STEP %>').value='<%= sTab %>';"><%= clearSpaces(sTab) %></a>&nbsp;
-			<%	} %>
-			</td>
-			<td width="9" align="left"><img border="0" src="<%= AppUtils.getImgFolderURL() %><%= sTab.equals(curStep)?"tab_right_sel.gif":"tab_right.gif" %>" width="9" height="24"></td>
-<%		}	// for 
-%>
-			<td width="80%">&nbsp;</td>
-		</tr>
-	</table>
-</td></tr><tr><td>
-	<table width="100%" border="0" cellspacing="0" cellpadding="3" style="margin: 0px;">
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= navTitle %></b></td>
-		</tr>
-	</table>
-</td></tr><tr><td><%	if(curStep.equals(AppConstants.WS_DEFINITION)) { %>
-        <% if(sessionflag == 1) dbInfo = ""; %>
-		   <jsp:include page="wizard_definition.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_SQL)) { %>
-		 <jsp:include page="wizard_sql_def.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_TABLES)&&curSubStep.equals("")) { %>
-		 <jsp:include page="wizard_tables_list.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_TABLES)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 <jsp:include page="wizard_tables_edit.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals("")) { %>
-		 <jsp:include page="wizard_columns_list.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals(AppConstants.WSS_ADD_MULTI)) { %>
-		 <jsp:include page="wizard_columns_add_multi.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&curSubStep.equals(AppConstants.WSS_ORDER_ALL)) { %>
-		 <jsp:include page="wizard_columns_order_all.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_COLUMNS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT) ||curSubStep.equals(AppConstants.WA_MODIFY))) { %>
-		 <jsp:include page="wizard_columns_edit.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_FORM_FIELDS)&&curSubStep.equals("")||curSubStep.equals(AppConstants.WSS_ADD_BLANK)) { %>
-		 <jsp:include page="wizard_form_fields_list.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_FORM_FIELDS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 <jsp:include page="wizard_form_fields_edit.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_FILTERS)&&curSubStep.equals("")) { %>
-		<jsp:include page="wizard_filters_list.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_FILTERS)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		  <jsp:include page="wizard_filters_edit.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&curSubStep.equals("")) { %>
-		 <jsp:include page="wizard_sorting_list.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&curSubStep.equals(AppConstants.WSS_ORDER_ALL)) { %>
-		<jsp:include page="wizard_sorting_order_all.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_SORTING)&&(curSubStep.equals(AppConstants.WSS_ADD)||curSubStep.equals(AppConstants.WSS_EDIT))) { %>
-		 <jsp:include page="wizard_sorting_edit.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_JAVASCRIPT)) { %>
-		 <jsp:include page="wizard_javascript.jsp"/>		 
-<%	} else if(curStep.equals(AppConstants.WS_CHART)) { %>
-		 <jsp:include page="wizard_chart.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_USER_ACCESS)) { %>
-		 <jsp:include page="wizard_user_access.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_SCHEDULE)) { %>
-		 <jsp:include page="wizard_schedule.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_REPORT_LOG)) { %>
-		 <jsp:include page="wizard_log.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_MAP)) { %>
-		 <jsp:include page="wizard_map.jsp"/>
-<%	} else if(curStep.equals(AppConstants.WS_DATA_FORECASTING)) { %>
-		 <jsp:include page="wizard_data_forecasting.jsp"/>
-<%	} else { %>	
-		 <jsp:include page="wizard_run.jsp"/>
-<%	} %>
-	
-</td></tr><tr><td>
-	<table style="border: none !important;" width="100%" border="0" cellspacing="1" cellpadding="3">
-		<tr>
-			<td width="10%" align="right">
-				&nbsp;
-			</td>
-			<td align=center>
-				<% if(! ws.isInitialStep()) { %>
-				<button type="submit" onClick="document.getElementById('<%= AppConstants.RI_WIZARD_ACTION %>').value='<%= AppConstants.WA_BACK %>';document.forma.submit();" att-button btn-type="primary" size="small" title='Back'>Back</button>
-				<% } %>
-				
-				<% if(! ws.isFinalStep()) { %>
-				<button type="submit" onClick="if(! dataValidate()) return false;  document.getElementById('<%= AppConstants.RI_WIZARD_ACTION %>').value='<%= AppConstants.WA_SAVE %>';document.forma.submit();" att-button btn-type="primary" size="small" title='Save'>Save</button>
-				<button type="submit" onClick="if(! dataValidate()) return false;  document.getElementById('<%= AppConstants.RI_WIZARD_ACTION %>').value='<%= AppConstants.WA_NEXT %>';document.forma.submit();" att-button btn-type="primary" size="small" title='Next'>Next</button>
-				<% } %>
-			</td>
-		</tr>
-	</table>	
-</td></tr>
-</table>	
-
-</form>
-
-<script type="text/javascript">
-  document.title += ' <%=title%>';
-</script>
-
- <jsp:include page="footer.jsp" flush="true" />
-
-</div>
-</td>
-</tr>
-</table>
-</div>
-<%--<jsp:include page="disclaimer.jsp" flush="true" />--%>
-<script>
-	//document.getElementById('loadingMessageDiv').style.display='none';
-    //adding the bread crumb on the folder tree
-	if (window.parent && window.parent.addBreadCrumb)
-		window.parent.addBreadCrumb(true, "000<%=rdef.getReportID()%>");
-	//displayTree("000<%=rdef.getReportID()%>");
-	<%
-		String isTreeHidden = "true";
-		if(request.getSession().getAttribute("isTreeHidden") != null && ((String)request.getSession().getAttribute("isTreeHidden")).equals("true")){
-			isTreeHidden = "true";
-		}else{
-			isTreeHidden = "false";
-		}
-	%>
-	//if ("<%=isTreeHidden%>" == "true"){
-	//	hideTree();
-	//}
-	//document.getElementById('contentDiv').style.height=document.body.offsetHeight - 210;
-	function resizeDivScrollbar(){
-		var parentBody = window.parent.document.body;
-		var parentMenu = window.parent.document.getElementById("application"); 
-		var searchTD = document.getElementById("contentDiv"); 
-		var contentIframe = window.parent.document.getElementById("content_Iframe");
-		//parentBody.style.width = window.screen.size; 
-		//searchTD.style.width  = parentBody.clientWidth - 200;
-		//parentMenu.style.width = 1263;
-		//javascript:resizeTo(screen.availWidth,screen.availHeight);
-		if(parentMenu) parentMenu.style.width = screen.availWidth - 150;
-		if(contentIframe) contentIframe.style.width = screen.availWidth - 30;
-	}
-	resizeDivScrollbar();
-</script>
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)=='<')
-				sb.replace(i, i+1, "&lt;");
-			else if(sb.charAt(i)=='>')
-				sb.replace(i, i+1, "&gt;");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, "&quot;");
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)==' ')
-				sb.replace(i, i+1, "&nbsp;");
-   		
-		return sb.toString();
-	}   // clearSpaces
-	
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
- 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp
deleted file mode 100644
index 2fdcee46..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_field_run_sql.jsp
+++ /dev/null
@@ -1,39 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-<script language="JavaScript">
-  
-   function postSQL() {
-	 document.formb.<%= AppConstants.RI_FORMATTED_SQL %>.value=window.opener.forma.fieldSQL.value;
-	 window.opener.setVerifyFlag();
-	 document.formb.submit();
-   }
-
-</script>
-<body onLoad="postSQL()">
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-  <input type="hidden" name="action" value="raptor">
-  <input type="hidden" name="r_action" value="report.popup.testrun.sql">
-  <input type="hidden" name="<%= AppConstants.RI_FORMATTED_SQL %>" value="">
-</form>
-</body>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp
deleted file mode 100644
index 1c30437b..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/test_run_sql.jsp
+++ /dev/null
@@ -1,38 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-
-<script language="JavaScript">
-  
-   function postSQL() {
-	 document.formb.<%= AppConstants.RI_FORMATTED_SQL %>.value=window.opener.forma.reportSQL.value;
-	 document.formb.submit();
-   }
-
-</script>
-<body onLoad="postSQL()">
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-  <input type="hidden" name="action" value="raptor">
-  <input type="hidden" name="r_action" value="report.popup.testrun.sql">
-  <input type="hidden" name="<%= AppConstants.RI_FORMATTED_SQL %>" value="">
-</form>
-</body>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp
deleted file mode 100644
index 38951994..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/folderNav.jsp
+++ /dev/null
@@ -1,464 +0,0 @@
-<%@page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.ReportRuntime"%>
-<%@page import="org.openecomp.portalsdk.analytics.util.AppConstants"%>
-<%@page import="org.openecomp.portalsdk.analytics.system.Globals"%>
-
-<%
-	boolean isFolderAllowed = false;
-	ReportRuntime rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
-	boolean adminUser = AppUtils.isAdminUser(request);
-	if (Globals.isFolderTreeAllowed()) {
-		if(adminUser) {
-			isFolderAllowed = true;
-		} else if (!Globals.isFolderTreeAllowedOnlyForAdminUsers()) { 
-			isFolderAllowed = true; 
-		} else isFolderAllowed = false;
-	}
-	
-    
-	
-%>
-
-
-<script src='dwr/engine.js'></script>
-<script src='dwr/util.js'></script>
-<script src='dwr/interface/folderNavAjax.js'></script>
-
-
-<script>
-	var imgFolder = '<%=AppUtils.getImgFolderURL()%>';
-	var isFolderAllowed = '<%= isFolderAllowed%>';
-</script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/ajax.js"></script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/context-menu.js"></script>
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/drag-drop-folder-tree.js">
-<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js">
-</script>
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/tree/drag-drop-folder-tree.css">
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/tree/context-menu.css">
-<style type="text/css">
-/* CSS for the demo */
-img{
-	border:0px;
-}
-</style>
-<script>
-	var doCollapse = '<%=request.getParameter("doCollapseTree")%>';
-	var selectedFolderId;
-	var ajaxObjects = new Array();
-		
-		// Use something like this if you want to save data by Ajax.
-		function saveMyTree()
-		{
-				saveString = treeObj.getNodeOrders();
-				alert(saveString);
-				var ajaxIndex = ajaxObjects.length;
-				ajaxObjects[ajaxIndex] = new sack();
-				var url = 'tree';
-				//var url = 'tree';
-				ajaxObjects[ajaxIndex].requestFile = url;	// Specifying which file to get
-				ajaxObjects[ajaxIndex].onCompletion = function() { saveComplete(ajaxIndex); } ;	// Specify function that will be executed after file has been found
-				ajaxObjects[ajaxIndex].runAJAX(url);		// Execute AJAX function			
-			
-		}
-		function saveComplete(index)
-		{
-			alert(ajaxObjects[index].response);			
-		}
-	
-		
-		// Call this function if you want to save it by a form.
-		function saveMyTree_byForm()
-		{
-			displayFolderInfo();
-			var data=folderNavAjax.saveFolderStructure(treeObj.getNodeOrders(), "<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-			
-		}
-		
-		function cancelMyTree_byForm(){
-			//document.treeFrm.submit();		
-			displayFolderInfo();
-			var data=folderNavAjax.getFolderListString("<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-		}
-		
-		function deleteMyTree_byForm()
-		{
-			//document.treeForm.submit();
-			displayFolderInfo();
-			var data=folderNavAjax.deleteFolderStructure(document.treeFrm.deleteIds.value, "<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-		}
-		
-		function addMyTree_byForm()
-		{
-			//document.treeFrm.submit();
-			displayFolderInfo();
-			selectedFolderId = document.treeFrm.saveString.value;
-			var data=folderNavAjax.createNewFolder(document.treeFrm.saveString.value, document.treeFrm.newName.value, "<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-					
-		}
-		
-		function renameMyTree_byForm()
-		{
-			//document.treeFrm.submit();
-			displayFolderInfo();
-			var data=folderNavAjax.renameFolder(document.treeFrm.renameId.value, document.treeFrm.newName.value, "<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-					
-		}
-		
-		function createFolder(){
-			if(JSTreeObj.selectedItem == null || JSTreeObj.selectedItem.parentNode.id.substr(0,3) == '000') 
-				return; 
-			if (JSTreeObj.isAddAllowed(JSTreeObj.selectedItem.parentNode.id) == false){
-				alert("You do not have rights on this folder");
-				return;
-			}
-			selectedFolderId = JSTreeObj.selectedItem.parentNode.id;
-			displayFolderInfo();
-			if (JSTreeObj.addItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem) == false){
-				hideFolderInfo();
-			}
-		}
-		
-		function deleteFolder(){
-			if(JSTreeObj.selectedItem == null) {
-				return; 
-			}
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			if (JSTreeObj.isDeleteAllowed(id) == false){
-				alert("You do not have rights on this folder");
-				return;
-			}
-			if(id.substr(0,3) == '000') {
-				return;
-			}			
-			displayFolderInfo();
-			if (JSTreeObj.deleteItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem) == false){
-				hideFolderInfo();
-			}
-		}
-		
-		function runReport()
-		{
-			
-			if (JSTreeObj == null || JSTreeObj.selectedItem == null){
-				return;
-			}
-			
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			if(id.substr(0,3) != '000') {
-				return;
-			}			
-			//displayFolderInfo();
-			id = id.substr(3, id.length);
-			addBreadCrumb(true, id);	
-			if (window.frames && window.frames[0] && window.frames[0].name == 'content_Iframe'){
-				window.frames[0].location='<%= AppUtils.getRaptorActionURL() %>report.run&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-			}
-			else if (document.getElementById('searchContentContainer')){
-				document.getElementById('searchContentContainer').innerHTML = "<div id='breadCrumbArea'> </div><iframe name='content_Iframe' frameborder='0'  id='content_Iframe' src='<%= AppUtils.getRaptorActionURL() %>report.run&c_master=" + id + "&PAGE_ID=HOME&refresh=Y' width='100%' height='450' ></iframe>";
-				//document.getElementById('content_Iframe').height=document.body.offsetHeight - 210;
-				resizeWindow();
-				document.getElementById('content_Iframe').location = '<%= AppUtils.getRaptorActionURL() %>report.run&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-									
-			}else{
-			
-				document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.run&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-				document.treeFrm.submit();
-			}
-			
-		}
-		function editReport()
-		{
-			if (JSTreeObj == null || JSTreeObj.selectedItem == null){
-				return;
-			}
-			
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			if(id.substr(0,3) != '000') {
-				return;
-			}			
-			id = id.substr(3, id.length);
-			if (window.frames && window.frames[0] && window.frames[0].name == 'content_Iframe'){
-				window.frames[0].location='<%= AppUtils.getRaptorActionURL() %>report.edit&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-			}
-			else if (document.getElementById('searchContentContainer')){
-				document.getElementById('searchContentContainer').innerHTML = "<div id='breadCrumbArea'> </div><iframe name='content_Iframe' frameborder='0'  id='content_Iframe' src='<%= AppUtils.getRaptorActionURL() %>report.edit&c_master=" + id + "&PAGE_ID=HOME&refresh=Y' width='100%' height='450' ></iframe>";
-				//document.getElementById('content_Iframe').height=document.body.offsetHeight - 210;
-				resizeWindow();
-				document.getElementById('content_Iframe').location = '<%= AppUtils.getRaptorActionURL() %>report.edit&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-						
-			}else{
-				document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.edit&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-				document.treeFrm.submit();			
-			}
-		}
-		function deleteReport()
-		{
-			if (JSTreeObj == null || JSTreeObj.selectedItem == null){
-				return;
-			}
-			
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			if(id.substr(0,3) != '000') {
-				return;
-			}			
-			id = id.substr(3, id.length);
-			if (window.frames && window.frames[0] && window.frames[0].name == 'content_Iframe'){
-				window.frames[0].location='<%= AppUtils.getRaptorActionURL() %>report.delete&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-			}
-			else if (document.getElementById('searchContentContainer')){
-				document.getElementById('searchContentContainer').innerHTML = "<div id='breadCrumbArea'> </div><iframe name='content_Iframe' frameborder='0'  id='content_Iframe' src='<%= AppUtils.getRaptorActionURL() %>report.delete&c_master=" + id + "&PAGE_ID=HOME&refresh=Y' width='100%' height='450' ></iframe>";
-				//document.getElementById('content_Iframe').height=document.body.offsetHeight - 210;
-				resizeWindow();
-				document.getElementById('content_Iframe').location = '<%= AppUtils.getRaptorActionURL() %>report.delete&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-						
-			}
-			else{
-				document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.delete&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-				document.treeFrm.submit();			
-			}
-			
-		}
-		function createReport()
-		{
-			if (JSTreeObj == null || JSTreeObj.selectedItem == null){
-				return;
-			}	
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			addBreadCrumb(false, id);
-			if (window.frames && window.frames[0] && window.frames[0].name == 'content_Iframe'){
-				window.frames[0].location='<%= AppUtils.getRaptorActionURL() %>report.create&folder_id=' + id + '&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-			}
-			else if (document.getElementById('searchContentContainer')){
-				document.getElementById('searchContentContainer').innerHTML = "<div id='breadCrumbArea'> </div><iframe name='content_Iframe' frameborder='0'  id='content_Iframe' src='<%= AppUtils.getRaptorActionURL() %>report.create&folder_id=" + id + "&c_master=' + id + '&PAGE_ID=HOME&refresh=Y' width='100%' height='450' ></iframe>";
-				//document.getElementById('content_Iframe').height=document.body.offsetHeight - 210;
-				resizeWindow();
-				document.getElementById('content_Iframe').location = '<%= AppUtils.getRaptorActionURL() %>report.create.container&folder_id=' + id + '&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-						
-			}
-			else{
-				displayFolderInfo();
-				document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.create.container&folder_id=' + id + '&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-				document.treeFrm.submit();
-			}
-		}
-		function getFolderReports(id)
-		{	
-			addBreadCrumb(false, id);
-			if (window.frames && window.frames[0] && window.frames[0].name == 'content_Iframe'){
-				window.frames[0].location='<%= AppUtils.getRaptorActionURL() %>report.folderlist_iframe&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';				
-			}
-			else if (document.getElementById('searchContentContainer')){
-				document.getElementById('searchContentContainer').innerHTML = "<div id='breadCrumbArea'> </div><iframe name='content_Iframe' frameborder='0'  id='content_Iframe' src='<%= AppUtils.getRaptorActionURL() %>report.folderlist_iframe&c_master=" + id + "&PAGE_ID=HOME&refresh=Y' width='100%' height='450' ></iframe>";
-				//document.getElementById('content_Iframe').height=document.body.offsetHeight - 210;
-				resizeWindow();
-				document.getElementById('content_Iframe').location = "<%= AppUtils.getRaptorActionURL() %>report.folderlist_iframe&c_master=" + id + "&PAGE_ID=HOME&refresh=Y";
-			
-			}
-			else{
-				document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.folderlist&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-				document.treeFrm.submit();
-			}
-		}
-		
-		function getAllFolderReports()
-		{
-			var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-			document.treeFrm.action='<%= AppUtils.getRaptorActionURL() %>report.folderlist&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-			document.treeFrm.submit();
-		}
-		
-		
-		function displayFolderInfo()
-		{
-			var infoDiv = document.getElementById('loadingMessageDiv');
-			if (infoDiv == null)
-				return;			
-			infoDiv.style.left = document.body.offsetWidth - 100 ;
-			infoDiv.style.top = document.getElementById('scrollableTable').style.top;
-			infoDiv.style.display='block';			
-		}
-		function hideFolderInfo()
-		{
-			var infoDiv = document.getElementById('loadingMessageDiv');
-			if (infoDiv == null)
-				return;						
-			infoDiv.style.display='none';
-		}
-		
-		function displayTree(id){
-			if (isFolderAllowed ){
-				if (id != null)
-					selectedFolderId = id;
-				if (document.getElementById('reportFolderTree') == null){
-					displayFolderInfo();
-					var data=folderNavAjax.getFolderListString("<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-				}			
-				document.getElementById('expandedTree').style.display='block';
-				document.getElementById('collapsedTree').style.display='none';
-				if (document.getElementById('folderTreeContainer'))
-					document.getElementById('folderTreeContainer').width="25%";
-					
-				//document.getElementById('scrollableTable').style.height=window.screen.height - 320;
-				//document.getElementById('scrollableTable').style.height=document.body.offsetHeight - 260;
-				resizeWindow();
-				folderNavAjax.displayTree();
-			}
-
-
-		}
-		function hideTree(){
-			document.getElementById('expandedTree').style.display='none';
-			document.getElementById('collapsedTree').style.display='block';
-			//GET BREAD CRUMBS and assign
-			if (document.getElementById('folderTreeContainer'))
-				document.getElementById('folderTreeContainer').width="2px";
-			folderNavAjax.hideTree();
-		}
-		function refreshTree(id){
-
-			if (isFolderAllowed ){
-				if (id != null)
-					selectedFolderId = id;
-				displayFolderInfo();
-				var data=folderNavAjax.getFolderListString("<%=AppUtils.getUserID(request)%>", fillFolderStructure);
-				
-				document.getElementById('expandedTree').style.display='block';
-				document.getElementById('collapsedTree').style.display='none';
-				if (document.getElementById('folderTreeContainer'))
-					document.getElementById('folderTreeContainer').width="25%";
-					
-				//document.getElementById('scrollableTable').style.height=document.body.offsetHeight - 210;
-				resizeWindow();
-				folderNavAjax.displayTree(selectedFolderId);
-			}
-		}
-		function addBreadCrumb(isReport, id){
-		//	if (id != null)
-		//		var data=folderNavAjax.getBreadCrumb(isReport, id, addBreadCrumbCallback);
-			
-		}
-		function addBreadCrumbCallback(data){
-			var collapsedTree = document.getElementById('breadCrumbArea');
-			if (collapsedTree == null)
-				return;
-			collapsedTree.innerHTML = "<font class=rtabletext style='background-color:white'>" + data + "</font>";
-		}
-		function collapseAllTree(){
-			treeObj.collapseAll();
-		}
-</script>
-
-<form name='treeFrm' method='post'>
-
-	<input type='hidden' id='newName' name='newName'/>
-	<input type='hidden' id='saveString' name='saveString'/>
-	<input type='hidden' id='deleteIds' name='deleteIds'/>
-	<input type='hidden' id='renameId' name='renameId'/>
-	
-	
-	<tr id="def" height="0">
-		<td colspan="10"></td>
-	</tr>
-	
-	<tr width="100%" ><td valign='top' width='300'>
-	<% if(isFolderAllowed) { %>
-		<div id="expandedTree" style="position:absoulte;top:0;width:100%;height:25px;display:none;">
-		<table width="100%" border="0" cellspacing="1" align="left">
-			<tr>
-				<td colspan=2 align="right"><img border="0" src="<%= AppUtils.getImgFolderURL() %>tree/grnarrowleft.gif" onClick="javascript:hideTree()"  alt='Hide Folder Tree' style='cursor:hand'>
-					&nbsp;&nbsp;&nbsp;
-				</td>
-				
-			</tr>
-			<tr>
-				<td colspan=3>
-					<div id="scrollableTable" class="scrollableTable" style="position:absoulte;top:0;width:100%;height:430px;display:block;overflow:scroll">
-						<table id="folderTree" width="100%" border="0" cellspacing="1" align="center">
-							<tr>
-								<td nowrap>	
-								</td>
-							</tr>
-						</table>
-					</div>
-					<div id='loadingMessageDiv' style="position:absolute;top:150;left:650;width:40px;height:25px;display:none">
-						<table><tr bgcolor='red'><td class=rcolheader> Loading...</td></tr></table>
-					</div>			
-					
-				</td>				
-			</tr>
-			<tr>
-				<td class=rtabletext width='100%'>
-					<a href="#" onclick='javascript:createFolder();'>New Folder</a> | 
-					<a href="#" onclick='javascript:deleteFolder();'>Delete Folder</a> | 
-					<a href="#" onclick='javascript:runReport();'>Run</a> | 
-					<a href="#" onclick="treeObj.collapseAll()">Collapse</a> | 
-					<a href="#" onclick="treeObj.expandAll()">Expand</a> |
-					<a href="#" onclick="javascript:refreshTree()">Refresh Tree</a>
-				</td>
-				<td ></td>
-			</tr>
-			
-		</table>
-		</div>
-		<% } %>
-		
-
-	</td></tr>
-	<% if(isFolderAllowed) { %>
-	<div id="collapsedTree" style="position:absolute;top=122;display:block;width:550">
-		<img border="0" src="<%= AppUtils.getImgFolderURL() %>tree/grnarrowright.gif" onClick="javascript:displayTree()"  alt='Show Folder Tree' style='cursor:hand'> 
-	</div>
-	<% } %>
-	
-
-
-</form>
-
-
-<script type="text/javascript">	
-	
-	<% if(isFolderAllowed) { %>
-		document.body.scroll="no";
-	<% } %>
-	
-	//window.onscroll = floatMenu;
-	window.onresize = resizeWindow;
-	
-	function floatMenu()
-	{
-		var elem = document.getElementById("def");
-		var sy = document.body.scrollTop;
-		//elem.style.left = startX;
-		if (sy == null || sy == 0)
-			sy = 1;
-		elem.height = sy ;
-	}
-	
-
-	function fillFolderStructure(data){
-		document.getElementById("folderTree").childNodes[0].childNodes[0].childNodes[0].innerHTML=data;
-		initializeTree();
-		hideFolderInfo();
-
-	}
-	
-	function initializeTree(){
-		treeObj = new JSDragDropTree();
-		treeObj.setTreeId('reportFolderTree');
-		treeObj.setMaximumDepth(7);
-		treeObj.setMessageMaximumDepthReached('Maximum depth reached'); // If you want to show a message when maximum depth is reached, i.e. on drop.
-		treeObj.initTree(selectedFolderId);
-		treeObj.expandAll();
-		treeObj.collapseAll();
-		if (selectedFolderId && selectedFolderId != '0')
-			treeObj.showSelectedNode(selectedFolderId);
-
-	}
-	
-	if (doCollapse == 'N')
-		refreshTree();
-</script>
-					
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp
deleted file mode 100644
index 1521790d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/tree/testTree.jsp
+++ /dev/null
@@ -1,229 +0,0 @@
-<%@page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <jsp:include page="header.jsp" flush="true" />	
-<head>
-	<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-	<title>Folder tree with Drag and Drop capabilities</title>
-	<script>
-		var imgFolder = '<%=AppUtils.getImgFolderURL()%>';
-	</script>
-	<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/ajax.js"></script>
-	<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/context-menu.js"></script>
-	<script type="text/javascript" src="<%= AppUtils.getBaseFolderURL() %>js/tree/drag-drop-folder-tree.js">
-	
-	/************************************************************************************************************
-	(C) www.dhtmlgoodies.com, July 2006
-	
-	Update log:
-	
-	
-	This is a script from www.dhtmlgoodies.com. You will find this and a lot of other scripts at our website.	
-	
-	Terms of use:
-	You are free to use this script as long as the copyright message is kept intact.
-	
-	For more detailed license information, see http://www.dhtmlgoodies.com/index.html?page=termsOfUse 
-	
-	Thank you!
-	
-	www.dhtmlgoodies.com
-	Alf Magne Kalleland
-	
-	************************************************************************************************************/	
-	</script>
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/tree/drag-drop-folder-tree.css">
-	<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/tree/context-menu.css">
-		
-	<style type="text/css">
-	/* CSS for the demo */
-	img{
-		border:0px;
-	}
-	</style>
-	<script type="text/javascript">
-	//--------------------------------
-	// Save functions
-	//--------------------------------
-	var ajaxObjects = new Array();
-	
-	// Use something like this if you want to save data by Ajax.
-	function saveMyTree()
-	{
-			saveString = treeObj.getNodeOrders();
-			alert(saveString);
-			var ajaxIndex = ajaxObjects.length;
-			ajaxObjects[ajaxIndex] = new sack();
-			var url = 'tree';
-			//var url = 'tree';
-			ajaxObjects[ajaxIndex].requestFile = url;	// Specifying which file to get
-			ajaxObjects[ajaxIndex].onCompletion = function() { saveComplete(ajaxIndex); } ;	// Specify function that will be executed after file has been found
-			ajaxObjects[ajaxIndex].runAJAX(url);		// Execute AJAX function			
-		
-	}
-	function saveComplete(index)
-	{
-		alert(ajaxObjects[index].response);			
-	}
-
-	
-	// Call this function if you want to save it by a form.
-	function saveMyTree_byForm()
-	{
-		document.myForm.elements['saveString'].value = treeObj.getNodeOrders();
-		document.myForm.elements['task'].value = 'save';
-		document.myForm.submit();		
-	}
-	
-	function cancelMyTree_byForm(){
-		document.myForm.elements['task'].value = '';
-		document.myForm.submit();		
-	}
-	
-	function deleteMyTree_byForm()
-	{
-		document.myForm.elements['task'].value = 'delete';
-		document.myForm.submit();		
-	}
-	
-	function addMyTree_byForm()
-	{
-		document.myForm.elements['task'].value = 'new';
-		document.myForm.submit();		
-	}
-	
-	function runReport()
-	{
-		var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-		alert("123" + id);
-		//document.myForm.action='<%=AppUtils.getReportExecuteActionURL()%>'+JSTreeObj.selectedItem;
-		document.myForm.action='dispatcher?action=raptor&r_action=report.run&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';
-		 
-		document.myForm.submit();		
-	}
-	
-	function editReport()
-	{
-		var id = JSTreeObj.selectedItem.parentNode.id.replace(/[^0-9]/gi,'');
-		alert("123" + id);
-		document.myForm.action='dispatcher?action=raptor&r_action=report.edit&c_master=' + id + '&PAGE_ID=HOME&refresh=Y';			 
-		document.myForm.submit();		
-	}
-	
-	function expandTree(){
-		document.getElementById('expandedTree').style.display='block';
-		document.getElementById('expandedTreeHeader').style.display='block';
-		document.getElementById('collapsedTree').style.display='none';
-	}
-	function collapseTree(){
-		document.getElementById('expandedTree').style.display='none';
-		document.getElementById('expandedTreeHeader').style.display='none';
-		document.getElementById('collapsedTree').style.display='block';
-	}
-	</script>
-	
-</head>
-<body>
-	<form name="reportForm" method="post">
-	<table width="94%" border="0" cellspacing="1" align="center">
-	<tr><td>
-		<div id="collapsedTree" style="position:absoulte;top:0;width:100%;height:25px;display:none;">
-		<table width="94%" border="0" cellspacing="1" align="left">
-			<tr>
-				<td class=rtabletext align=left>
-					<img border="0" src="<%= AppUtils.getImgFolderURL() %>tree/dhtmlgoodies_plus.gif" onClick="javascript:expandTree()" alt='Show Folder Tree'>
-					Root Node
-				</td>
-			</tr>
-		</table>
-		</div>
-	</td></tr>
-	
-	
-	<tr><td>  
-		<div id="expandedTreeHeader" style="position:absoulte;top:0;width:100%;height:25px;display:block;">
-		<table width="94%" border="0" cellspacing="1" align="left">
-			<tr>
-				<td class=rtabletext >
-					<img border="0" src="<%= AppUtils.getImgFolderURL() %>tree/dhtmlgoodies_minus.gif" onClick="javascript:collapseTree()"  alt='Hide Folder Tree'>
-					&nbsp;&nbsp;&nbsp;
-					<!--<input type='button' class=rsmallbutton id='createFolder' value='Create Folder' onclick='javascript:JSTreeObj.addItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem);'/>
-					<input type='button' class=rsmallbutton id='createFolder' value='Run' onclick='javascript:JSTreeObj.addItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem);'/>
-					<input type='button' class=rsmallbutton id='createFolder' value='Edit' onclick='javascript:JSTreeObj.addItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem);'/>-->
-					<a href="#" onclick='javascript:JSTreeObj.addItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem);'>Create Folder</a> | 
-					<a href="#" onclick='javascript:JSTreeObj.deleteItem(JSTreeObj.selectedItem, JSTreeObj.selectedItem);'>Delete Fodler</a> | 
-					<a href="#" onclick='javascript:runReport();'>Run Report</a> | 
-					<a href="#" onclick='javascript:editReport();'>Edit Report</a>  					
-				</td>
-			</tr>
-		</table>
-		</div>
-	</td></tr>
-	<tr>
-		<td>
-			<div id="expandedTree" style="position:absoulte;top:0;width:100%;height:160px;display:block">
-			<table>
-				<tr>
-	
-				<td width="50%">
-					<div id="scrollableTable" class="scrollableTable" style="position:absoulte;top:0;width:100%;height:150px;display:block">
-						<table width="94%" border="0" cellspacing="1" align="center">
-							<tr>
-								<td >
-									<%=request.getAttribute("folderList")%>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</td>
-				<td width="50%" valign="bottom">
-					<table>
-						<tr><td width="100%" class=rtabletext >
-							<a href="#" onclick="treeObj.collapseAll()">Collapse all</a> | 
-							<a href="#" onclick="treeObj.expandAll()">Expand all</a>		
-						</td></tr>
-						<tr><td width="100%">
-							<input type="button" class=rsmallbutton onclick="saveMyTree_byForm()" value="Save">
-							<input type="button" class=rsmallbutton onclick="cancelMyTree_byForm()" value="Cancel">
-						</td></tr>			
-					</table>
-					
-				</td>
-				</tr>	
-				
-			</table>
-			</div>
-		</td>
-	</tr>
-	<tr><td colspan=2>
-	<div class="scrollableTable" style="width:100%;height:400px;">
-		<iframe id="reportFrame" name="reportFrame" width="100%" height="100%">
-			
-		</iframe>
-	</div>
-	</td></tr>
-	</table>
-	</Form>
-	<script type="text/javascript">	
-		treeObj = new JSDragDropTree();
-		treeObj.setTreeId('reportFolderTree');
-		treeObj.setMaximumDepth(7);
-		treeObj.setMessageMaximumDepthReached('Maximum depth reached'); // If you want to show a message when maximum depth is reached, i.e. on drop.
-		treeObj.initTree();
-		treeObj.expandAll();
-	
-	</script>
-	
-	<!-- Form - if you want to save it by form submission and not Ajax -->
-	<form name="myForm" action="tree" method="post">
-		<input type="hidden" name="saveString">
-		<input type="hidden" name="task">
-		<input type="hidden" name="newName">
-		<input type="hidden" name="deleteIds">
-	</form>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
deleted file mode 100644
index 4de78c9a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_adhoc_schedule.jsp
+++ /dev/null
@@ -1,733 +0,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.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_adhoc_schedule.jsp
- Use : This JSP is used for accepting user parameters for scheduling the report.
- 
- Change Log
- ==========
- 
- 28-Aug-2009 : Version 8.4 (Sundar);  initFormFields function is removed as it is handled in back end.
- 23-Jun-2009 : Version 8.4 (Sundar); 
- 				
- 				<UL> 
- 				<LI> Bug related to creating startDate variable (in Javascript) for the Validation purpose is fixed.</LI>
- 				</UL>
- 				         
-
---%>
-
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<% 
-  ReportSchedule reportSchedule = (ReportSchedule) request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-  ReportDefinition rdefRecurrance = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-  session.setAttribute("login_id", AppUtils.getUserBackdoorLoginId(request));
-  if(reportSchedule==null) reportSchedule = (ReportSchedule) request.getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-  String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-  boolean isSQLAllowed = Globals.getAllowSQLBasedReports();
-%>
-<%@page import="java.util.Calendar"%>
-<%@page import="java.text.DateFormat"%>
-<%@page import="java.text.SimpleDateFormat"%>
-<%@page import="java.util.TimeZone"%>
-<%@page import="java.util.Date"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportLoader"%>
-<script language="JavaScript">
-<!--
-function showTestConditionPopup() {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.test.cond&remoteDbPrefix=<%=remoteDbPrefix%>&<%= AppConstants.RI_FORMATTED_SQL %>="+escape(""+document.forma.conditionSQL.value), "testCondSQLPopup", "width=450,height=180,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestConditionPopup
-	
-function exclusiveCheckBox(which) {
-	  var size = 2;
-	  for (i=0; i<size; i++) {
-	    if(document.getElementById("notify" + i) != which) {
-	    	document.getElementById("notify" + i).checked = false;
-	    } 
-	  }
-	  //alert("exclusive " + which.form.notify_type.value);
-}	
-//-->
-</script>
-<script language="javascript" src="<%= AppUtils.getBaseFolderURL() %>js/other_scripts.js"></script>
-<%-- TODO : need a calendar popup functionality --%>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/rounded-corners.js"></script>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/form-field-tooltip.js"></script>
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
-
-	<script type="text/javascript">
-var stat;
-var delay=0;//delay in milliseconds
-function show(){
-
-
-var oIfr = document.getElementById('calendarFrame');
-var oCal = document.getElementById('calendarDiv');
-oIfr.style.display=(oCal.style.display=='block')?'none':'block';
-oIfr.style.top=findPosY()
-oIfr.style.left=findPosX()-5
-
-}
-function hide(){
-
-// added to show Iframe behind calender
-var oIfr = document.getElementById('calendarFrame');
-var oCal = document.getElementById('calendarDiv');
-oIfr.style.display=(oCal.style.display=='none')?'block':'none';
-}
-
-  function findPosX()
-  {
- var obj= oCalendar
-    var curleft = 0;
-    if(obj.offsetParent)
-        while(1) 
-        {
-          curleft += obj.offsetLeft;
-          if(!obj.offsetParent)
-            break;
-          obj = obj.offsetParent;
-        }
-    else if(obj.x)
-        curleft += obj.x;
-    return curleft;
-    
-  }
-
-  function findPosY()
-  {
-  
-   var obj= oCalendar
-    var curtop = 0;
-    if(obj.offsetParent)
-        while(1)
-        {
-          curtop += obj.offsetTop;
-          if(!obj.offsetParent)
-            break;
-          obj = obj.offsetParent;
-        }
-    else if(obj.y)
-        curtop += obj.y;
-        //alert(curtop)
-    return curtop;   
-  }
-  
-  //frameborder="0" 
-	</SCRIPT>
-
-<iframe id="calendarFrame" class="nav" z-index:199; scrolling="no"  frameborder="0"  width=165px height=165px src="" style="position:absolute; display:none;">
-</iframe>
-
- <div id="calendarDiv" name="calendarDiv" style="position:absolute; z-index:200; visibility:none; background-color:white;layer-background-color:white;"></div>
- <%
- Calendar startCalendarDate = Calendar.getInstance();
- startCalendarDate.add(Calendar.DAY_OF_MONTH, - 540); 
- Calendar endCalendarDate = Calendar.getInstance();
- endCalendarDate.add(Calendar.DAY_OF_MONTH, 540);
- SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy");
- SimpleDateFormat oracleDateFormat = new SimpleDateFormat("MM/dd/yyyy kk:mm:ss");
- Date sysdate = oracleDateFormat.parse(ReportLoader.getSystemDateTime());
- SimpleDateFormat dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemCalendar = Calendar.getInstance();
- systemCalendar.setTime(sysdate);
- Date sysNext15date = oracleDateFormat.parse(ReportLoader.getNext15MinutesOfSystemDateTime());
- //dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemNext15Calendar = Calendar.getInstance();
- systemNext15Calendar.setTime(sysNext15date);
- Date sysNext30date = oracleDateFormat.parse(ReportLoader.getNext30MinutesOfSystemDateTime());
- //dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- Calendar systemNext30Calendar = Calendar.getInstance();
- systemNext30Calendar.setTime(sysNext30date);
-
- System.out.println(" systemNext15Calendar " + systemNext15Calendar);
- System.out.println(" systemNext30Calendar " + systemNext30Calendar);
-
- //dtimestamp.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone()));
- 
-%>
-
- 
-	 
-
-	<SCRIPT LANGUAGE="JavaScript">
- 	var oCalendar = new CalendarPopup("calendarDiv", "calendarFrame");
-    	
-    	oCalendar.addDisabledDates(null, "<%=dtf.format(startCalendarDate.getTime())%>");
-		oCalendar.addDisabledDates("<%=dtf.format(endCalendarDate.getTime())%>", null);
-
-
-    	oCalendar.setCssPrefix("raptor");
-
-    	function fillStartEndDate(varSelect) {
-        	var flag = 0;
-        	<% if(!(nvl(reportSchedule.getStartDate()).length() > 0)) { %>
-        	a:
-			 for (var i = 0; i < varSelect.options.length; i++) {
-				 	if (varSelect.options[ i ].selected) {
-			 		    if(!(varSelect.options[i].value.length > 0)) {
-				 		    var d = new Date();
-				 		    //alert(d.getMonth() + " " + d.getDate() + " " + d.getYear());
-				 		    //alert(d.getMonth()+1+"/"+d.getDate()+"/"+d.getYear());
-			 		    	document.forma.schedStartDate.value = addZero(d.getMonth()+1)+"/"+addZero(d.getDate())+"/"+addZero(d.getYear());
-			 		    	document.forma.schedEndDate.value = addZero(d.getMonth()+1)+"/"+addZero(d.getDate())+"/"+addZero(d.getYear());
-			 		    	//alert(document.forma.schedStartDate.value);
-			 		    	flag = 1;
-			 		    	break a;
-			 		    } 
-				 	}
-			 } 
-			 if(flag == 0) {
-				//alert("Here");
-				document.forma.schedStartDate.value = "";
-				document.forma.schedEndDate.value = "";
-			 }
-			 <% } %>
-    	}
-
-    	function initStartEndDate() { 
-        	var flag = 0;
-        	var varSelect = document.forma.schedRecurrence;
-        	var d = new Date();
-        	var d_end = null;
-            	d.setFullYear(<%=systemCalendar.get(Calendar.YEAR)%>, <%=systemCalendar.get(Calendar.MONTH)%>,<%=systemCalendar.get(Calendar.DAY_OF_MONTH)%>);
-            	d.setHours(<%=systemCalendar.get(Calendar.HOUR_OF_DAY)%>);
-            	d.setMinutes(<%=systemCalendar.get(Calendar.MINUTE)%>);
-            	d.setSeconds(<%=systemCalendar.get(Calendar.SECOND)%>);
-       		d_end = new Date();
-            	d_end.setFullYear(<%=systemNext15Calendar.get(Calendar.YEAR)%>, <%=systemNext15Calendar.get(Calendar.MONTH)%>,<%=systemNext15Calendar.get(Calendar.DAY_OF_MONTH)%>);
-            	d_end.setHours(<%=23%>);
-            	d_end.setMinutes(<%=45%>);
-            	d_end.setSeconds(<%=systemNext15Calendar.get(Calendar.SECOND)%>);
-
-        	if(d.getHours() == 23 && d.getMinutes()>=30) {
-            	d_end.setFullYear(<%=systemNext30Calendar.get(Calendar.YEAR)%>, <%=systemNext30Calendar.get(Calendar.MONTH)%>,<%=systemNext30Calendar.get(Calendar.DAY_OF_MONTH)%>);
-            	d_end.setHours(<%=23%>);
-            	d_end.setMinutes(<%=45%>);
-            	d_end.setSeconds(<%=systemNext30Calendar.get(Calendar.SECOND)%>);
- 		    	document.forma.schedEndDate.value = addZero(d_end.getMonth()+1)+"/"+addZero(d_end.getDate())+"/"+addZero(d_end.getYear());
- 		    	var obj = document.forma.schedEndHour;
- 		    	var hr = d_end.getHours();
-				//alert("end hr " + hr);
- 		    	//if(d_end.getMinutes()>=45) 
-	 		    //	hr = hr + 1;
- 		    	if(hr > 12) hr = hr - 12; 
- 		    	if(hr == 0) hr = 12;
- 		   		for (var i=0; i<obj.options.length; i++) {
- 					if (eval(obj.options[i].value) == hr) {
- 						obj.options[i].selected = true;
- 						break;
- 					} 
- 				}
- 				var obj1 = document.forma.schedEndMin;
- 		   		for (var i=0; i<obj1.options.length; i++) {
- 					if (d_end.getMinutes() <= eval(obj1.options[i].value)) {
- 						obj1.options[i].selected = true;
- 						break;
- 					} 
- 				}
- 				var obj2 = document.forma.schedEndAMPM;
- 				
- 		   		for (var i=0; i<obj2.options.length; i++) {
- 					if (d_end.getHours() < 12 && obj2.options[i].value == 'AM') {
- 						obj2.options[i].selected = true;
- 					} else if (d_end.getHours() >= 12 && obj2.options[i].value == 'PM')
- 						obj2.options[i].selected = true;
- 				}
- 		    	
-        	}
-            	
-            	
-		      <% if(!(nvl(reportSchedule.getStartDate()).length() > 0)) { %>
-	        	
-				 		    //alert(d.getMonth() + " " + d.getDate() + " " + d.getYear());
-				 		    //alert(d.getMonth()+1+"/"+d.getDate()+"/"+d.getYear());
-							//alert(d.getHours());
-				 		    <%-- System.out.println(reportSchedule.getStartDate());
-				 		       if(!(nvl(reportSchedule.getStartDate()).length() > 0)) { --%>
-							    if(d.getHours() == 23 && d.getMinutes() > 45) {
-									//d.setDate(d.getDate() + 1);
-					 		    	document.forma.schedStartDate.value = addZero(d.getMonth()+1)+"/"+addZero(d.getDate()+1)+"/"+addZero(d.getYear());
-								}
-								else
-				 		    	document.forma.schedStartDate.value = addZero(d.getMonth()+1)+"/"+addZero(d.getDate())+"/"+addZero(d.getYear());
-				 		    	//document.forma.schedEndDate.value = addZero(d.getMonth()+1)+"/"+addZero(d.getDate())+"/"+addZero(d.getYear());
-				 		    	document.forma.schedEndDate.value = addZero(d_end.getMonth()+1)+"/"+addZero(d_end.getDate())+"/"+addZero(d_end.getYear());
-
-				 		    	var obj = document.forma.schedHour;
-				 		    	var hr = d.getHours();
-				 		    	if(d.getMinutes()>=45) 
-					 		    	hr = hr + 1;
-				 		    	if(hr > 12) hr = hr - 12; 
-				 		    	if(hr == 0) hr = 12;
-				 		   		for (var i=0; i<obj.options.length; i++) {
-				 					if (eval(obj.options[i].value) == hr) {
-				 						obj.options[i].selected = true;
-				 						break;
-				 					} 
-				 				}
-				 				var obj1 = document.forma.schedMin;
-				 		   		for (var i=0; i<obj1.options.length; i++) {
-				 					if (d.getMinutes() <= eval(obj1.options[i].value)) {
-				 						obj1.options[i].selected = true;
-				 						break;
-				 					} 
-				 				}
-				 				var obj2 = document.forma.schedAMPM;
-				 				
-				 		   		for (var i=0; i<obj2.options.length; i++) {
-								 //alert(d.getHours() + " " + d.getMinutes());
-								if(d.getHours() == 23 && d.getMinutes() >= 45) { 
-								    if(obj2.options[i].value == 'AM') {
-										//alert("hello");
-										obj2.options[i].selected = true;
-									}
-								} else {
-								   //alert("hello2");
-				 					if ((d.getHours() < 12) && obj2.options[i].value == 'AM') {
-				 						obj2.options[i].selected = true;
-				 					} else if ((d.getHours() >= 12)  && obj2.options[i].value == 'PM') {
-				 						obj2.options[i].selected = true;
-				 				}
-				 				}
-				 			}
-				 				
-				 		
-				 		    	
-			 <% }  %>
-    	}     	
- 	
-        function addZero(num) {
-        	var numInt = 0;
-        	numInt = num;
-        	if(numInt < 10) {
-            	return "0"+numInt;
-        	}
-        	else return ""+numInt;
-        }	     	
-	</SCRIPT>
-<table width="100%" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr class="rbg1">
-		<td class=rbg1 colspan="2" align="left">
-	      	<%if(nvl(Globals.getScheduleHelpMessage()).trim().length()>0) {	%>
-			<a href="javascript:uitmpl_qh('sch_help_text'); if(typeof window.parent.resizeWindow == 'function') window.parent.resizeWindow();" class="qh-link" style="position:fixed;"></a>
-		<% } %>
-	      	<b class=rtableheader>Please enter Time in <%= Globals.getTimeZone()%>. The Current System Time is <%=dtimestamp.format(sysdate)%>&nbsp;<%=Globals.getTimeZone()%></b>
-	      </td>
-	      
-	</tr>	
-	
-	<%if(nvl(Globals.getScheduleHelpMessage()).length()>0) {	%>
-	   <tr>
-	   	<td colspan="2" class="nopad"><!-- quick help text -->
-	   	<div id="sch_help_text" class="mQH">
-	   		<p><span class="label">Report Desc:</span>
-	   		<%= Globals.getScheduleHelpMessage() %></p>
-	   	</div>
-	   	<!-- /quick help text --></td>	   	
-	   </tr>
-	<% } %>	
-	
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Schedule Emails: </font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap><font class=rtabletext>
-			<input type='radio' name='schedEnabled' id='schedEnabled' value='Y' <%= reportSchedule.getSchedEnabled().equals("Y")?" checked":"" %> toolTipText="This is used for the enabling or disabling the scheduling feature for this report."/>Yes
-			&nbsp;
-			<input type='radio' name='schedEnabled' id='schedEnabled' value='N' <%= reportSchedule.getSchedEnabled().equals("N")?" checked":"" %> toolTipText="This is used for the enabling or disabling the scheduling feature for this report."/>No
-			</font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Email Attachment:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap>
-			<font class=rtabletext>
-			<%if(!rdefRecurrance.getReportType().equals(AppConstants.RT_HIVE)) {%>
-			<input type='radio' name='notify' id='notify' value='2' <%= reportSchedule.getNotify_type().equals("2")?" checked":(reportSchedule.getNotify_type().length()<=0)?" checked":(!reportSchedule.getNotify_type().equals("4"))? " checked " :"" %> toolTipText="Provides the capability to attach reports as PDF format to the email."/>PDF Attachment
-			&nbsp;&nbsp;
-			<input type='radio' name='notify' id='notify' value='4' <%= reportSchedule.getNotify_type().equals("4")?" checked":"" %> toolTipText="Provides the capability to attach reports as Excel format to the email."/>Excel Attachment
-			&nbsp;&nbsp;
-			<% } %>
-			<input type='radio' name='notify' id='notify' value='5' <%= reportSchedule.getNotify_type().equals("5")?" checked":"" %> toolTipText="Provides the capability to attach reports as Excel format to the email."/>Excelx Attachment
-			&nbsp;&nbsp;
-			<input type='radio' name='notify' id='notify' value='3' <%= reportSchedule.getNotify_type().equals("3")?" checked":"" %> toolTipText="Provides the capability to attach reports as CSV format to the email."/>CSV Attachment
-			<%if(!rdefRecurrance.getReportType().equals(AppConstants.RT_HIVE)) {%>
-  	         <% if(nvl(Globals.getShellScriptDir()).length()>1) { %>
-  	        	 <input type='radio' name='notify' id='notify' value='6' <%= reportSchedule.getNotify_type().equals("6")?" checked":"" %> toolTipText="Provides the capability to send only links to the generated report in the email."/>Link to Generated report
-  	         <% }  %>	 
-			 <% } %>
-			<input type='hidden' name='notify_type' value='1'/>
-			</font>
-	    </td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Recurrence: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="schedRecurrence" toolTipText="This is used to select recurrence frequency.">
-				<%if (rdefRecurrance.getIsOneTimeScheduleAllowed() == null || rdefRecurrance.getIsOneTimeScheduleAllowed().equals("Y")){ %><option value=""                                  <%= reportSchedule.getRecurrence().equals(""                         )?" selected":"" %>>One Time<%} %>
-				<%if (rdefRecurrance.getIsHourlyScheduleAllowed() == null || rdefRecurrance.getIsHourlyScheduleAllowed().equals("Y")){ %><option value="<%= AppConstants.SR_HOURLY      %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_HOURLY     )?" selected":"" %>>Hourly<%} %>
-				<%if (rdefRecurrance.getIsDailyScheduleAllowed() == null || rdefRecurrance.getIsDailyScheduleAllowed().equals("Y")){ %><option value="<%= AppConstants.SR_DAILY       %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_DAILY      )?" selected":"" %>>Daily<%} %>
-				<%if (rdefRecurrance.getIsDailyMFScheduleAllowed() == null || rdefRecurrance.getIsDailyMFScheduleAllowed().equals("Y")){ %><option value="<%= AppConstants.SR_DAILY_MO_FR %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_DAILY_MO_FR)?" selected":"" %>>Daily Mo-Fr<%} %>
-				<%if (rdefRecurrance.getIsWeeklyScheduleAllowed() == null || rdefRecurrance.getIsWeeklyScheduleAllowed().equals("Y")){ %><option value="<%= AppConstants.SR_WEEKLY      %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_WEEKLY     )?" selected":"" %>>Weekly<%} %>
-				<%if (rdefRecurrance.getIsMonthlyScheduleAllowed() == null || rdefRecurrance.getIsMonthlyScheduleAllowed().equals("Y")){ %><option value="<%= AppConstants.SR_MONTHLY     %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_MONTHLY    )?" selected":"" %>>Monthly<%} %>
-			</select></font>
-	  </td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>First Schedule Date: </font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<input type="text" size="10" maxlength="10" name="schedStartDate" value="<%= reportSchedule.getStartDate() %>" toolTipText="Enter the date and time scheduling is to start.">
-			<!--<a href="#" onClick="window.dateField = document.forma.schedStartDate;calendar = window.open('<%= AppUtils.getRaptorActionURL() %>popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;">
-				<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20">
-			</a>-->
-			<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar = new CalendarPopup('calendarDiv', 'calendarFrame');oCalendar.addDisabledDates(null, '<%=dtf.format(startCalendarDate.getTime())%>');oCalendar.addDisabledDates('<%=dtf.format(endCalendarDate.getTime())%>', null);oCalendar.setCssPrefix('raptor');oCalendar.select(document.getElementById('schedStartDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<select name="schedHour">
-				<option value="01"<%= reportSchedule.getRunHour().equals("01")?" selected":"" %>>1
-				<option value="02"<%= reportSchedule.getRunHour().equals("02")?" selected":"" %>>2
-				<option value="03"<%= reportSchedule.getRunHour().equals("03")?" selected":"" %>>3
-				<option value="04"<%= reportSchedule.getRunHour().equals("04")?" selected":"" %>>4
-				<option value="05"<%= reportSchedule.getRunHour().equals("05")?" selected":"" %>>5
-				<option value="06"<%= reportSchedule.getRunHour().equals("06")?" selected":"" %>>6
-				<option value="07"<%= reportSchedule.getRunHour().equals("07")?" selected":"" %>>7
-				<option value="08"<%= reportSchedule.getRunHour().equals("08")?" selected":"" %>>8
-				<option value="09"<%= reportSchedule.getRunHour().equals("09")?" selected":"" %>>9
-				<option value="10"<%= reportSchedule.getRunHour().equals("10")?" selected":"" %>>10
-				<option value="11"<%= reportSchedule.getRunHour().equals("11")?" selected":"" %>>11
-				<option value="12"<%= reportSchedule.getRunHour().equals("12")?" selected":"" %>>12
-			</select>
-			<select name="schedMin">
-				<option value="00"<%= reportSchedule.getRunMin().equals("00")?" selected":"" %>>00
-				<option value="15"<%= reportSchedule.getRunMin().equals("15")?" selected":"" %>>15
-				<option value="30"<%= reportSchedule.getRunMin().equals("30")?" selected":"" %>>30
-				<option value="45"<%= reportSchedule.getRunMin().equals("45")?" selected":"" %>>45
-			</select>
-			<select name="schedAMPM">
-				<option value="AM"<%= reportSchedule.getRunAMPM().equals("AM")?" selected":"" %>>AM
-				<option value="PM"<%= reportSchedule.getRunAMPM().equals("PM")?" selected":"" %>>PM
-			</select>
-            <%= Globals.getTimeZone()%>
-
-			</font>
-		</td>
-	</tr>
-<!-- /quick help text -->             			
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Last Schedule Date: </font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<input type="text" size="10" maxlength="10" name="schedEndDate" value="<%= reportSchedule.getEndDate() %>" toolTipText="Enter the date scheduling is to end. This is mandatory for recurring reports.">
-			<!--<a href="#" onClick="window.dateField = document.forma.schedEndDate;calendar = window.open('<%= AppUtils.getRaptorActionURL() %>popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;">
-				<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20">
-			</a>-->
-			<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar = new CalendarPopup('calendarDiv', 'calendarFrame');oCalendar.addDisabledDates(null, '<%=dtf.format(startCalendarDate.getTime())%>');oCalendar.addDisabledDates('<%=dtf.format(endCalendarDate.getTime())%>', null);oCalendar.setCssPrefix('raptor');oCalendar.select(document.getElementById('schedEndDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<select name="schedEndHour">
-				<option value="01"<%= reportSchedule.getEndHour().equals("01")?" selected":"" %>>1
-				<option value="02"<%= reportSchedule.getEndHour().equals("02")?" selected":"" %>>2
-				<option value="03"<%= reportSchedule.getEndHour().equals("03")?" selected":"" %>>3
-				<option value="04"<%= reportSchedule.getEndHour().equals("04")?" selected":"" %>>4
-				<option value="05"<%= reportSchedule.getEndHour().equals("05")?" selected":"" %>>5
-				<option value="06"<%= reportSchedule.getEndHour().equals("06")?" selected":"" %>>6
-				<option value="07"<%= reportSchedule.getEndHour().equals("07")?" selected":"" %>>7
-				<option value="08"<%= reportSchedule.getEndHour().equals("08")?" selected":"" %>>8
-				<option value="09"<%= reportSchedule.getEndHour().equals("09")?" selected":"" %>>9
-				<option value="10"<%= reportSchedule.getEndHour().equals("10")?" selected":"" %>>10
-				<option value="11"<%= reportSchedule.getEndHour().equals("11")?" selected":"" %>>11
-				<option value="12"<%= reportSchedule.getEndHour().equals("12")?" selected":"" %>>12
-			</select>
-			<select name="schedEndMin">
-				<option value="00"<%= reportSchedule.getEndMin().equals("00")?" selected":"" %>>00
-				<option value="15"<%= reportSchedule.getEndMin().equals("15")?" selected":"" %>>15
-				<option value="30"<%= reportSchedule.getEndMin().equals("30")?" selected":"" %>>30
-				<option value="45"<%= reportSchedule.getEndMin().equals("45")?" selected":"" %>>45
-			</select>
-			<select name="schedEndAMPM">
-				<option value="AM"<%= reportSchedule.getEndAMPM().equals("AM")?" selected":"" %>>AM
-				<option value="PM"<%= reportSchedule.getEndAMPM().equals("PM")?" selected":"" %>>PM
-			</select>
-            <%= Globals.getTimeZone()%>
-
-			</font>
-		</td>
-	</tr>
-
-	<script type="text/javascript">initStartEndDate();</script>	
-
-	<% if(AppUtils.isAdminUser(request) || isSQLAllowed ) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Use Condition:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap><font class=rtabletext>
-			<input type="checkbox" name="conditional" value="Y"<%= reportSchedule.getConditional().equals("Y")?" checked":"" %>> Send Emails Only When Condition Is Met
-			</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Condition SQL:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap>
-			<textarea name="conditionSQL" cols="40" rows="3"><%= nvl(reportSchedule.getConditionSQL()) %></textarea>
-			<input type="Button" class=button value="Test" onClick="showTestConditionPopup()">
-			&nbsp;
-			</font></td>
-	</tr> 
-	<% } %>	
-
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Max rows in attachment:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap>
-			<input type='text' name='downloadLimit' value="<%=Integer.parseInt(reportSchedule.getDownloadLimit())>0?reportSchedule.getDownloadLimit(): Integer.toString(rdefRecurrance.getMaxRowsInExcelDownload())%>" size='4' toolTipText="Specify the maximum number of rows that can be sent in an attachment."/>
-			</font>
-		</td>
-	</tr>
-	<tr class="rbg1">
-		<td class=rbg1 colspan="2" align="left">
-		<b class=rtableheader>Form Fields</b>
-		</td>
-		      
-	</tr>
-	<jsp:include page="wizard_schedule_formfield_include.jsp" flush="true" />
-	<tr>
-		<td colspan=4><hr></hr></td>
-	</tr>
-	<input type="hidden" name="toListUpdated" value="false" />
-	
-<% 	List emailToUsers = reportSchedule.getEmailToUsers();
-	for(int i=0; i<emailToUsers.size(); i++) { 
-		IdNameValue userValue = (IdNameValue) emailToUsers.get(i); %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (i==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<%= userValue.getName() %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>'; document.all.toListUpdated.value='true'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= userValue.getId() %>'; }">
-			</font></td>
-	</tr>
-<%	}	// for 
-	List emailToRoles = reportSchedule.getEmailToRoles();
-	for(int i=0; i<emailToRoles.size(); i++) { 
-		IdNameValue roleValue = (IdNameValue) emailToRoles.get(i); %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (emailToUsers.size()==0&&i==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>Everyone With Role:&nbsp;
-			<%= roleValue.getName() %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_ROLE %>'; document.all.toListUpdated.value='true'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= roleValue.getId() %>'; }">
-			</font></td>
-	</tr>
-<%	}	// for 
-	
-	Vector remainingUsers = Utils.getUsersNotInList(emailToUsers,request);
-	Vector remainingRoles = Utils.getRolesNotInList(emailToRoles,request);
-	if((emailToUsers.size()+emailToRoles.size()==0)||(remainingUsers.size()>0)||(remainingRoles.size()>0)) { %>
-	<tr>
-	  <td colspan="2" align="center">
-		<table width="100%" cellspacing="1" cellpadding="3" align="center" border="0"> <tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (emailToUsers.size()+emailToRoles.size()==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-<%		if(remainingUsers.size()>0) { %>
-			<select name="schedEmailAdd" onChange="if(! dataValidate()) {selectedIndex=0;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_USER %>'; document.all.toListUpdated.value='true'; document.forma.submit();}" toolTipText="Select users and/or roles the report should be sent to">
-			    <option value="" selected>--- Select User ---
-<% 			for(int i=0; i<remainingUsers.size(); i++) {
-				IdNameValue userValue = (IdNameValue) remainingUsers.get(i); %>
-			    <option value="<%= userValue.getId() %>"><%= userValue.getName() %>
-<% 			}	// for %>
-			</select>
-<%		} else { %>
-			No user emails available
-<%		} %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<%		if(remainingRoles.size()>0) { %>
-			<select name="schedEmailAddRole" onChange="if(! dataValidate()) {selectedIndex=0;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_ROLE %>'; document.all.toListUpdated.value='true'; document.forma.submit();}" toolTipText="Select users and/or roles the report should be sent to">
-			    <option value="" selected>--- Select Role ---
-<% 			for(int i=0; i<remainingRoles.size(); i++) {
-				IdNameValue roleValue = (IdNameValue) remainingRoles.get(i); %>
-			    <option value="<%= roleValue.getId() %>"><%= roleValue.getName() %>
-<% 			}	// for %>
-			</select>
-<%		} else { %>
-			No roles available
-<%		} %>
-			</font>
-	  </td>
-	  <% if ( nvl(Globals.getEncryptedSMTPServer(),"").length() > 0 ) { %>
-	  <td align="right" width="27%"><font class=rtabletext>Encrypt Attachment</font>
-			<input type='radio' name='encryptMode' id='encryptMode' value='Y' <%= reportSchedule.getEncryptMode().equals("Y")?"":" checked" %> toolTipText="Choose the encryption mode."/>Yes
-			&nbsp;&nbsp;
-			<input type='radio' name='encryptMode' id='encryptMode' value='N' <%= reportSchedule.getEncryptMode().equals("N")?"":(reportSchedule.getEncryptMode().length()<=0)?" checked":(!reportSchedule.getEncryptMode().equals("N"))? " " :" checked " %> toolTipText="Choose the encryption mode."/>No
-	  </td>
-	  <% } %>
-	  <% if (Globals.generateSchedReportsInFileSystem()) { %>
-	  <td align="right" width="27%"><font class=rtabletext>Send as Attachment</font>
-			<input type='radio' name='sendAttachment' id='sendAttachment' value='Y' <%= reportSchedule.isAttachmentMode()?" checked ":""%> toolTipText="Send As Attachment"/>Yes
-			&nbsp;&nbsp;
-			<input type='radio' name='sendAttachment' id='sendAttachment' value='N' <%= !reportSchedule.isAttachmentMode()?" checked":"" %> toolTipText="Store it in file system."/>No
-	  </td>
-	  <% } %>
-	   </tr>
-		</table>
-		</td>	  
-	</tr>
-<%	}	// if 
-%>
-</table>
-
-
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	//alert("dataValidate called");
-	var startDate = new Date(document.forma.schedStartDate.value);
-	var startHour = eval(document.forma.schedHour.value);
-	if(document.forma.schedAMPM.value == 'PM') {
-		if (startHour != 12) startHour = startHour + 12; 
-	} else {
-		if (startHour == 12) startHour = startHour - 12;
-	}
-	startDate.setHours(startHour);
-	startDate.setMinutes(eval(document.forma.schedMin.value));
-
-	var endDate = new Date(document.forma.schedEndDate.value);
-	var endHour = eval(document.forma.schedEndHour.value);
-	if(document.forma.schedEndAMPM.value == 'PM') {
-		if (endHour != 12) endHour = endHour + 12; 
-	} else {
-		if (endHour == 12) endHour = endHour - 12;
-	}
-	endDate.setHours(endHour);
-	endDate.setMinutes(eval(document.forma.schedEndMin.value));
-	
-    //alert ("System Calendar " + "<%=systemCalendar.get(Calendar.YEAR)+ " " + (systemCalendar.get(Calendar.MONTH)+1)+ " " +  systemCalendar.get(Calendar.DAY_OF_MONTH) + " " +  systemCalendar.get(Calendar.HOUR_OF_DAY) + " " + systemCalendar.get(Calendar.MINUTE) + " " + systemCalendar.get(Calendar.SECOND)%>");
-	var currDate = new Date();
-	var curr1Date = new Date();
-	currDate.setFullYear(<%=systemCalendar.get(Calendar.YEAR)%>, <%=systemCalendar.get(Calendar.MONTH)%>,<%=systemCalendar.get(Calendar.DAY_OF_MONTH)%>);
-	currDate.setHours(<%=systemCalendar.get(Calendar.HOUR_OF_DAY)%>);
-	currDate.setMinutes(<%=systemCalendar.get(Calendar.MINUTE)%>);
-	currDate.setSeconds(<%=systemCalendar.get(Calendar.SECOND)%>);
-
-	//alert(startDate+ " " + currDate + " " + (startDate-currDate) + " " + (startDate.toString()==currDate.toString()));
- 	
-
-	if(! checkDate(document.forma.schedStartDate.value, false)) {
-		alert("Invalid Start Date. The date format should be MM/DD/YYYY");
-		document.forma.schedStartDate.focus();
-		document.forma.schedStartDate.select();
-		return false;
-	}
-	if(! checkDate(document.forma.schedEndDate.value, false)) {
-		alert("Invalid End Date. The date format should be MM/DD/YYYY");
-		document.forma.schedEndDate.focus();
-		document.forma.schedEndDate.select();
-		return false;
-	}
-	if (startDate >= endDate){
-			alert("Start Date has to be less than the End Date.");
-		return false;
-	}
-
-	if (startDate - currDate < 0){
-		if(startDate.toString()!=currDate.toString()) {
-			var m_names = new Array("January", "February", "March", 
-					"April", "May", "June", "July", "August", "September", 
-					"October", "November", "December");
-            var curr_min = currDate.getMinutes();
-			curr_min = curr_min + "";
-			if (curr_min.length == 1) {
-				curr_min = "0" + curr_min;
-			}  
-			alert("Start Date/Time has to be greater or equal to the System Date/Time ("+m_names[currDate.getMonth()]+" "+ currDate.getDate() + ", " + currDate.getYear() + " " + currDate.getHours()+ ":" + curr_min+ ").");
-			return false;
-		}
-	}
-	/*if(! checkDate(document.forma.schedRunDate.value, true)) {
-		alert("Invalid Execution Date. The date format should be MM/DD/YYYY");
-		document.forma.schedRunDate.focus();
-		document.forma.schedRunDate.select();
-		return false;
-	}*/
-<% if (AppUtils.isAdminUser(request) || isSQLAllowed){ %>
-	if(document.forma.conditional.checked&&document.forma.conditionSQL.value=="") {
-		alert("Please provide Condition SQL");
-		document.forma.conditionSQL.focus();
-		document.forma.conditionSQL.select();
-		return false;
-	}
-<% } %>	
-	if(! checkNonNegativeInteger(document.forma.downloadLimit.value)) {
-		alert("Max row in attachment is not a valid integer.\nPlease enter a valid value.");
-		document.forma.downloadLimit.focus();
-		document.forma.downloadLimit.select();
-		return false;
-	}
-	else 
-	{
-		if((document.forma.downloadLimit.value) > <%=Globals.getDownloadLimit()%>) {
-			alert("Max row you can download should not be more than <%=Globals.getDownloadLimit()%> rows.\nPlease enter a valid value.");
-			document.forma.downloadLimit.focus();
-			document.forma.downloadLimit.select();
-			return false;			
-		}
-		
-	}
-	for (var i=0; i < document.forma.notify.length; i++) {
-   		if (document.forma.notify[i].checked) {
-      		  document.forma.notify_type.value = document.forma.notify[i].value;
-       	        }
-	 } 
-	return validateForm();
-	
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<script type="text/javascript">
-var tooltipObj = new DHTMLgoodies_formTooltip();
-tooltipObj.setTooltipPosition('right');
-tooltipObj.setPageBgColor('#EEEEEE');
-//tooltipObj.setPageBgColor('#FFFFFF');
-tooltipObj.setTooltipCornerSize(15);
-tooltipObj.setTooltipBgColor("#99CCFF");
-tooltipObj.initFormFieldTooltip();
-</script>
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_add_multi.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_add_multi.jsp
deleted file mode 100644
index ab67b802..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_add_multi.jsp
+++ /dev/null
@@ -1,96 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page errorPage="error_page.jsp" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-%>  
-<table class="mTAB" width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=3 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="79%"><b class=rtableheader>Column</b></td>
-		<td align="center" valign="Middle" width="14%">
-			<b class=rtableheader>Add To Report?</b>
-			<br>
-			<input type=checkbox name="selectAll" value="Y" onClick="setAllChk(this.checked);">
-			</td>
-	</tr>
-<%  int icnt = 0;
-	String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-	for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-		DataSourceType dst = (DataSourceType) iter.next();
-		
-		Vector dbColumns = DataCache.getReportTableDbColumns(dst.getTableName().toUpperCase(),remoteDbPrefix);
-		if(dbColumns!=null)
-			for(int i=0; i<dbColumns.size(); i++) {
-				DBColumnInfo dbCol = (DBColumnInfo) dbColumns.get(i);
-				icnt++; %>
-	<tr<%= (icnt%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" height="30"><font class=rtabletext><%= icnt %></font></td>
-		<td><font class=rtabletext>[<%= dst.getDisplayName() %>].<%= dbCol.getLabel() %></font></td>
-		<td align="center" valign="middle">
-			<input type="checkbox" name="dataChk" onClick="document.forma.addColumn[<%= icnt-1 %>].value=(this.checked?'Y':'');">
-			<input type="hidden" name="addColumn" value="">
-			<input type="hidden" name="tableId" value="<%= dst.getTableId() %>">
-			<input type="hidden" name="columnName" value="<%= dbCol.getColName() %>">
-			<input type="hidden" name="columnType" value="<%= dbCol.getColType() %>">
-			<input type="hidden" name="displayName" value="<%= dbCol.getLabel() %>">
-		</td>
-	</tr>
-<% 			}   // for i 
-	}   // for 
-%>
-</table>
-			<input type="hidden" name="dataChk" value="">
-			<input type="hidden" name="dataChk" value="">
-			<input type="hidden" name="addColumn" value="">
-			<input type="hidden" name="addColumn" value="">
-<br>
-
-<script language="JavaScript">
-<!--
-function setAllChk(toSelected) {
-	for(var i=0; i<document.forma.addColumn.length-2; i++) {
-		document.forma.addColumn[i].value = (toSelected?"Y":"");
-		document.forma.dataChk[i].checked = toSelected;
-	}	// for
-}	// setAllChk
-
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_edit.jsp
deleted file mode 100644
index cc6b68b0..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_edit.jsp
+++ /dev/null
@@ -1,1127 +0,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.
-  ================================================================================
-  --%>
-<%@page import="java.util.Map"%>
-<%@page import="java.util.HashMap"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportLoader"%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED);    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();	
-    boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT) || curSubStep.equals(AppConstants.WA_MODIFY);
-	DataColumnType currColumn = null;
-	if(isEdit)
-		currColumn = rdef.getColumnById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID));
-	Vector reportTableSources = DataCache.getReportTableSources((String) session.getAttribute("remoteDB"));
-
-    List reportCols = rdef.getAllColumns();
-    
-    HashMap actionImgMap = ReportLoader.loadActionImgLookUp();
-
-	String[] numberFormats = { "9999999990", "9,999,999,990", "9999999990.99", "9,999,999,990.99", "$9,999,999,990.99", "$9,999,999,990.999" };
-	String[] dateFormats   = { "MM/DD/YYYY", "MM/YYYY", "DD-MON-YYYY", "Month DD, YYYY", "Month, YYYY", "MM/DD/YYYY HH24:MI:SS", "YYYY" };
-	String[] charFormats   = { "N/A" }; 
-	
-	String dispName  = "";
-	String dbColType = "";
-	String colType   = "";
-	if(isEdit) { 
-		dbColType = currColumn.getDbColType();
-		colType   = currColumn.getColType();
-	} 
-
-    String dependsOnFormField = currColumn.getDependsOnFormField();
-    %>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/editabledropdown.js"></script>    
-<script language="JavaScript">
-<!--
-var tableDrillDownCount = 0;
-
-function verifyCrossTabDrillDown() {
-<%	if(isCrossTab) { %>
-	if(	(document.forma.crossTabValue.options[document.forma.crossTabValue.selectedIndex].value!="<%= AppConstants.CV_VALUE %>")
-		&&(document.forma.drillDownCtl.selectedIndex!=0)) {
-			alert("You cannot assign drill-down to this column unless the Column Usage in Cross-Tab is Report values.");
-			document.forma.drillDownURL.value         = "";
-			document.forma.drillDownParams.value      = "";
-			document.forma.drillDownSuppress.value    = "";
-			document.forma.drillDownRequest.value    = "";
-			document.forma.drillDownCtl.selectedIndex = 0;
-			return false;
-		}
-<%	} %>
-	return true;
-}	// verifyCrossTabDrillDown
-
-function showDrillDownPopup(resetParams) {
-	if(! verifyCrossTabDrillDown())
-		return;
-	
-	if(resetParams) {
-		document.forma.drillDownParams.value   = "";
-		document.forma.drillDownSuppress.value = "";
-                document.forma.drillDownRequest.value = "";
-	}
-	
-	if(document.forma.drillDownCtl.selectedIndex==0) {
-		document.forma.drillDownURL.value = "";
-		return;
-	}
-	
-	var ddValue = "";
-	ddValue = document.forma.drillDownCtl.options[document.forma.drillDownCtl.selectedIndex].value;
-	
-	var url = "";
-	if(document.forma.drillDownCtl.selectedIndex<=tableDrillDownCount) {
-		document.forma.drillDownURL.value = ddValue;
-		url = "<%= AppUtils.getRaptorActionURL() %>report.popup.drilldown.table&<%= AppConstants.RI_VIEW_ACTION %>="+ddValue;
-	} else {
-		document.forma.drillDownURL.value = ddValue;
-		url = "<%= AppUtils.getRaptorActionURL() %>report.popup.drilldown.report&<%= AppConstants.RI_REPORT_ID %>="+ddValue+"&drillDownParams="+escape(document.forma.drillDownParams.value)+"&drillDownSuppress="+escape(document.forma.drillDownSuppress.value)+"&drillDownRequest="+escape(document.forma.drillDownRequest.value);
-	}
-	var w = window.open(url, "drillDownPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showArgPopup
-
-function setDrillDownValuesSuppress(newParams, newSuppress) {
-	document.forma.drillDownParams.value   = newParams;
-	document.forma.drillDownSuppress.value = newSuppress;
-}   // setDrillDownValuesSuppress
-
-function setDrillDownValues(newParams) {
-	setDrillDownValuesSuppress(newParams, "")
-}   // setDrillDownValues
-
-function setTotalDropDownValues(canHaveTotal) {
-<% if(! isSQLBased) { %>
-	if(canHaveTotal) {
-		if(document.forma.displayTotal.options.length>1)
-			return;
-	} else {
-		if(document.forma.displayTotal.options.length==1)
-			return;
-	}
-	
-	document.forma.displayTotal.options.length = 0;
-	document.forma.displayTotal.options[0] = new Option("--- Do Not Display (Faster Report Execution) ---", "");
-<%	if(isCrossTab) { %>
-	document.forma.displayTotalPerRow.options.length = 0;
-	document.forma.displayTotalPerRow.options[0] = new Option("--- Do Not Display (Faster Report Execution) ---", "");
-<%  } %>
-	
-	if(canHaveTotal) {
-		<% for(int i=0; i<AppConstants.TOTAL_FUNCTIONS.getCount(); i++) { 
-				IdNameValue tValue = AppConstants.TOTAL_FUNCTIONS.getValue(i); %>
-			document.forma.displayTotal.options[<%= (i+1) %>] = new Option("<%= tValue.getName() %>", "<%= tValue.getId() %>");
-			<%	if(isCrossTab) { %>
-			document.forma.displayTotalPerRow.options[<%= (i+1) %>] = new Option("<%= tValue.getName() %>", "<%= tValue.getId() %>");
-			<%  } %>
-		<%  }	// for 
-                %>
-	} // if
-    
-	document.forma.displayTotal.selectedIndex = 0;
-<%	if(isCrossTab) { %>
-	document.forma.displayTotalPerRow.selectedIndex = 0;
-	if(document.layers)
-		history.go(0);
-<%  } %>
-<% } // if(! isSQLBased) 
-%>
-}   // setTotalDropDownValues
-
-<% if(! isSQLBased) { %>
-<%--
-function showFormatPopup() {
-	if((document.forma.colType.value!="< %= AppConstants.CT_NUMBER % >")&&(document.forma.colType.value!="< %= AppConstants.CT_DATE % >")) {
-		alert("Display Format is not applicable to this column");
-		return;
-	}
-	
-	var w = window.open("", "formatHint", "width=200,height=300,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Display Formats</title>");
-	//w.document.writeln("<link rel=stylesheet type=text/css href='< %= AppUtils.getBaseFolderURL() % >css/raptor.css'>");
-	w.document.writeln("<script language=JavaScript>");
-	w.document.writeln("function setValue(newValue) {");
-	w.document.writeln("    window.opener.document.forma.displayFormat.value=newValue;");
-	w.document.writeln("    window.close();");
-	w.document.writeln("}   // setValue");
-	w.document.writeln("</"+"script>");
-	w.document.writeln("</head><body>");
-	if(document.forma.colType.value=="< %= AppConstants.CT_NUMBER % >") {
-		w.document.writeln("<font face='Arial, Helvetica, sans-serif' size=2><b>Number formats:</b></font><ul>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('9999999990.99')\">9999999990.99</a></b></font></li>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('9,999,999,990.99')\">9,999,999,990.99</a></b></font></li>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('$9,999,999,990.99')\">$9,999,999,990.99</a></b></font></li>");
-		w.document.writeln("</ul>");
-	} else if(document.forma.colType.value=="< %= AppConstants.CT_DATE % >") {
-		w.document.writeln("<font face='Arial, Helvetica, sans-serif' size=2><b>Date formats:</b></font><ul>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('MM/DD/YYYY')\">MM/DD/YYYY</a></b></font></li>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('MM/YYYY')\">MM/YYYY</a></b></font></li>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('DD-MON-YYYY')\">DD-MON-YYYY</a></b></font></li>");
-		w.document.writeln("<li><font face='Arial, Helvetica, sans-serif' size=2><b><a href=\"javascript:setValue('MONTH DD, YYYY')\">MONTH DD, YYYY</a></b></font></li>");
-		w.document.writeln("</ul>");
-	}
-	w.document.writeln("</body></html>");
-	w.document.close();
-}   // showFormatPopup
---%>
-
-function showFormFieldPopup() {
-	var w = window.open("", "fieldPopup", "width=400,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Form Fields</title>");
-	w.document.writeln("<link rel=stylesheet type=text/css href='<%= AppUtils.getBaseFolderURL() %>css/raptor.css'>");
-	w.document.writeln("<script language=JavaScript>");
-	w.document.writeln("function setValue(newValue) {");
-	w.document.writeln("    window.opener.document.forma.exprFormula.selectedIndex = 12;");
-	w.document.writeln("    window.opener.exprFormulaChange(true);");
-	w.document.writeln("    window.opener.document.forma.exprText.value += newValue;");
-	w.document.writeln("    window.close();");
-	w.document.writeln("}   // setValue");
-	w.document.writeln("</"+"script>");
-	w.document.writeln("</head><body>");
-	
-	w.document.writeln("<table width=94% border=0 cellspacing=1 align=center>");
-	w.document.writeln("	<tr class=rbg1>");
-	w.document.writeln("		<td height=30>&nbsp;</td>");
-	w.document.writeln("		<td><b class=rtableheader>Report Form Fields</b></td>");
-	w.document.writeln("	</tr>");
-<%	int iCnt = 0;
-	if(rdef.getFormFieldList()!=null)
-		for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); iCnt++) { 
-			FormFieldType fft = (FormFieldType) iter.next(); %>
-	w.document.writeln("	<tr<%= (iCnt%2==0)?" class=rbg8":"" %>>");
-	w.document.writeln("		<td align=center valign=middle height=30><font class=rtabletext><%= (iCnt+1) %></font></td>");
-	w.document.writeln("		<td valign=middle>");
-	w.document.writeln("			<b class=rtabletext><a href=\"javascript:setValue('[<%= fft.getFieldName() %>]')\"><%= fft.getFieldName() %></a></b>");
-	w.document.writeln("		</td>");
-	w.document.writeln("	</tr>");
-<%			}	// for
-	if(iCnt==0) { %>
-	w.document.writeln("	<tr class=rbg3 height=30>");
-	w.document.writeln("		<td colspan=2 align=center valign=middle><b class=rtabletext>There are no form fields defined</b></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr>");
-	w.document.writeln("		<td colspan=2 align=center><br><input type=Submit class=button value=Close onClick=\"window.close();\"></td>");
-	w.document.writeln("	</tr>");
-<%	} else { %>
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("	</tr>");
-<%	}	// if 
-%>
-	w.document.writeln("</table>");
-	
-	w.document.writeln("</body></html>");
-	w.document.close();
-}   // showFormFieldPopup
-
-function exprFormulaChange(handleText) {
-	var exprValue = "";
-	exprValue = document.forma.exprFormula.options[document.forma.exprFormula.selectedIndex].value;
-	
-	if(handleText)
-		if(exprValue!='_exprText_') { 
-			document.forma.exprText.value    = ''; 
-			document.forma.exprText.disabled = true; 
-		} else 
-			document.forma.exprText.disabled = false;
-	
-	var oldColType = "";
-	oldColType = document.forma.colType.value;
-	
-	if((exprValue=="")||(exprValue=="MAX(")||(exprValue=="MIN(")||(exprValue=="_exprText_"))
-		document.forma.colType.value = document.forma.dbColType.value;
-	else
-		document.forma.colType.value = "<%= AppConstants.CT_NUMBER %>";
-	
-	if(document.forma.colType.value!=oldColType) {
-		// Updating displayFormat select list
-		document.forma.displayFormat.options.length = 0;
-		
-		if(document.forma.colType.value=="<%= AppConstants.CT_NUMBER %>") {
-		<% for(int i=0; i<numberFormats.length; i++) { %>
-			document.forma.displayFormat.options[<%= i %>] = new Option("<%= numberFormats[i] %>", "<%= numberFormats[i] %>");
-		<%  } %>
-		} else if(document.forma.colType.value=="<%= AppConstants.CT_DATE %>") {
-		<% for(int i=0; i<dateFormats.length; i++) { %>
-			document.forma.displayFormat.options[<%= i %>] = new Option("<%= dateFormats[i] %>", "<%= dateFormats[i] %>");
-		<%  } %>
-		} else {
-		<% for(int i=0; i<charFormats.length; i++) { %>
-			document.forma.displayFormat.options[<%= i %>] = new Option("<%= charFormats[i] %>", "<%= charFormats[i].equals("N/A")?"":charFormats[i] %>");
-		<%  } %>
-		}	// else
-		
-		document.forma.displayFormat.selectedIndex = 0;
-<%	if(! isCrossTab) { %>
-		setTotalDropDownValues(document.forma.colType.value=="<%= AppConstants.CT_NUMBER %>");
-<%  } %>
-		if(document.layers)
-			history.go(0);
-	}	// if
-}   // exprFormulaChange
-
-<% if(! isEdit) { %>
-function columnDetailsChange() {
-	var selText  = "";
-	selText  = document.forma.columnDetails.options[document.forma.columnDetails.selectedIndex].text;
-	document.forma.displayName.value = selText.substr(selText.indexOf('.')+1);
-	
-	var selValue = "";
-	selValue = document.forma.columnDetails.options[document.forma.columnDetails.selectedIndex].value;
-	document.forma.dbColType.value  = selValue.substr(selValue.lastIndexOf('|')+1);
-	
-	exprFormulaChange(false);
-	
-	document.forma.displayFormat.selectedIndex = 0;
-}   // columnDetailsChange
-<% } %>
-	
-function showMapPopup() {
-	var colType = document.forma.colType.value;
-	var displayName = document.forma.displayName.value;
-	var displayFormat = document.forma.displayFormat.options[document.forma.displayFormat.selectedIndex].value;
-<% if(isEdit) { %>
-	var colName = "<%= currColumn.getDbColName() %>";
-	var tableId = "<%= rdef.getColumnTableById(currColumn.getColId()).getTableId() %>";
-<% } else { %>
-	var selValue = "";
-	selValue = document.forma.columnDetails.options[document.forma.columnDetails.selectedIndex].value;
-	var colName = selValue.substr(selValue.indexOf('|')+1, selValue.lastIndexOf('|')-selValue.indexOf('|')-1);
-	var tableId = selValue.substr(0, selValue.indexOf('|'));
-<% } %>
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.map&colName="+colName+"&colType="+colType+"&displayName="+escape(displayName)+"&displayFormat="+escape(displayFormat)+"&tableId="+tableId, "mapPopup", "width=400,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showMapPopup
-<% }	// if(! isSQLBased) 
-%>
-
-function verifyCrossTabSemaphore() {
-<%	if(isCrossTab) { %>
-	if(	(document.forma.crossTabValue.options[document.forma.crossTabValue.selectedIndex].value!="<%= AppConstants.CV_VALUE %>")
-		&&(document.forma.semaphore.selectedIndex!=0)) {
-			alert("You cannot assign Advanced Formatting to this column unless the Column Usage in Cross-Tab is Report values.");
-			document.forma.semaphore.selectedIndex = 0;
-			return false;
-		}
-<%	} %>
-	return true;
-}	// verifyCrossTabSemaphore
-	
-function showSemaphorePopup() {
-	var semaphoreId = "";
-	semaphoreId = document.forma.semaphore.options[document.forma.semaphore.selectedIndex].value;
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.semaphore&semaphoreId="+semaphoreId, "semaphorePopup", "width=720,height=400,location=no,menubar=no,toolbar=no,status=yes,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showSemaphorePopup
-	
-function updateSemaphoreList(semId, semName) {	// Returns the position of the current semaphore in the list
-	var lSize  = 0;
-	var selIdx = 0;
-	lSize  = document.forma.semaphore.options.length;
-	selIdx = document.forma.semaphore.selectedIndex;	
-	for(var i=0; i<lSize; i++)
-		if(document.forma.semaphore.options[i].value==semId) {
-			if(document.forma.semaphore.options[i].text!=semName) {
-				document.forma.semaphore.options[i] = new Option(semName, semId);
-				document.forma.semaphore.selectedIndex = selIdx;
-			}	// if
-			
-			return i;
-		}	// if
-	
-	document.forma.semaphore.options[lSize] = new Option(semName, semId);
-	return lSize;
-}   // updateSemaphoreList
-	
-function showSemaphoreImportPopup() {
-	if(document.forma.drillDownCtl.selectedIndex==0||document.forma.drillDownCtl.selectedIndex<=tableDrillDownCount) {
-		alert("You need to select a report from the list, and then click this button\n"+
-			  "to import all the Advanced Display Formattings from selected report into\n"+
-			  "this report. No Advanced Display Formattings have been imported.");
-		return;
-	}	// if
-	
-	var ddValue = "";
-	ddValue = document.forma.drillDownCtl.options[document.forma.drillDownCtl.selectedIndex].value;
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.import.semaphore&<%= AppConstants.RI_REPORT_ID %>="+ddValue, "semaphoreImportPopup", "width=400,height=250,location=no,menubar=no,toolbar=no,status=yes,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showSemaphoreImportPopup
-
-function showImageOptions() {
-	var selectionType= document.forma.anchor.options[document.forma.anchor.selectedIndex].value;
-	if (selectionType == "IMAGE") {
-	 //document.getElementById("imageSelectionDiv").style.display='block';
-	} else {
-		 document.getElementById("imageSelectionDiv").style.display='none';
-	}
-}
-
-function showDisplayFormats() {
-	
-	var colType= document.forma.colType.options[document.forma.colType.selectedIndex].value;
-	if (colType == "<%=AppConstants.CT_HYPERLINK%>") {
-		document.getElementById("dataFormatDiv").style.display='none';
-		//document.getElementById("hyperlinkDiv").style.display='block';
-	} else {
-		document.getElementById("hyperlinkDiv").style.display='none';
-		//document.getElementById("dataFormatDiv").style.display='block';
-	}
-	var dataFormat = document.forma.colDataFormat; 
-	dataFormat.options.length = 0; 
-
-	dataFormat.options[dataFormat.options.length] = new Option('Select', -1); 
-	if (colType == "<%=AppConstants.CT_NUMBER%>") { 
-		dataFormat.options[dataFormat.options.length] = new Option('9999999990','9999999990'); 
-		dataFormat.options[dataFormat.options.length] = new Option('9,999,999,990','9,999,999,990'); 
-		dataFormat.options[dataFormat.options.length] = new Option('9999999990.99','9999999990.99'); 
-		dataFormat.options[dataFormat.options.length] = new Option('9,999,999,990.99','9,999,999,990.99'); 
-		dataFormat.options[dataFormat.options.length] = new Option('$9,999,999,990.99','$9,999,999,990.99'); 
-		dataFormat.options[dataFormat.options.length] = new Option('$9,999,999,990.999','$9,999,999,990.999'); 
-		var lSize = dataFormat.options.length;
-		for(var i=0; i<lSize; i++) {
-			if(dataFormat.options[i].value=="<%=currColumn.getColFormat()%>") {
-				dataFormat.options[i].selected = true;
-			}
-		}
-		if(document.getElementById("filterDateColumn")) document.getElementById("filterDateColumn").style.display = "none";
-
-	} 
-	if (colType == "<%=AppConstants.CT_DATE%>") { 
-		dataFormat.options[dataFormat.options.length] = new Option('MM/DD/YYYY','MM/DD/YYYY'); 
-		dataFormat.options[dataFormat.options.length] = new Option('MM/YYYY','MM/YYYY'); 
-		dataFormat.options[dataFormat.options.length] = new Option('DD-MON-YYYY','DD-MON-YYYY'); 
-		dataFormat.options[dataFormat.options.length] = new Option('Month DD, YYYY','Month DD, YYYY'); 
-		dataFormat.options[dataFormat.options.length] = new Option('Month, YYYY','Month, YYYY'); 
-		dataFormat.options[dataFormat.options.length] = new Option('MM/DD/YYYY HH24:MI:SS','MM/DD/YYYY HH24:MI:SS'); 
-		dataFormat.options[dataFormat.options.length] = new Option('YYYY/MM/DD HH24:MI:SS','YYYY/MM/DD HH24:MI:SS'); 
-		dataFormat.options[dataFormat.options.length] = new Option('YYYY','YYYY'); 
-		var lSize = dataFormat.options.length;
-		for(var i=0; i<lSize; i++) {
-			if(dataFormat.options[i].value=="<%=currColumn.getColFormat()%>") {
-				dataFormat.options[i].selected = true;
-			}
-		}
-		//if(document.getElementById("filterDateColumn")) document.getElementById("filterDateColumn").style.display = "block";
-
-	} 
-	if (colType == "<%=AppConstants.CT_CHAR%>") { 
-		dataFormat.options[dataFormat.options.length] = new Option('N/A','N/A'); 
-		if(document.getElementById("filterDateColumn")) document.getElementById("filterDateColumn").style.display = "none";
-	} 
-	
-	
-}
-//-->
-</script>
-
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-<% if(isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Column ID: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%= currColumn.getColId() %>
-			</font></td>
-	</tr>
-	<tr>
-	  <td class=rbg2 align="right" width="25%" height="30" style="background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Depends on formfield: </font></td> 
-	   <td class=rbg3 align="left" width="50%"><font class=rtabletext>
-	      <input type="text" style="width: 200px;" name="dependsOnFormField" value="<%= nvl(dependsOnFormField,"")%>"></input>	</tr>
-<% }	// if(! isSQLBased) 
-%>
-<% if(isCrossTab) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Column Usage in Cross-Tab: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="crossTabValue"onChange="setTotalDropDownValues(this.options[this.selectedIndex].value=='<%= AppConstants.CV_VALUE %>')">
-				<option value="<%= AppConstants.CV_ROW %>"<%= isEdit?(nvl(currColumn.getCrossTabValue()).equals(AppConstants.CV_ROW)?" selected":""):" selected" %>><%= rdef.getCrossTabDisplayValue(AppConstants.CV_ROW) %>
-				<option value="<%= AppConstants.CV_COLUMN %>"<%= (isEdit&&nvl(currColumn.getCrossTabValue()).equals(AppConstants.CV_COLUMN))?" selected":"" %>><%= rdef.getCrossTabDisplayValue(AppConstants.CV_COLUMN) %>
-				<option value="<%= AppConstants.CV_VALUE %>"<%= (isEdit&&nvl(currColumn.getCrossTabValue()).equals(AppConstants.CV_VALUE))?" selected":"" %>><%= rdef.getCrossTabDisplayValue(AppConstants.CV_VALUE) %>
-				<option value=""<%= (isEdit&&(nvl(currColumn.getCrossTabValue()).length()==0))?" selected":"" %>>Invisible/Filter
-			</select></font></td>
-	</tr>
-<% } %>
-<% if(! isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Table Column: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-		<% if(isEdit) { %>
-			<%= nvl(rdef.getColumnLabel(currColumn), currColumn.getDbColName()) /*currColumn.getColName()*/ %>
-		<% } else { %>
-			<select name="columnDetails" onChange="columnDetailsChange();">
-<%				    int icnt = 0;
-					String remoteDbPrefix = dbInfo;
-					for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-						DataSourceType dst = (DataSourceType) iter.next();
-						
-						Vector dbColumns = DataCache.getReportTableDbColumns(dst.getTableName().toUpperCase(),remoteDbPrefix);
-						if(dbColumns!=null)
-							for(int i=0; i<dbColumns.size(); i++) {
-								DBColumnInfo dbCol = (DBColumnInfo) dbColumns.get(i);
-								//if(dst.getTableName().toUpperCase().equals(dbCol.getTableName())) { 
-%>
-		    				    <option value="<%= dst.getTableId() %>|<%= dbCol.getColName() %>|<%= dbCol.getColType() %>"<%= (icnt==0)?" selected":"" %>>[<%= dst.getDisplayName() %>].<%= dbCol.getLabel() %>
-<%									if(icnt==0) {
-										dispName  = dbCol.getLabel();
-										dbColType = dbCol.getColType();
-										colType   = dbColType;
-									}
-									icnt++;
-								//}   // if 
-							}   // for 
-					}   // for 
-%>
-			</select>
-		<% } %>
-		<input type="hidden" name="dbColType" value="<%= dbColType %>">
-		<input type="hidden" name="colType" value="<%= colType %>">
-		</font></td>
-	</tr> 
-<% }	// if(! isSQLBased) 
-%>
-
-<% if(isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Datatype: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
- 	    <select name="colType" style="width: 100px;" onChange="showDisplayFormats();">
-		  	<option value="0"> Select</option>
-		  	<option value="<%=AppConstants.CT_NUMBER%>" <%=currColumn.getColType().equals(AppConstants.CT_NUMBER)?" selected": ""%>> Number </option>
-		  	<option value="<%=AppConstants.CT_DATE%>" <%=currColumn.getColType().equals(AppConstants.CT_DATE)?" selected": ""%>> Date</option>
-		  	<option value="<%=AppConstants.CT_CHAR%>" <%=currColumn.getColType().equals(AppConstants.CT_CHAR)?" selected": ""%>> Character</option>
-		  	<option value="<%=AppConstants.CT_HYPERLINK%>" <%=currColumn.getColType().equals(AppConstants.CT_HYPERLINK)?" selected": ""%>> Hyperlink</option>
- 	   </select>
- 	   </font>
- 	   </td>
- 	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Group By Pos: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
- 	    <select name="groupByPos" style="width: 100px;">
-		  	<option value="0"> Select</option>
-		  	<option value="1" <%=(currColumn.getGroupByPos()!=null && currColumn.getGroupByPos()==1)?" selected": ""%>> 1 </option>
- 	   </select>
- 	   </font>
- 	   </td>
- 	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Custom Text for Sub-Total: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
- 	    <font class=rtabletext>
-			<input type="text" size="30" maxlength="500" style="width: 100px;" class=rtabletext  name="subTotalCustomText" value="<%= isEdit?(currColumn.getSubTotalCustomText()!=null?currColumn.getSubTotalCustomText():"Sub Total"):"Sub Total" %>"/> 	  
-	   </font>
- 	   </font>
- 	   </td>
- 	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Hide Repeated Values : </font></td>
-			<td class=rbg3 width="50%" align="left" nowrap><font class=rtabletext>
-	 	    <input type="checkbox" name="hideRepeatedKeys" value="Y" <%=(currColumn.isHideRepeatedKey()!=null && currColumn.isHideRepeatedKey().booleanValue())?" checked":"" %>>
-	 	   </font>
-	 	   </td>
- 	</tr>
-
-
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Multi group Column Level: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
- 	    <select name="multiGroupColLevel" style="width: 100px;">
-		  	<option value="0"> Select</option>
-		  	<option value="-1" <%=(currColumn.getLevel()!=null && currColumn.getLevel()==-1)?" selected": ""%>> AUXILIARY-COLUMN </option>
-		  	<option value="1" <%=(currColumn.getLevel()!=null && currColumn.getLevel()==1)?" selected": ""%>> 1 </option>
-		  	<option value="2" <%=(currColumn.getLevel()!=null && currColumn.getLevel()==2)?" selected": ""%>> 2 </option>
-		  	<option value="3" <%=(currColumn.getLevel()!=null && currColumn.getLevel()==3)?" selected": ""%>> 3 </option>
-		  	<option value="4" <%=(currColumn.getLevel()!=null && currColumn.getLevel()==4)?" selected": ""%>> 4 </option>
- 	   </select>
- 	   </font>
- 	   </td>
- 	</tr>
-
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Multi group Column Range : </font>
-				<font class=rtabletext>Colspan : </font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-		<font class=rtabletext>
-			<input type="text" size="30" style="width: 100px;" maxlength="500" class=rtabletext  name="colspan" value="<%= isEdit?(currColumn.getColspan()!=null?currColumn.getColspan():""):"" %>"/> 	  
-			
-	   </font>
- 	   </td>
- 	</tr>
-
-	<tr id ="dataFormatDiv">
-	    <td colspan="2" class=rbg2> 	
-		<table width="100%" cellspacing="1" cellpadding="3" align=center>
-		<tr>
-			<td class=rbg2 width="25%" align="right" height="30"><font class=rtabletext>Dataformat: </font></td> 
-			<td class=rbg3 width="50%" align="left" nowrap><font class=rtabletext>
-	 	    <select name="colDataFormat" style="width: 100px;">
-	 	   </select>
-	 	   </font>
-	 	   </td>
-	 	</tr>
-	 <% if(!isCrossTab) { %>	   
-		<tr id="filterDateColumn">
-			<td class=rbg2 width="25%" align="right" height="30"><font class=rtabletext>Enhanced Pagination: </font></td> 
-			<td class=rbg3 width="50%" align="left" nowrap><font class=rtabletext>
-	 	    <input type="checkbox" name="enhancedPagination" value="Y" <%=(currColumn.isEnhancedPagination()!=null && currColumn.isEnhancedPagination().booleanValue())?" checked":"" %> />
-	 	   </font>
-	 	   </td>
-	 	</tr>
- 	<%} %>   
-	 	
-		</table>
-		</td>
- 	</tr>
- 	<tr id ="hyperlinkDiv">   
-	  <td colspan="2">
-	    <table  width="100%" cellspacing="1" cellpadding="3" align=center>
-		<tr>
-			<td class=rbg2 width="25%" align="right" height="30"><font class=rtabletext>URL: </font></td> 
-			<td class=rbg3 width="50%" align="left" nowrap><font class=rtabletext>
-			  <input type="text" size="30" maxlength="500" class=rtabletext  name="hyperlinkURL" value="<%= isEdit?currColumn.getHyperlinkURL():"" %>"/>
-	 	   </font>
-	 	   </td>
-	 	</tr>
-
-		<tr>
-			<td class=rbg2 width="25%" align="right" height="30"><font class=rtabletext>Anchor: </font></td> 
-			<td class=rbg3 width="50%" align="left" nowrap><font class=rtabletext>
-	 	    <select name="anchor" onChange="showImageOptions()">
-			  	<option value="0"> Select</option>
-			  	<option value="VALUE" <%=nvl(currColumn.getHyperlinkType()).equals("VALUE")?" selected": ""%>> Value Of the Column </option>
-			  	<option value="IMAGE" <%=nvl(currColumn.getHyperlinkType()).equals("IMAGE")?" selected": ""%>> IMAGE</option>
-	 	   </select>
-	 	   </font>
-	 	   </td>
-	 	</tr>
-		  <tr id="imageSelectionDiv" style="display:none;"> 
-			<td class=rbg2 width="25%" height="30" align="right">
-				<font class=rtabletext>Select Image for anchor: </font>
-			</td> 
-			<td width="50%" align="left">
-				<font class=rtabletext>
-		  <select id = "actionImg" name="actionImg" >
-		    <option value=''> <!-- SELECT --></option>
-		  <%
-		        if(!actionImgMap.isEmpty()) {
-				for( Iterator itr=actionImgMap.entrySet().iterator(); itr.hasNext(); ) {
-					Map.Entry e = (Map.Entry)itr.next();
-					String image_id = (String)e.getKey();
-					String image_loc = (String)e.getValue();
-           %>
-           <%
-			if (nvl(AppUtils.getRequestNvlValue(request, "actionImg")).length()>0 && !(AppUtils.getRequestNvlValue(request, "pdfImg").equals(currColumn.getActionImg())) ) {
-				if(image_loc .equals (AppUtils.getRequestNvlValue(request, "actionImg"))) {
-			%>
-			
-			<option value='<%= image_loc %>' selected> <%=image_id %></option>
-			<%	
-				} else {
-            %> 					
-					<option value='<%= image_loc %>'> <%=image_id %></option>
-			<%		
-           		} 
-			} else {
-				if(image_loc .equals (currColumn.getActionImg())) {
-				%>
-				
-				<option value='<%= image_loc %>' selected> <%=image_id %> </option>
-				<%	
-				
-			    } else {
-		            %> 					
-					<option value='<%= image_loc %>'> <%=image_id %></option>
-			<%		
-			    }
-			}
-           %>
-
-		   <% }
-		     }
-		   %>
-           </select>
-		   </font>
-           </td>		   
-		  </tr>
-	 	 </table>
-         </td>		 
-		  </tr>
-<% } %>
-	<tr>
-		<td class=rbg2 align="right" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Display Name: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<input type="text" style="width: 100px;" size="30" maxlength="60" class=rtabletext name="displayName" value="<%= isEdit?currColumn.getDisplayName():dispName %>"></font></td>
-	</tr>
-<% if(! isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display Format: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<!--input type="text" size="20" maxlength="30" name="displayFormat" value="< %= isEdit?nvl(currColumn.getColFormat()):"" % >" onFocus="blur();"></font>
-		    <a href="javascript:showFormatPopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Select from list" width="12" height="12"></a-->
-			<select name="displayFormat" style="width: 100px;" >
-			<%  String[] fmt;
-				if(colType.equals(AppConstants.CT_NUMBER)) 
-					fmt = numberFormats;
-				else if(colType.equals(AppConstants.CT_DATE)) 
-					fmt = dateFormats;
-				else 
-					fmt = charFormats; 
-				for(int i=0; i<fmt.length; i++) { %>
-				<option value="<%= fmt[i].equals("N/A")?"":(fmt[i].startsWith("Month")?("fm"+fmt[i]):fmt[i]) %>"<%= (isEdit&&(nvl(currColumn.getColFormat()).toUpperCase().equals(fmt[i].toUpperCase())||("fm"+nvl(currColumn.getColFormat())).toUpperCase().equals(fmt[i].toUpperCase())))?" selected":"" %>><%= fmt[i] %>
-			<%  } %>
-			</select></font></td>
-	</tr>
-<% }	// if(! isSQLBased) 
-%>
-
-<% if (false) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display Width: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-		<% if (currColumn.getDisplayWidth()<=0) { currColumn.setDisplayWidth(10); } %>
-			<select name="displayWidth" style="width: 100px;"  onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="10"<%=  (isEdit&&(currColumn.getDisplayWidth()<=0 || currColumn.getDisplayWidth()==10))?"":" selected" %>>10%
-				<option value="20"<%=  (isEdit&&(currColumn.getDisplayWidth()==20))?" selected":""  %>>20%
-				<option value="30"<%=  (isEdit&&(currColumn.getDisplayWidth()==30))?" selected":""  %>>30%
-				<option value="40"<%=  (isEdit&&(currColumn.getDisplayWidth()==40))?" selected":""  %>>40%
-				<option value="50"<%=  (isEdit&&(currColumn.getDisplayWidth()==50))?" selected":""  %>>50%
-				<option value="60"<%=  (isEdit&&(currColumn.getDisplayWidth()==60))?" selected":""  %>>60%
-				<option value="70"<%=  (isEdit&&(currColumn.getDisplayWidth()==70))?" selected":""  %>>70%
-				<option value="80"<%=  (isEdit&&(currColumn.getDisplayWidth()==80))?" selected":""  %>>80%
-				<option value="90"<%=  (isEdit&&(currColumn.getDisplayWidth()==90))?" selected":""  %>>90%
-				<option value="100"<%= (isEdit&&(currColumn.getDisplayWidth()==100))?" selected":"" %>>100%
-				<% if(!((currColumn.getDisplayWidth()%10 == 0) && (currColumn.getDisplayWidth() > 100)) ) {
-				%>
-					<option value="<%=currColumn.getDisplayWidth()%>" selected><%=currColumn.getDisplayWidth()%>%</option> 
-                <%				
-					 } 
-                %>						
-				
-			</select></font></td>
-	</tr>
-	<% } %>
-	<% System.out.println("WidthInPxls " + currColumn.getDisplayWidthInPxls()); %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display Width (In Pxls): </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-						<input type="text" style="width: 100px;" class="rtabletext" size="40" maxlength="100" id="widthInPxls" name="widthInPxls" value="<%= (nvl(AppUtils.getRequestNvlValue(request, "widthInPxls")).length() > 0)? 
-			(!(AppUtils.getRequestNvlValue(request, "widthInPxls").equals(currColumn.getDisplayWidthInPxls()))?
-                            AppUtils.getRequestNvlValue(request, "widthInPxls"):currColumn.getDisplayWidthInPxls()):
-                            	currColumn.getDisplayWidthInPxls() %>">
-
-</font></td>
-	</tr>	
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>No Wrap ? </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="nowrap" style="width: 100px;" >
-				<option value="Y"<%= isEdit?(nvl(currColumn.getNowrap(),"N").startsWith("Y")?" selected":(!nvl(currColumn.getNowrap(),"False").startsWith("N") && org.openecomp.portalsdk.analytics.system.Globals.IsGlobalNoWrap()?" selected": "")):"" %>>Yes
-				<option value="N"<%= (isEdit&&(nvl(currColumn.getNowrap(),"False").startsWith("N")))?" selected":"" %>>No
-			</select></font></td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 height="30" align="right"><font class=rtabletext>Indent Parameter to display value </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="indentation" style="width: 100px;" >
-			    <option value="0"> Select</option>
-				<option value="1" <%= AppUtils.getRequestNvlValue(request, "indentation").equals("1") ? " selected":((AppUtils.getRequestNvlValue(request, "indentation").length()<=0)?(currColumn.getIndentation()!=null && currColumn.getIndentation().intValue()==1?" selected":""):"") %>> 1 </option>
-				<option value="2" <%= AppUtils.getRequestNvlValue(request, "indentation").equals("2") ? " selected":((AppUtils.getRequestNvlValue(request, "indentation").length()<=0)?(currColumn.getIndentation()!=null && currColumn.getIndentation().intValue()==2?" selected":""):"") %>> 2 </option>
-				<option value="3" <%= AppUtils.getRequestNvlValue(request, "indentation").equals("3") ? " selected":((AppUtils.getRequestNvlValue(request, "indentation").length()<=0)?(currColumn.getIndentation()!=null && currColumn.getIndentation().intValue()==3?" selected":""):"") %>> 3 </option>				
-			</select>
-		</td>
-	</tr>
-		
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display Alignment: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="displayAlign" style="width: 100px;" >
-				<option value="Left"<%=   isEdit?(nvl(currColumn.getDisplayAlignment(), "Left").equals("Left")?" selected":""):" selected" %>>Left
-				<option value="Center"<%= (isEdit&&nvl(currColumn.getDisplayAlignment()).equals("Center"))?" selected":""                  %>>Center
-				<option value="Right"<%=  (isEdit&&nvl(currColumn.getDisplayAlignment()).equals("Right"))?" selected":""                   %>>Right
-			</select></font></td>
-	</tr>
-
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display (Header) Alignment: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="displayHeaderAlign" style="width: 100px;" >
-				<option value="Left"<%=   isEdit?(nvl(currColumn.getDisplayHeaderAlignment(), "Left").equals("Left")?" selected":""):" selected" %>>Left
-				<option value="Center"<%= (isEdit&&nvl(currColumn.getDisplayHeaderAlignment()).equals("Center"))?" selected":""                  %>>Center
-				<option value="Right"<%=  (isEdit&&nvl(currColumn.getDisplayHeaderAlignment()).equals("Right"))?" selected":""                   %>>Right
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Sortable? </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="sortable" style="width: 100px;" >
-				<option value="N"<%= isEdit?((currColumn.isIsSortable()!=null && !currColumn.isIsSortable())?" selected":""):" selected" %>>No
-				<option value="Y"<%= (isEdit&&currColumn.isIsSortable()!=null && currColumn.isIsSortable())?" selected":""        %>>Yes
-			</select></font></td>
-	</tr>
-	
-
-	<% if(! isCrossTab) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Visible? </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="visible" style="width: 100px;" >
-				<option value="Y"<%= isEdit?(currColumn.isVisible()?" selected":""):" selected" %>>Yes
-				<option value="N"<%= (isEdit&&(! currColumn.isVisible()))?" selected":""        %>>No
-			</select></font></td>
-	</tr>
-        <% if(! isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Group By? </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="groupBreak" style="width: 100px;" >
-				<option value="Y"<%= (isEdit&&currColumn.isGroupBreak())?" selected":""            %>>Yes
-				<option value="N"<%= isEdit?(currColumn.isGroupBreak()?"":" selected"):" selected" %>>No
-			</select></font></td>
-	</tr>
-	<% } %>
-        <% } %>
-	<!--tr class=rbg2>
-		<td class=rbg2  height="30" align="right" width="25%"><font face="Arial, Helvetica, sans-serif" size="1" class=rtabletext>Column Type </font></td> 
-		<td align="left" width="50%" class=rbg3><font face="Arial, Helvetica, sans-serif" size="1" class=rtabletext>
-			<select name="calculated">
-				<option value="N"< %= (isEdit&&currColumn.isCalculated())?"":" selected" % >>Table Column
-				<option value="Y"< %= (isEdit&&currColumn.isCalculated())?" selected":"" % >>Expression
-			</select></font></td>
-	</tr-->
-        <% if(! isSQLBased) { %>  
-<%
-boolean isOtherExpr = isEdit&&currColumn.isCalculated()&&
-						(! nvl(currColumn.getColName()).startsWith("SUM( "))&&
-						(! nvl(currColumn.getColName()).startsWith("MAX( "))&&
-						(! nvl(currColumn.getColName()).startsWith("MIN( "))&&
-						(! nvl(currColumn.getColName()).startsWith("COUNT(*)"))&&
-						(! nvl(currColumn.getColName()).startsWith("COUNT(ALL "))&&
-						(! nvl(currColumn.getColName()).startsWith("COUNT(DISTINCT "))&&
-						(! nvl(currColumn.getColName()).startsWith("AVG(ALL "))&&
-						(! nvl(currColumn.getColName()).startsWith("AVG(DISTINCT "))&&
-						(! nvl(currColumn.getColName()).startsWith("STDDEV(ALL "))&&
-						(! nvl(currColumn.getColName()).startsWith("STDDEV(DISTINCT "))&&
-						(! nvl(currColumn.getColName()).startsWith("VARIANCE(ALL "))&&
-						(! nvl(currColumn.getColName()).startsWith("VARIANCE(DISTINCT "));
-%>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Expression: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="exprFormula" onChange="exprFormulaChange(true);" style="width: 100px;" >
-				<option value=""<%=                  (isEdit&&currColumn.isCalculated())?"":" selected"                                                                %>>
-				<option value="SUM("<%=              (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("SUM( "))?" selected":""              %>>Sum
-				<option value="MAX("<%=              (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("MAX( "))?" selected":""              %>>Max
-				<option value="MIN("<%=              (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("MIN( "))?" selected":""              %>>Min
-				<option value="COUNT(*)"<%=          (isEdit&&currColumn.isCalculated()&&(nvl(currColumn.getColName()).startsWith("COUNT(*)")||nvl(currColumn.getColName()).startsWith("COUNT(ALL ")))?" selected":"" %>>Count All
-				<option value="COUNT(DISTINCT"<%=    (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("COUNT(DISTINCT "))?" selected":""    %>>Count Distinct
-				<option value="AVG(ALL"<%=           (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("AVG(ALL "))?" selected":""           %>>Average All
-				<option value="AVG(DISTINCT"<%=      (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("AVG(DISTINCT "))?" selected":""      %>>Average Distinct
-				<option value="STDDEV(ALL"<%=        (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("STDDEV(ALL "))?" selected":""        %>>Standard Deviation All
-				<option value="STDDEV(DISTINCT"<%=   (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("STDDEV(DISTINCT "))?" selected":""   %>>Standard Deviation Distinct
-				<option value="VARIANCE(ALL"<%=      (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("VARIANCE(ALL "))?" selected":""      %>>Variance All
-				<option value="VARIANCE(DISTINCT"<%= (isEdit&&currColumn.isCalculated()&&nvl(currColumn.getColName()).startsWith("VARIANCE(DISTINCT "))?" selected":"" %>>Variance Distinct
-				<option value="_exprText_"<%=        isOtherExpr?" selected":""                                                                                        %>>---------- Other ----------
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Expression Other: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<input type="text" size="30" name="exprText"<%= isOtherExpr?" value=\""+nvl(currColumn.getColName())+"\"":" value=\"\" disabled" %> onFocus="if(document.forma.exprFormula.options[document.forma.exprFormula.selectedIndex].value!='_exprText_') blur();"></font>
-		    <a href="javascript:showMapPopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Define custom values mapping" width="12" height="12"></a>&nbsp;
-		    <a href="javascript:showFormFieldPopup()"><font class=rtabletext>Form Fields</font></a>
-		</td>
-	</tr>
-<% }	// if(! isSQLBased) 
-%>
-<%-- if(! isCrossTab) { --%>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Drill-down Link: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<input type="hidden" name="drillDownURL" value="<%= isEdit?nvl(currColumn.getDrillDownURL()):"" %>">
-			<input type="hidden" name="drillDownParams" value="<%= isEdit?nvl(currColumn.getDrillDownParams()):"" %>">
-			<input type="hidden" name="drillDownSuppress" value="<%= isEdit?nvl(currColumn.getDrillDownType()):"" %>">
-			<input type="hidden" name="drillDownRequest" value="<%= isEdit?getRequestParam(currColumn.getDrillDownParams()):"" %>">
-			<input type="hidden" name="drillDownPopUp" value="<%= isEdit?(currColumn.isDrillinPoPUp()!=null?currColumn.isDrillinPoPUp():""):"" %>">
-			<select name="drillDownCtl" onChange="showDrillDownPopup(true)" style="width: 300px;" >
-				<option value=""<%= (isEdit&&nvl(currColumn.getDrillDownURL()).length()>0)?"":" selected" %>>----- No Drill-down -----
-	<%	int tableDrillDownCount = 0;
-		if(! isCrossTab)
-			for(int i=0; i<reportTableSources.size(); i++) {
-				TableSource tableSource = (TableSource) reportTableSources.get(i);
-				if(nvl(tableSource.getViewAction()).length()>0&&rdef.getTableByDBName(tableSource.getTableName())!=null) { 
-					tableDrillDownCount++; %>
-					<option value="<%= tableSource.getViewAction() %>"<%= (isEdit&&nvl(currColumn.getDrillDownURL()).equals(AppUtils.getBaseActionURL()+tableSource.getViewAction()))?" selected":"" %>><%= tableSource.getDisplayName() %> Record Details
-	<%			}	// if
-		 	}	// for
-
-		Vector publicReportIdNames = DataCache.getPublicReportIdNames();
-		for(int i=0; i<publicReportIdNames.size(); i++) { 
-			IdNameValue reportIdName = (IdNameValue) publicReportIdNames.get(i); %>
-				<option value="<%= reportIdName.getId() %>"<%= (isEdit&&nvl(currColumn.getDrillDownURL()).equals(reportIdName.getId()))?" selected":"" %>>Public Report: <%= reportIdName.getName() %>
-	<%	} %>:
-	
-	<%
-	//if(!AppUtils.isSuperUser(request)) {
-	Vector groupReportIdNames = DataCache.getGroupAccessibleReportIdNames(AppUtils.getUserID(request),AppUtils.getUserRoles(request));
-		for(int j=0; j<groupReportIdNames.size(); j++) { 
-			IdNameValue reportIdName = (IdNameValue) groupReportIdNames.get(j); %>
-				<option value="<%= reportIdName.getId() %>"<%= (isEdit&&nvl(currColumn.getDrillDownURL()).equals(reportIdName.getId()))?" selected":"" %>>Group Report: <%= reportIdName.getName() %>
-	    <% } %>			
-	 <%// } 
-         %>   
-	<%
-	//if(!AppUtils.isSuperUser(request)) {
-	Vector privateReportIdNames = DataCache.getPrivateAccessibleReportIdNames(AppUtils.getUserID(request),AppUtils.getUserRoles(request));
-		for(int j=0; j<privateReportIdNames.size(); j++) { 
-			IdNameValue reportIdName = (IdNameValue) privateReportIdNames.get(j); %>
-				<option value="<%= reportIdName.getId() %>"<%= (isEdit&&nvl(currColumn.getDrillDownURL()).equals(reportIdName.getId()))?" selected":"" %>>Private Report: <%= reportIdName.getName() %>
-	    <% } %>			
-	 <% // } 
-%>   
-			</select></font>
-			<a href="javascript:showDrillDownPopup(false)"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Set new parameters configuration" width="12" height="12"></a>
-			&nbsp;&nbsp;
-			<a href="javascript:showSemaphoreImportPopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>lookup_arrow.gif" alt="Import advanced formatting from selected report" width="17" height="17"></a>
-		</td>
-	</tr>
-<script language="JavaScript">
-<!--
-	tableDrillDownCount = <%= tableDrillDownCount %>;
-//-->
-</script>
-	<%	String curSemId = "";
-		if(isEdit)
-			curSemId = nvl(currColumn.getSemaphoreId()); %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Advanced Display Formatting: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<select name="semaphore"" onChange="verifyCrossTabSemaphore()" style="width: 300px;" >
-				<option value=""<%= (curSemId.length()==0)?" selected":"" %>>----- Do Not Use Advanced Formatting -----
-	<%	if(rdef.getSemaphoreList()!=null)
-			for(Iterator iter=rdef.getSemaphoreList().getSemaphore().iterator(); iter.hasNext(); ) {
-				SemaphoreType semaphore = (SemaphoreType) iter.next(); %>
-				<option value="<%= semaphore.getSemaphoreId() %>"<%= curSemId.equals(semaphore.getSemaphoreId())?" selected":"" %>><%= semaphore.getSemaphoreName() %>
-	<%		}	// for 
-	%>
-			</select></font>
-			<input type="hidden" name="semaphoreTypeHidden" value=""/>
-			<a href="javascript:showSemaphorePopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Define advanced formatting" width="12" height="12"></a>
-		</td>
-	</tr>
-<%-- } --%>
-
-<%	boolean canHaveTotal = false; 
-    	if(isSQLBased) {
-		//canHaveTotal = (! isCrossTab);
-		canHaveTotal = (!isCrossTab)||(isEdit&&nvl(currColumn.getCrossTabValue()).equals(AppConstants.CV_VALUE));
-	} else  {
-		if(isCrossTab) 
-			canHaveTotal = (isEdit&&nvl(currColumn.getCrossTabValue()).equals(AppConstants.CV_VALUE));
-		else
-			canHaveTotal = colType.equals(AppConstants.CT_NUMBER);
-	}
-	
-	String colTotalRow = "";
-	String colTotal    = isEdit?nvl(currColumn.getDisplayTotal()):"";
-	if(isCrossTab&&colTotal.indexOf('|')>=0) {
-		colTotalRow = colTotal.substring(colTotal.indexOf('|')+1);
-		colTotal    = colTotal.substring(0, colTotal.indexOf('|'));
-	} %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Total for <%= isCrossTab?"each":"the" %> column: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="displayTotal" style="width: 300px;" >
-				<option value=""<%= (colTotal.length()>0)?"":" selected" %>>--- Do Not Display (Faster Report Execution) ---
-			<%	if(canHaveTotal) {
-					for(int i=0; i<AppConstants.TOTAL_FUNCTIONS.getCount(); i++) { 
-						IdNameValue tValue = AppConstants.TOTAL_FUNCTIONS.getValue(i); %>
-				<option value="<%= tValue.getId() %>"<%= (colTotal.startsWith(tValue.getId()))?" selected":"" %>><%= tValue.getName() %>
-			<%  	}	// for
-				} // if  
-                        %>
-			</select></font></td>
-	</tr>
-<%	if(isCrossTab) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Total for each row </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="displayTotalPerRow">
-				<option value=""<%= (colTotalRow.length()>0)?"":" selected" %>>--- Do Not Display (Faster Report Execution) ---
-			<%	if(canHaveTotal) {
-					for(int i=0; i<AppConstants.TOTAL_FUNCTIONS.getCount(); i++) { 
-						IdNameValue tValue = AppConstants.TOTAL_FUNCTIONS.getValue(i); %>
-				<option value="<%= tValue.getId() %>"<%= (colTotalRow.startsWith(tValue.getId()))?" selected":"" %>><%= tValue.getName() %>
-			<%  	}	// for
-				} // if  
-			%>
-			</select></font></td>
-	</tr>
-<%	}	// if(isCrossTab) 
-%>
-<% if(isSQLBased) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>&nbsp; </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<input type="Checkbox" name="no_parse_date" value="Y"<%= (isEdit&&rdef.getColumnNoParseDateFlag(currColumn))?" checked":"" %>>
-			Do not attempt to parse values as date</font></td>
-	</tr>
-<% } %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-<%	if(isCrossTab) {
-		/*if(rdef.getCrossTabColColumns().size()>0) { 
-			// Col headings column already defined
-		}*/ %>
-		
-	if(document.forma.crossTabValue.options[document.forma.crossTabValue.selectedIndex].value=="<%= AppConstants.CV_VALUE %>") {
-<%		DataColumnType valueCol = rdef.getCrossTabValueColumn();
-		if((valueCol!=null)&&((currColumn==null)||(! currColumn.getColId().equals(valueCol.getColId())))) { 
-			// Report data column already defined 
-%>
-		alert("There is a column already designated for the report values.\nYou cannot have more than one column for that purpose.\nPlease change the Column Usage in Cross-Tab.");
-		document.forma.crossTabValue.focus();
-		
-		return false;
-<%		} else if(! isSQLBased) { %>
-		if(document.forma.exprFormula.selectedIndex==0) {
-			alert("The column designated for the report values must be an expression.\nPlease change the Column Type and select Expression.");
-			document.forma.exprFormula.focus();
-			
-			return false;
-		}
-<%		} %>
-	} else {
-		verifyCrossTabDrillDown();
-		verifyCrossTabSemaphore();
-	}
-<%	} %>
-
-if(document.forma.displayWidth!=null && document.forma.displayWidth.options.selectedIndex == 0) {
-	if(!checkNonNegativeInteger(document.forma.displayWidth.options[document.forma.displayWidth.options.selectedIndex].text)) {
-		alert("Please enter positive number greater than 1% in \"Display Width\". No Characters are allowed.");
-		return false;
-	} else {
-/*				if(eval(document.forma.displayWidth.options[document.forma.displayWidth.options.selectedIndex].text) < 10) {
-			alert("Please enter positive number less than 10% in \"Desired Container Height\". No Characters are allowed.");
-			return false;
-		}
-*/				
-		if(eval(document.forma.displayWidth.options[document.forma.displayWidth.options.selectedIndex].text) > 100) {
-			alert("Please enter positive number less than 100% in \"Display Width\". No Characters are allowed.");
-			return false;
-		}
-		document.forma.displayWidth.options[document.forma.displayWidth.options.selectedIndex].value=document.forma.displayWidth.options[document.forma.displayWidth.options.selectedIndex].text;
-	}
-}
-
-	if(document.forma.displayName.value=="")
-	<% if(isEdit) { %>
-		document.forma.displayName.value = "<%= currColumn.getDisplayName() %>";
-	<% } else { %>
-		document.forma.displayName.value = document.forma.tableName.options[document.forma.tableName.selectedIndex].text.substr(document.forma.tableName.options[document.forma.tableName.selectedIndex].text.indexOf('.')+1);
-	<% } %>
-
-<% if(reportCols.size()>0) { %>
-	if(false
-<% 		for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-		    DataColumnType dc = (DataColumnType) iter.next();
-			
-			if(! (isEdit&&dc.getColId().equals(currColumn.getColId()))) { %>
-			    ||(document.forma.displayName.value=="<%= dc.getDisplayName() %>")
-<% 		    }
-		} %>
-	   ) {
-		alert("A column with display name "+document.forma.displayName.value+" already exists.\nPlease select another name.");
-		document.forma.displayName.focus();
-		document.forma.displayName.select();
-		
-		return false;
-	}
-<% } %>
- 
-	return true;
-}   // dataValidate
-//-->
-showDisplayFormats();
-showImageOptions();
-</script> 
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-	private String getRequestParam(String s) {
-		if(nvl(s).equals("")) return s;
-		else {
-			String requestParam="";
-			int pos = 0;
-			int iCnt = 0;
-			while(s.indexOf("#",pos)!=-1) {
-				iCnt++;
-				if(iCnt>1) requestParam += "|";
-				pos = s.indexOf("#",pos)+1;
-				requestParam += s.substring(s.indexOf("#")+1,s.indexOf("]",pos));
-			}
-			return requestParam;
-		}
-
-	} 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_list.jsp
deleted file mode 100644
index 454cf7d5..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_list.jsp
+++ /dev/null
@@ -1,157 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED);    
-%>
-<table class=mTAB width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=<%= isSQLBased?"5":"7" %> valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="58%"><b class=rtableheader>Column</b></td>
-<% if(isSQLBased) { %>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>ID</b></td>
-	<% if(isCrossTab) { %>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Cross-Tab Usage</b></td>
-	<% } %>
-		<td align="center" valign="Middle" width="7%"<%= isCrossTab?"":" colspan=2" %>><b class=rtableheader>Edit</b></td>
-<% } else { %>
-	<% if(isCrossTab) { %>
-		<td align="center" valign="Middle" width="14%" colspan=2><b class=rtableheader>Cross-Tab Usage</b></td>
-	<% } else { %>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>Group By</b></td>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>Visible</b></td>
-	<% } %>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>Re-order</b></td>
-		<td align="center" valign="Middle" width="14%" colspan=2 nowrap>
-	<% if(isCrossTab) { %>
-			<input type="button" class=button value="Add" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit();">
-	<% } else { %>
-			<table border="0" cellspacing="0" cellpadding="0"><tr>
-				<td height="28"><input type="button" class=button value="Add One" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit()"></td>
-			</tr><tr>
-				<td height="28"><input type="button" class=button value="Add Multiple" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_MULTI %>';document.forma.submit()"></td>
-			</tr><tr>
-				<td height="28"><input type="button" class=button value="Re-order All" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ORDER_ALL %>';document.forma.submit()"></td>
-			</tr></table>
-	<% } %>
-		</td>
-<% } %>
-	</tr>
-<%	int iCount = 0;
-	boolean visibleColExist = false;
-	boolean rowColExist = false;
-	boolean colColExist = false;
-	boolean valColExist = false;
-	List reportCols = rdef.getAllColumns();
-	for(Iterator iter=reportCols.iterator(); iter.hasNext(); iCount++) { 
-		DataColumnType dct = (DataColumnType) iter.next();
-		if(dct.isVisible())
-			visibleColExist = true;
-		if(nvl(dct.getCrossTabValue()).equals(AppConstants.CV_ROW))
-			rowColExist = true;
-		if(nvl(dct.getCrossTabValue()).equals(AppConstants.CV_COLUMN))
-			colColExist = true;
-		if(nvl(dct.getCrossTabValue()).equals(AppConstants.CV_VALUE))
-			valColExist = true; %>
-	<tr class=<%=(iCount % 2 == 0)?"rowalt1":"rowalt2"%>>
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %><!--dct.getOrderSeq(): <%= dct.getOrderSeq() %>--></font></td>
-		<td><font class=rtabletext><%= dct.getDisplayName() %></font></td>
-<% if(isSQLBased) { %>
-		<td align="center"><font class=rtabletext><%= dct.getColId() %></font></td>
-	<% if(isCrossTab) { %>
-		<td align="center"><font class=rtabletext><%= nvl(rdef.getCrossTabDisplayValue(dct), "&nbsp;") %></font></td>
-	<% } %>
-		<td align="center"<%= isCrossTab?"":" colspan=2" %>><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.getElementById('<%= AppConstants.RI_WIZARD_ACTION %>').value='<%= AppConstants.WA_MODIFY %>'; document.getElementById('<%= AppConstants.RI_DETAIL_ID %>').value='<%= dct.getColId() %>'; document.forma.submit();"></td>
-<% } else { %>
-	<% if(isCrossTab) { %>
-		<td align="center" colspan=2><font class=rtabletext><%= nvl(rdef.getCrossTabDisplayValue(dct), "&nbsp;") %></font></td>
-	<% } else { %>
-		<td align="center"><font class=rtabletext><%= dct.isGroupBreak()?"Yes":"&nbsp;" %></font></td>
-		<td align="center"><font class=rtabletext><%= dct.isVisible()?"Yes":"No" %></font></td>
-	<% } %>
-		<td align="center" nowrap>
-	<%		if(iCount==0) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankdown.gif" width="25" height="7">
-	<%		} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columnup.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_UP %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>';">
-	<%		} %>
-	<%		if(iCount==reportCols.size()-1) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankup.gif" width="25" height="7">
-	<%		} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columndown.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_DOWN %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>';">
-	<%		} %>
-		</td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_EDIT %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>'; document.forma.submit();"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove column <%= dct.getDisplayName() %>?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>'; document.forma.submit();}"></td>
-<% } %>
-	</tr>
-<%	} %>
-<%	if(iCount==0) { %>
-	<tr class=rbg2>
-		<td colspan=<%= isSQLBased?"5":"7" %> align="center" height="30"><font class=rtabletext>No columns defined</font></td>
-	</tr>
-<%	} %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-<% if(isCrossTab) { 
-		if(! rowColExist) { %>
-		alert("You must have at least one column used for cross-tab row headings in the report.\nPlease add a column.");
-		return false;
-	<% } else if(! colColExist) { %>
-		alert("You must have at least one column used for cross-tab column headings in the report.\nPlease add a column.");
-		return false;
-	<% } else if(! valColExist) { %>
-		alert("You must have at least one column used for cross-tab report values in the report.\nPlease add a column.");
-		return false;
-	<% } else { %>
-		return true;
-	<% } 
-	} else { 
-		if(visibleColExist) { %>
-		return true;
-	<% } else { %>
-		alert("You must have at least one visible column in the report.\nPlease add a column.");
-		return false;
-	<% } 
-	} %>
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_order_all.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_order_all.jsp
deleted file mode 100644
index fc1870c6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_columns_order_all.jsp
+++ /dev/null
@@ -1,88 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED);    
-%>
-
-<table width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=4 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="65%"><b class=rtableheader>Column</b></td>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Re-order To<br>Position</b></td>
-	</tr>
-<%  int icnt = 0;
-	for(Iterator iter=rdef.getAllColumns().iterator(); iter.hasNext(); icnt++) { 
-		DataColumnType dct = (DataColumnType) iter.next(); %>
-	<tr<%= (icnt%2==0)?" class=rbg8":"" %>>
-		<td align="center" height="30"><font class=rtabletext><%= icnt+1 %></font></td>
-		<td><font class=rtabletext><%= dct.getDisplayName() %></font></td>
-		<td align="center" valign="middle">
-			<input type="hidden" name="colId" value="<%= dct.getColId() %>">
-			<input type="text" size="5" maxlength="5" name="colOrder" value="<%= dct.getOrderSeq() %>">
-		</td>
-	</tr>
-<%	}   // for 
-%>
-</table>
-			<input type="hidden" name="colOrder" value="">
-			<input type="hidden" name="colOrder" value="">
-<br>
-
-<script language="JavaScript">
-<!--
-var colNames = new Array(<%= rdef.getAllColumns().size() %>);
-<%	for(int i=0; i<rdef.getAllColumns().size(); i++) { 
-		DataColumnType dct = (DataColumnType) rdef.getAllColumns().get(i); %>
-colNames[<%= i %>] = "<%= dct.getDisplayName() %>";
-<%	} %>
-
-function dataValidate() {
-	var val = "";
-	for(var i=0; i<document.forma.colOrder.length; i++) {
-		val = document.forma.colOrder[i].value;
-		if(val!="")
-			if(! checkPositiveInteger(val)) {
-				alert("Order Position for column "+colNames[i]+" should be a positive integer.\nPlease enter a valid value.");
-				document.forma.colOrder[i].focus();
-				document.forma.colOrder[i].select();
-				
-				return false;
-			}	// if
-	}	// for
-	
-	return true;
-}   // dataValidate
-//-->
-</script>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_data_forecasting.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_data_forecasting.jsp
deleted file mode 100644
index 33cabe7e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_data_forecasting.jsp
+++ /dev/null
@@ -1,184 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="java.text.SimpleDateFormat"%>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	//boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-	String dependsOnHelp = "Custom SQL can be defined";
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED_DATAMIN); 
-	
-	String classifiers = nvl(rdef.getClassifier()); 
-	System.out.println(classifiers);
-	List reportCols     = rdef.getAllColumns();
-	
- 	String dateAttrColId = null;
- 	DataColumnType dct = null;
- 	
-	HashMap<String, DataColumnType> unusedNumColsMap = new HashMap<String,DataColumnType>();
-	int  numColsCount = 0;
-	Iterator iter = null;
-	
-	for(iter=reportCols.iterator(); iter.hasNext(); ) { 
-		dct = (DataColumnType) iter.next();
-		
-		if(nvl(dct.getDataMiningCol()).equals(AppConstants.DM_DATE_ATTR))
-			dateAttrColId = dct.getColId();
-		
-		if(isSQLBased||nvl(dct.getColType()).equals(AppConstants.CT_NUMBER)) {
-			numColsCount++;
-			if(nvl(dct.getDataMiningCol()).length()==0)
-				unusedNumColsMap.put(dct.getColId(), dct);
-		}	// if
-	}
-	
-    String[] fmt   = { "Default", "MM/DD/YYYY", "MM/YYYY", "DD-MON-YYYY", "Month DD, YYYY", "Month, YYYY" };
-%>
-
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 align="right" width="10%" height="30"><font class=rtabletext>Classifiers: </font></td>
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="classifiers">
-				<option value="" <%= classifiers.equals("")?" selected":"" %>>--- Choose Classifiers ---
-				<option value="<%= AppConstants.DM_SVM_CLASSIFIER%>"   <%= classifiers.equals(AppConstants.DM_SVM_CLASSIFIER)?" selected":"" %>>SMOreg
-				<option value="<%= AppConstants.DM_GAUSSIAN_CLASSIFIER%>"   <%= classifiers.equals(AppConstants.DM_GAUSSIAN_CLASSIFIER)?" selected":"" %>>Gaussian Process
-			</select></font>
-	    </td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Date Attribute: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="timeAttribute">
-			<%	for(iter=reportCols.iterator(); iter.hasNext(); ) { 
-					dct = (DataColumnType) iter.next(); %>
-				<option value="<%= dct.getColId() %>"<%= nvl(dateAttrColId /*, firstColId*/).equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-			<%	} %>
-			</select></font></td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Date Format: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="timeFormat">
-			<%	for(int i=0; i<fmt.length; i++) { %>
-				<option value="<%= fmt[i].equals("N/A")?"":fmt[i] %>"<%= (nvl(rdef.getForecastingTimeFormat()).equals(fmt[i].toUpperCase()))?" selected":"" %>><%= fmt[i] %>
-			<%  } %>
-			</select>
-         </font></td>
-	</tr>
-	
-	
-		<tr>
-		<td class=rbg2 align="center" colspan="2" height="30"><font class=rtabletext>Forecasting Column:</font></td> 
-		</tr>
-		
-		<%	for(iter=reportCols.iterator(); iter.hasNext(); ) { 
-				dct = (DataColumnType) iter.next();
-				if(!nvl(dct.getDataMiningCol()).equals(AppConstants.DM_DATE_ATTR) ) {
-				
-		%>
-		<tr>
-		<td class=rbg3 align="right" width="50%"><font class=rtabletext>
-		     
-		          <% if (! unusedNumColsMap.containsKey(dct.getColId()) ) { %>
-		              <% if (!dct.getDataMiningCol().equals(AppConstants.DM_DATE_ATTR)) %>
-					<input name="forecastCol" type="checkbox" value="<%=dct.getColId() %>" checked></font></td><td class=rbg3 align="left"> <%=dct.getColName() %> </td>
-				  <% } else if(isSQLBased||nvl(dct.getColType()).equals(AppConstants.CT_NUMBER)) { %>
-				  	<input name="forecastCol" type="checkbox" value="<%=dct.getColId() %>"></font></td> <td class=rbg3 align="left"> <%=dct.getColName() %> </td>
-				  <% } %>	
-					 	   
-			 		 
-			
-			</tr>
-			 <% } %>
-			<% }  %>
-
-	 <tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Forecasting Period: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="forecastingPeriod" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="-1" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="2"<%=  (rdef.getForecastingPeriod()==2 )?" selected":"" %>>2
-				<option value="4"<%=  (rdef.getForecastingPeriod()==4 )?" selected":"" %>>4
-				<option value="6"<%=  (rdef.getForecastingPeriod()==6 )?" selected":"" %>>6
-				<option value="8"<%=  (rdef.getForecastingPeriod()==8)?" selected":"" %>>8
-				<option value="10"<%= (rdef.getForecastingPeriod()==10)?" selected":"" %>>10
-				<option value="20"<%= (rdef.getForecastingPeriod()==20)?" selected":"" %>>20
-				<option value="25"<%= (rdef.getForecastingPeriod()==25)?" selected":"" %>>25
-				<option value="30"<%= (rdef.getForecastingPeriod()==30)?" selected":"" %>>30
-			</select>
-		</td>
-	</tr>						
-
-</table>
-
-<script language="JavaScript">
-	function dataValidate() {
-		return true;
-	}   // dataValidate
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-    private boolean isNumber(String value) { // As per Raptor def, like
-
-        // -$3,270.56
-        value = value.trim();
-    	if(value.length()>2) return false;
-        for (int i = 0; i < value.length(); i++) {
-            char c = value.charAt(i);
-            if (!(Character.isDigit(c) || c == '.' || c == '-' || c == '+' || c == ','
-                    || c == '$' || c == '%'))
-                return false;
-        } // for
-
-        return true;
-    } // isNumber
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_definition.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_definition.jsp
deleted file mode 100644
index ec61e3fd..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_definition.jsp
+++ /dev/null
@@ -1,1122 +0,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.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_definition.jsp
- Use : Shows edit page of the meta information of the report. 
- 
- Change Log
- ==========
- 
- 14-Jul-2009 : Version 8.4 (Sundar); 
- 				
- 				<UL> 
- 				<LI> Schedule functionality is available for Dashboard.</LI>
- 				</UL>
---%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Map" %>
-<%@ page import="java.util.Set" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.Reports"%>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	HashMap hashMap = ReportLoader.loadReportsToAddInDashboard(request);
-	Set mapSet = hashMap.entrySet();
-	Map.Entry me;
-	
-	HashMap pdfImgMap = ReportLoader.loadPDFImgLookUp();
-%>
-<% /*boolean displayAdditionalFields = AppUtils.getRequestNvlValue(request, "showAdditionalFields").equals("Y")||
-										AppUtils.getRequestNvlValue(request, "additionalFieldsShown").equals("Y")||
-										rdef.isRuntimeColSortDisabled()||
-										rdef.isDisplayOptionHideForm()||
-										rdef.isDisplayOptionHideChart()||
-										rdef.isDisplayOptionHideData()||
-										rdef.isDisplayOptionHideBtns()||
-										(rdef.getNumFormColsAsInt()>1)||
-										(nvl(rdef.getReportTitle()).length()>0)||
-										(nvl(rdef.getReportSubTitle()).length()>0)||
-										(nvl(rdef.getReportHeader()).length()>0)||
-										(nvl(rdef.getReportFooter()).length()>0); */%>
-										
-										
-<% 
-   boolean displayDashboard =  false;
-   /*displayDashboard = 	AppUtils.getRequestNvlValue(request, "showDashboardOptions").equals("Y")||
-					  	AppUtils.getRequestNvlValue(request, "dashboardOptionsShown").equals("Y")||
-					  	rdef.isDashboardOptionHideBtns()||
-						rdef.isDashboardOptionHideChart()||
-						rdef.isDashboardOptionHideData();
-   */
-   //displayDashboard = 	AppUtils.getRequestNvlValue(request, "showDashboardOptions").equals("Y");
-   boolean dashboard = rdef.isDashboardType();
-   //if(AppUtils.getRequestNvlValue(request, "showDashboardOptions").length()>0) dashboard=displayDashboard;
-%>	
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/script.js"></script>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/editabledropdown.js"></script>
-
-<script type="text/javascript" language="JavaScript">
-<!-- Copyright 2006,2007 Bontrager Connection, LLC
-// http://bontragerconnection.com/ and http://willmaster.com/
-// Version: July 28, 2007
-var cX = 0; var cY = 0; var rX = 0; var rY = 0;
-function UpdateCursorPosition(e){ cX = e.pageX; cY = e.pageY;}
-function UpdateCursorPositionDocAll(e){ cX = event.clientX; cY = event.clientY;}
-if(document.all) { document.onmousemove = UpdateCursorPositionDocAll; }
-else { document.onmousemove = UpdateCursorPosition; }
-function AssignPosition(d) {
-if(self.pageYOffset) {
-	rX = self.pageXOffset;
-	rY = self.pageYOffset;
-	}
-else if(document.documentElement && document.documentElement.scrollTop) {
-	rX = document.documentElement.scrollLeft;
-	rY = document.documentElement.scrollTop;
-	}
-else if(document.body) {
-	rX = document.body.scrollLeft;
-	rY = document.body.scrollTop;
-	}
-if(document.all) {
-	cX += rX; 
-	cY += rY;
-	}
-d.style.left = (cX+10) + "px";
-d.style.top = (cY+10) + "px";
-}
-function HideContent(d) {
-if(d.length < 1) { return; }
-document.getElementById(d).style.display = "none";
-}
-function HideAllContent() {
-	var uniquearrays = new Array();
-	uniquearrays[0] = "uniquename1";
-	uniquearrays[1] = "uniquename2";
-	uniquearrays[2] = "uniquename3";
-	uniquearrays[3] = "uniquename4";
-
-	for (i=0;i<uniquearrays.length;i++)	{
- 	    document.getElementById(uniquearrays[i]).style.display = "none";
-	}
-}
-function ShowContent(d) {
-	var uniquearrays = new Array();
-	uniquearrays[0] = "uniquename1";
-	uniquearrays[1] = "uniquename2";
-	uniquearrays[2] = "uniquename3";
-	uniquearrays[3] = "uniquename4";
-	
-	for (i=0;i<uniquearrays.length;i++)	{
-	     //if(uniquearrays[i]==d) {
- 	      document.getElementById(uniquearrays[i]).style.display = "none";
- 	     //}
-	}
-if(d.length < 1) { return; }
-var dd = document.getElementById(d);
-AssignPosition(dd);
-dd.style.display = "block";
-}
-function ShowContentWAssign(d) {
-if(d.length < 1) { return; }
-var dd = document.getElementById(d);
-dd.style.display = "block";
-}
-function ReverseContentDisplay(d) {
-if(d.length < 1) { return; }
-var dd = document.getElementById(d);
-AssignPosition(dd);
-if(dd.style.display == "none") { dd.style.display = "block"; }
-else { dd.style.display = "none"; }
-}
-//var popupwin ;
-function showPreview(src)
-{
-	try{
-		
-		//if(popupwin != null){popupwin.focus();popupwin.close();}
-		/*
-	    var ww = 300, hh = 300;
-		var LeftPosition = (screen.width) ? (screen.width-ww)/2 : 0;
-		var TopPosition = (screen.height) ? (screen.height-hh)/2 : 0;
-		var popupwin = window.open ('about:blank',"fusionPopupWindow","menubar=0,resizable=0,height="+hh+",width="+ww+",top="+TopPosition+",left="+LeftPosition+",scrollbars=yes");
-	
-		
-		popupwin.document.write('<html><body align=center>');
-		popupwin.document.write('<style>table{border-width:thin; border-color:black}');
-		popupwin.document.write('</style>');
-		
-		popupwin.document.write($('dashboardPreview').value);
-		popupwin.document.write('</body></html>');
-		
-		popupwin.document.title = 'Preview';
-		popupwin.focus();
-                */
-
-		if($('PreviewButton').value == 'Preview')
-		{
-		$('tempHidden').innerHTML = $('editingArea').innerHTML;
-
-		$('editingArea').innerHTML = $('dashboardPreview').value;
-
-		$('PreviewButton').value = 'Edit';
-		}else if($('PreviewButton').value == 'Edit')
-		{
-			$('editingArea').innerHTML = $('tempHidden').innerHTML;
-			$('PreviewButton').value = 'Preview';
-
-		}
-	}catch(e){alert(e.message);}
-    return false;
-
-}
-
-function insertAtCursor(myField, myValue) {
-	  //IE support
-	  if (document.selection) {
-	    myField.focus();
-	    sel = document.selection.createRange();
-	    sel.text = myValue;
-	  }
-	  //MOZILLA/NETSCAPE support
-	  else if (myField.selectionStart || myField.selectionStart == '0') {
-	    var startPos = myField.selectionStart;
-	    var endPos = myField.selectionEnd;
-	    myField.value = myField.value.substring(0, startPos)
-	                  + myValue
-	                  + myField.value.substring(endPos, myField.value.length);
-	  } else {
-	    myField.value += myValue;
-	  }
-	}
-
-
-function udpateTemplate(val)
-{
-	$('dashboardPreview').value = layoutTemplates[val];
-}
-function addType(type)
-{
-	try{
-
-	//alert($('dashboardTemplateReports').selectedIndex);
-	
-	if($('dashboardTemplateReports').selectedIndex == 0){ return; }
-
-	insertAtCursor($('dashboardPreview'),'['+type+'#'+$('dashboardTemplateReports').value+']');
-		
-	}catch(e){alert(e.message);}
-	return false;
-}
-var layoutTemplates = {
-		"empty": " ",
-		"2x2": "<table border=1 width='100%' height='100%'><tr><td>[Report]</td><td>[Report]</td></tr><tr><td>[Report]</td><td>[Report]</td></tr></table>",
-		"2x1": "<table border=1 width='100%' height='100%'><tr><td>[Report]</td></tr><tr><td>[Report]</td></tr></table>",
-		"1x2": "<table border=1 width='100%' height='100%'><tr><td>[Report]</td><td>[Report]</td></tr></table>",
-		"3x1": "<table border=1  width='100%' height='100%'><tr><td>[Report]</td></tr><tr><td>[Report]</td></tr><tr><td>[Report]</td></tr></table>",
-		"custom1": "<table border=1  width='100%' height='100%'><tr><td colspan='2'>[Report]</td></tr><tr><td>[Report]</td><td>[Report]</td></tr></table>",
-		"custom2": "<table border=1  width='100%' height='100%'><tr rowspan='2'><td>[Report]</td></tr><tr><td>[Report]</td><td>[Report]</td></tr></table>",
-		"custom3": "<table border=1  width='100%' height='100%'><tr><td>[Report]</td></tr><tr><td>[Report]</td></tr></table>"
-}
-//-->
-</script>
-<script type="text/javascript">
-	function show(object,val) {
-		document.getElementById(object).style.visibility = val;
-	}
-</script>
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<% if(nvl(rdef.getReportID()).length()>0 && (! rdef.getReportID().equals("-1"))) { %>
-	<tr>
-		<td class=rbg2 height="30" align="right" width="35%">
-			<font class=rtabletext>Report ID: </font>
-		</td> 
-		<td align="left" width="65%" class=rbg3>
-			<font class=rtabletext><%= rdef.getReportID() %></font>
-		</td>
-	</tr> 
-		<% } %>
-	<tr>
-		<td class=rbg2 height="30" align="right" width="35%" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;">
-			<font class=rtabletext>Report Name: </font>
-		</td> 
-		<td align="left" width="65%" class=rbg3>
- 			<input type="text" class="rtabletext" size="40" style="width: 200px;" maxlength="100" id="reportName" name="reportName" value="<%= (nvl(AppUtils.getRequestNvlValue(request, "reportName")).length() > 0)? 
-			(!(AppUtils.getRequestNvlValue(request, "reportName").equals(rdef.getReportName()))?
-                            AppUtils.getRequestNvlValue(request, "reportName"):rdef.getReportName()):
-                                 rdef.getReportName() %>">
-		</td>
-	</tr> 
-	<input type="hidden" name="folder_id" 
-			   value="<%= (nvl(AppUtils.getRequestNvlValue(request, "folder_id")).length() > 0)? 
-					     (!(AppUtils.getRequestNvlValue(request, "folder_id").equals(rdef.getFolderId()))?
-					    		  AppUtils.getRequestNvlValue(request, "folder_id"):rdef.getFolderId()):
-					    			  rdef.getFolderId() %>">
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Report Description: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="reportDescr" class="rtabletext" style="width: 200px;" cols="40" rows="3"><%= (nvl(AppUtils.getRequestNvlValue(request, "reportDescr")).length() > 0)? 
-					     (!(AppUtils.getRequestNvlValue(request, "reportDescr").equals(rdef.getReportDescr()))?
-					    		  AppUtils.getRequestNvlValue(request, "reportDescr"):rdef.getReportDescr()):
-                                                              rdef.getReportDescr() %></textarea>
-		</td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Report Type </font>
-		</td> 
-		<td class=rbg3 align="left">
-		<% if(nvl(rdef.getReportType()).length()>0) { %>
-			<font class=rtabletext><%= rdef.getReportType().equals(AppConstants.RT_LINEAR)?"Linear":(rdef.getReportType().equals(AppConstants.RT_CROSSTAB)?"Cross-tab":(rdef.getReportType().equals(AppConstants.RT_DASHBOARD)?"Dashboard":rdef.getReportType())) %></font>
-			<input type="hidden" id="reportType"  name="reportType" value="<%= rdef.getReportType() %>">
-		<% } else { %>
-			<select id="reportType"  name="reportType" style="width: 200px;" onChange="document.forma.<%= AppConstants.RI_GO_TO_STEP %>.value='<%= rdef.getWizardSequence().getCurrentStep() %>'; document.forma.submit();">
-			    <option value="-1"> Select Type </option>
-				<option value="<%= AppConstants.RT_LINEAR %>" <%= AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_LINEAR) ? " selected":"selected" %>> Linear </option>
-<!-- 				<option value="<%= AppConstants.RT_CROSSTAB %>"<%= AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_CROSSTAB) ? " selected":"" %>> Cross-tab </option>
-				<option value="<%= AppConstants.RT_DASHBOARD %>"<%= AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_DASHBOARD) ? " selected":"" %>> Dashboard </option>
-				<option value="<%= AppConstants.RT_HIVE %>"<%= AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_HIVE) ? " selected":"" %>> Hive Based Report </option>				
- -->								
-			</select>
-		<% } %>
-		</td>
-	</tr>
-	<% if((AppUtils.getRequestNvlValue(request, "reportType").length() > 0) || (rdef.getReportType().length() > 0)) { %>
-	<!-- Dashboard Begin -->
-    <% if (AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_DASHBOARD) || rdef.getReportType().equals(AppConstants.RT_DASHBOARD))  { %>
-	<tr>
-		<td class=rbg2 height="30" align="right"><font class=rtabletext>Select HTML Template:</font></td>
-		<td><select id="dashboardTemplate" style="width: 200px;" name="dashboardTemplate" onchange="return udpateTemplate(this.value);">
-			<option value="empty">-- select --</option>
-			<option value="2x2">2 Rows x 2 Columns</option>
-			<option value="2x1">2 Rows x 1 Column</option>
-			<option value="1x2">1 Row x 2 Columns</option>
-			<option value="3x1">3 Rows x 1 Column</option>
-			<option value="custom1">2 Rows with 1st Row with 1 column and 2nd Row with 2 Columns</option>
-			<option value="custom2">2 Rows with 1st Column expanded to 2 rows</option>
-			<option value="custom3">Hybrid Layout</option>
-		</select></td>
-	</tr>       
-       <tr>
-		<td class=rbg2 height="30" align="right"><font class=rtabletext>Dashboard HTML:</font></td>
-
-		<td>
-		<div id='editingArea' style="width: 600px; height: 200px; overflow: none">
-		<textarea id='dashboardPreview' name="dashboardLayoutHTML" style="width: 200px; height: 100%">
-                 <% if(rdef != null && nvl(rdef.getDashboardLayoutHTML()).length()>0 ) {%><%= rdef.getDashboardLayoutHTML().trim() %><%} %>
-                 </textarea></div>
-		<div id='tempHidden' style="display: none;"></div>
-		<br/><select name="dashboardTemplateReports">
-			<option value="-1" selected>-->select report <--</option>
-			<%
-				for (Iterator iter = mapSet.iterator(); iter.hasNext();) {
-							me = (Map.Entry) iter.next();
-			%>
-			<%
-				if (rdef != null && rdef.getDashBoardReports() != null && (rdef.getDashBoardReports().getReportsList().get(0) != null)
-									&& (((Reports) rdef.getDashBoardReports().getReportsList().get(0)).getReportId().equals((String) me.getKey()))) {
-			%>
-			<option value="<%=(String) me.getKey()%>" selected><%=(String) me.getValue()%></option>
-			<%
-				} else {
-			%>
-			<option value="<%=(String) me.getKey()%>"><%=(String) me.getValue()%></option>
-			<%
-				}
-			%>
-			<%
-				}
-			%>
-		</select>
-		&nbsp;<input type="button" class='button' onclick="return addType();" value='Insert Report Id' />
-		&nbsp;<input id='PreviewButton' style="width: 100px" type='button' class='button' value="Preview" onclick="return showPreview(this);" />
-		<br />
-		</td>
-	</tr>
-    
- 	   
-  	   <!-- Dashboard Ends -->
-  <% } else {  %>		  
-
-	
-		<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Data Source:</font>
-		</td> 
-		<td align="left" class=rbg3>
-		  <% 
-			 org.openecomp.portalsdk.analytics.util.RemDbInfo remDbInfo = new org.openecomp.portalsdk.analytics.util.RemDbInfo();
-			 HashMap remDbMap = remDbInfo.getDbHash();
-		  
-		  %>
-		  <% if (dbInfo != null && dbInfo.length()>0 && !dbInfo.equalsIgnoreCase("null") && !remDbMap.isEmpty()) { %>
-			         <font class=rtabletext><%= (AppUtils.nvl(remDbInfo.getDesc(dbInfo)).length()>0)?remDbInfo.getDesc(dbInfo):" No Desc " %></font>
-          <%
-		  }
-		  else { 
-		  %>
-		  <%-- dbInfo.equals(AppConstants.DB_PROD)? "selected":""  --%>
-		  <select id = "selectDS" name="dataSource" style="width: 200px;">
-		  <%
-		        if(!remDbMap.isEmpty()) {
-				for( Iterator itr=remDbMap.entrySet().iterator(); itr.hasNext(); ) {
-					Map.Entry e = (Map.Entry)itr.next();
-					String prefix = (String)e.getKey();
-					String desc = (String)e.getValue();
-           %>
-  				    <option value='<%= prefix %>' 
-  				     <% if(prefix.equals(nvl(AppUtils.getRequestNvlValue(request, "dataSource")))) { %>
-  				      <%=(nvl(AppUtils.getRequestNvlValue(request, "dataSource")).length()>0?
-  				    		  (
-  				    		   prefix.equals(nvl(AppUtils.getRequestNvlValue(request, "dataSource")))?"selected ":
-  				    				(prefix.equals(AppConstants.DB_LOCAL)?"selected ":"")
-  				    		   )
-  				    			:prefix.equals(AppConstants.DB_LOCAL)?"selected ":"")%>
-  				    <% } %>		
-	    				><%= desc%>
-		   <%
-				}
-		        
-		  %>
-           <% } else { %>
-		       <option value='<%= AppConstants.DB_LOCAL%>' selected>Default
-		   <% } %>
-		   
-			</select>
-		   <% if(!remDbMap.isEmpty() && nvl(AppUtils.getRequestNvlValue(request, "dataSource")).length() <= 0){ %>
-		         <script language="Javascript">
-		           var selectDS = document.getElementById("selectDS");
-		           var flag = 0;
-		           for (i = selectDS.length - 1; i>=0; i--) {
-                     if (selectDS.options[i].selected) {
-                        flag = 2;
-                        break;
-                     }
-                   }
-                   if(flag==2) {
-                    for (i = selectDS.length - 1; i>=0; i--) {
-                      if(selectDS.options[i].value == '<%= AppConstants.DB_LOCAL%>' ){
-                        selectDS.options[i].selected = true;
-                      }
-                    } 
-                   }
-		         </script>
-		       
-		   <% } %>
-			
-       <% } %>
-		</td>
-	</tr> 
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Form Help Text: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="formHelp" style="width: 200px;" cols="40" rows="3"><%=rdef.getFormHelpText()%></textarea>
-		</td>
-	</tr>
-
-	<% if(Globals.getAllowSQLBasedReports()||AppUtils.isAdminUser(request)) { %>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Report Definition: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<font class=rtabletext>
-			<% if(rdef.getReportDefType().length()>0) { %>
-				<%= rdef.getReportDefType().equals(AppConstants.RD_VISUAL)?"Visual":(rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED)?"SQL-based":rdef.getReportDefType()) %>
-			<% } else { %>
-				<!-- <input type=radio name="reportDefType" value="<%= AppConstants.RD_VISUAL %>" <%= AppUtils.getRequestNvlValue(request, "reportDefType").equals(AppConstants.RD_VISUAL)?" checked": ((AppUtils.getRequestNvlValue(request, "reportDefType").length()<=0)?" checked":"") %>>Visual -->
-				<input type=radio name="reportDefType" checked value="<%= AppConstants.RD_SQL_BASED %>" <%= AppUtils.getRequestNvlValue(request, "reportDefType").equals(AppConstants.RD_SQL_BASED) ? " checked":"" %>>SQL-based
-				<!-- <input type=radio name="reportDefType" value="<%= AppConstants.RD_SQL_BASED_DATAMIN %>" <%= AppUtils.getRequestNvlValue(request, "reportDefType").equals(AppConstants.RD_SQL_BASED_DATAMIN) ? " checked":"" %>>Data Forecasting -->
-			<% } %>
-			</font>
-		</td>
-	</tr>
-	<% }	// if 
-	%>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Page Size: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="pageSize" style="width: 200px;" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="10"<%=  (rdef.getPageSize()==10 )?" selected":"" %>>10
-				<option value="25"<%=  (rdef.getPageSize()==25 )?" selected":"" %>>25
-				<option value="50"<%=  (rdef.getPageSize()==50 )?" selected":"" %>>50
-				<option value="100"<%= (rdef.getPageSize()==100)?" selected":"" %>>100
-				<option value="500"<%= (rdef.getPageSize()==500)?" selected":"" %>>500
-				<% if(rdef.getPageSize()!=10 && rdef.getPageSize()!=20 && rdef.getPageSize()!=50
-				     && rdef.getPageSize()!=100 && rdef.getPageSize()!=500) {
-				%>
-				<option value="<%=rdef.getPageSize()%>" selected><%=rdef.getPageSize()%></option> <!-- This is the Editable Option -->
-                <%				
-					 } 
-                %>						
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Display Area: </font>
-		</td> 
-		<td class=rbg3 align="left" valign="top" nowrap>
-			<select name="menuID" size="3" multiple style="width: 100px;">
-			<!--  need one more blank to deselect since approval checkbox is taken out -->
-			<option value="">
-			<% for(int i=0; i<AppUtils.getQuickLinksMenuIDs().size(); i++) {
-					String qMenu = (String) AppUtils.getQuickLinksMenuIDs().get(i); %>
-				<option value="<%= qMenu %>"<%= rdef.checkMenuIDSelected(qMenu)?" selected":"" %>><%= AppUtils.getMenuLabel(qMenu) %>
-			<% }	// for 
-			%>
-			</select>
-<%-- 			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="checkbox" name="menuApproved" value="Y"<%= rdef.isMenuApproved()?" checked":"" %><%= AppUtils.isAdminUser(request)?"":" disabled onClick='checked="+(rdef.isMenuApproved()?"true":"false")+"';" %>>
-			<font class=rtabletext>Approved?</font> --%>
-		</td>
-	</tr>
-<%-- 	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Generate report in a New Window?</font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="reportInNewWindow" value="Y" 
-			<%= rdef.isReportInNewWindow()? " checked " : "" %>>	
-		</td>
-	</tr> --%>
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Hide Form fields after run?</font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="hideFormFieldsAfterRun" value="Y" 
-			<%= rdef.isHideFormFieldAfterRun()? " checked " : "" %>>	
-		</td>
-	</tr>
-
-<%-- 	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Display Folder Tree?</font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="displayFolderTree" value="Y" 
-            <%= rdef.isDisplayFolderTree()? " checked " : "" %>			
-			> 
-		</td>
-	</tr> --%>
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Max Rows in Excel/CSV Download  </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="excelDownloadSize" style="width: 80px;">
-			    <option value="500"<%=  (rdef.getMaxRowsInExcelDownload()==500 )?" selected":"" %>>500
-				<option value="1000"<%=  (rdef.getMaxRowsInExcelDownload()==1000 )?" selected":"" %>>1000
-				<option value="2000"<%=  (rdef.getMaxRowsInExcelDownload()==2000 )?" selected":"" %>>2000
-				<option value="3000"<%=  (rdef.getMaxRowsInExcelDownload()==3000 )?" selected":"" %>>3000
-				<option value="4000"<%=  (rdef.getMaxRowsInExcelDownload()==4000 )?" selected":"" %>>4000
-				<option value="5000"<%=  (rdef.getMaxRowsInExcelDownload()==5000 )?" selected":"" %>>5000
-				<option value="10000"<%=  (rdef.getMaxRowsInExcelDownload()==10000 )?" selected":"" %>>10000
-				<option value="15000"<%=  (rdef.getMaxRowsInExcelDownload()==15000 )?" selected":"" %>>15000
-				<option value="20000"<%=  (rdef.getMaxRowsInExcelDownload()==20000 )?" selected":"" %>>20000
-				<option value="25000"<%=  (rdef.getMaxRowsInExcelDownload()==25000 )?" selected":"" %>>25000
-				<option value="30000"<%=  (rdef.getMaxRowsInExcelDownload()==30000 )?" selected":"" %>>30000
-				<option value="35000"<%=  (rdef.getMaxRowsInExcelDownload()==35000 )?" selected":"" %>>35000
-				<option value="40000"<%=  (rdef.getMaxRowsInExcelDownload()==40000)?" selected":"" %>>40000
-				<option value="45000"<%=  (rdef.getMaxRowsInExcelDownload()==45000 )?" selected":"" %>>45000
-				<option value="50000"<%=  (rdef.getMaxRowsInExcelDownload()==50000)?" selected":"" %>>50000
-				<option value="65000"<%=  (rdef.getMaxRowsInExcelDownload()==65000)?" selected":"" %>>65000
-			</select>
-		</td>
-	</tr>
-	
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Columns to be Frozen: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="frozenColumns" style="width: 50px;" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="0"<%=  (rdef.getFrozenColumns()==0 )?" selected":"" %>>0
-				<option value="1"<%=  (rdef.getFrozenColumns()==1 )?" selected":"" %>>1
-				<option value="2"<%=  (rdef.getFrozenColumns()==2 )?" selected":"" %>>2
-				<option value="3"<%= (rdef.getFrozenColumns()==3)?" selected":"" %>>3
-				<option value="4"<%= (rdef.getFrozenColumns()==4)?" selected":"" %>>4
-				<% if(rdef.getFrozenColumns()!=0 && rdef.getFrozenColumns()!=1 && rdef.getFrozenColumns()!=2
-				     && rdef.getFrozenColumns()!=3 && rdef.getFrozenColumns()!=4) {
-				%>
-				<option value="<%=rdef.getFrozenColumns()%>" selected><%=rdef.getFrozenColumns()%></option> <!-- This is the Editable Option -->
-                <%				
-					 } 
-                %>						
-			</select>
-		</td>
-	</tr>
-	
-	<% if(rdef.getReportType().equals(AppConstants.RT_CROSSTAB)) { %>
-	
-				<tr>
-					<td class=rbg2 height="30" align="right">
-						<font class=rtabletext>Record # column width: </font>
-					</td> 
-					<td class=rbg3 align="left">
-						<input type="text" class="rtabletext" style="width: 100px;" size="40" maxlength="100" id="widthNo" name="widthNo" value="<%= (nvl(AppUtils.getRequestNvlValue(request, "widthNo")).length() > 0)? 
-			(!(AppUtils.getRequestNvlValue(request, "widthNo").equals(rdef.getWidthNoColumn()))?
-                            AppUtils.getRequestNvlValue(request, "widthNo"):rdef.getWidthNoColumn()):
-                            	rdef.getWidthNoColumn() %>">
-					</td>
-				</tr>
-				
-		
-	
-	<% } %>
-	
-	
-				<tr>
-					<td class=rbg2 height="30" align="right">
-						<font class=rtabletext>Data Grid Align: </font>
-					</td> 
-					<td class=rbg3 align="left">
-						<select name="dataGridAlign" style="width: 100px;">
-							<option value="left"<%=  (nvl(rdef.getDataGridAlign()).length()>0 ? (rdef.getDataGridAlign().equals("left")  ? " selected": ""):" selected ")%>> Left
-							<option value="right"<%=  (nvl(rdef.getDataGridAlign()).length()>0 ? (rdef.getDataGridAlign().equals("right")  ? " selected": ""):"")%>> Right
-							<option value="center"<%=  (nvl(rdef.getDataGridAlign()).length()>0 ? (rdef.getDataGridAlign().equals("center")  ? " selected": ""):"")%>> Center
-						
-						</select>
-					</td>
-				</tr>
-
-	<% 
-	  if(pdfImgMap.size() > 0) {
-	%>
-	
-		  <%-- dbInfo.equals(AppConstants.DB_PROD)? "selected":""  --%>
-		  <tr> 
-			<td class=rbg2 height="30" align="right">
-				<font class=rtabletext>Select logo for PDF download: </font>
-			</td> 
-			<td>		  
-		  <select id = "pdfImg" name="pdfImg" style="width: 100px;">
-		    <option value=''> <!-- SELECT --></option>
-		  <%
-		        if(!pdfImgMap.isEmpty()) {
-				for( Iterator itr=pdfImgMap.entrySet().iterator(); itr.hasNext(); ) {
-					Map.Entry e = (Map.Entry)itr.next();
-					String image_id = (String)e.getKey();
-					String image_loc = (String)e.getValue();
-           %>
-           <%
-			if (nvl(AppUtils.getRequestNvlValue(request, "pdfImg")).length()>0 && !(AppUtils.getRequestNvlValue(request, "pdfImg").equals(rdef.getPdfImg())) ) {
-				if(image_loc .equals (AppUtils.getRequestNvlValue(request, "pdfImg"))) {
-			%>
-			
-			<option value='<%= image_loc %>' selected> <%=image_id %></option>
-			<%	
-				} else {
-            %> 					
-					<option value='<%= image_loc %>'> <%=image_id %></option>
-			<%		
-           		} 
-			} else {
-				if(image_loc .equals (rdef.getPdfImg())) {
-				%>
-				
-				<option value='<%= image_loc %>' selected> <%=image_id %> </option>
-				<%	
-				
-			    } else {
-		            %> 					
-					<option value='<%= image_loc %>'> <%=image_id %></option>
-			<%		
-			    }
-			}
-           %>
-           </select>
-           </td>
-		   <% }
-		     }
-		   %>
-		  </tr>
-		 <% 
-		}
-%>
- 
-	<tr>
-		<td class=rbg2 height="30" align="right" width="35%">
-			<font class=rtabletext>Empty message: </font>
-		</td> 
-		<td align="left" width="65%" class=rbg3>
- 			<input type="text" class="rtabletext" style="width: 200px;" size="40" maxlength="100" id="emptyMessage" name="emptyMessage" value="<%= (nvl(AppUtils.getRequestNvlValue(request, "emptyMessage")).length() > 0)? 
-			(!(AppUtils.getRequestNvlValue(request, "emptyMessage").equals(rdef.getEmptyMessage()))?
-                            AppUtils.getRequestNvlValue(request, "emptyMessage"):rdef.getEmptyMessage()):
-                                 rdef.getEmptyMessage() %>">
-		</td>
-	</tr> 
- 
- <% } %>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Height of the Data Container  </font>
-		</td> 
-		<td class=rbg3 align="left">
-  		    <% if (nvl(rdef.getDataContainerHeight(), "100").equals ("auto") || nvl(rdef.getDataContainerHeight(), "100").equals ("100")) { rdef.setDataContainerHeight("100"); } %> 
-			<select name="heightContainer" style="width: 70px;" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="200" <%=  (nvl(rdef.getDataContainerHeight(),"200").equals("200"))?" selected":"" %>>200%</option> 
-				<option value="190" <%=  (nvl(rdef.getDataContainerHeight(),"190").equals("190"))?" selected":"" %>>190%</option> 
-				<option value="180" <%=  (nvl(rdef.getDataContainerHeight(),"180").equals("180"))?" selected":"" %>>180%</option> 
-				<option value="170" <%=  (nvl(rdef.getDataContainerHeight(),"170").equals("170"))?" selected":"" %>>170%</option> 
-				<option value="160" <%=  (nvl(rdef.getDataContainerHeight(),"160").equals("160"))?" selected":"" %>>160%</option> 
-				<option value="150" <%=  (nvl(rdef.getDataContainerHeight(),"150").equals("150"))?" selected":"" %>>150%</option> 
-				<option value="140" <%=  (nvl(rdef.getDataContainerHeight(),"140").equals("140"))?" selected":"" %>>140%</option> 
-				<option value="130" <%=  (nvl(rdef.getDataContainerHeight(),"130").equals("130"))?" selected":"" %>>130%</option> 
-				<option value="120" <%=  (nvl(rdef.getDataContainerHeight(),"120").equals("120"))?" selected":"" %>>120%</option> 
-				<option value="110" <%=  (nvl(rdef.getDataContainerHeight(),"110").equals("110"))?" selected":"" %>>110%</option> 
-				<option value="100" <%=  (nvl(rdef.getDataContainerHeight(),"100").equals("100"))?" selected":"" %>>100%</option> 
-				<option value="90" <%=  (nvl(rdef.getDataContainerHeight(),"90").equals("90"))?" selected":"" %>>90%</option> 
-				<option value="80" <%=  (nvl(rdef.getDataContainerHeight(),"80").equals("80"))?" selected":"" %>>80%</option> 
-				<option value="70" <%=  (nvl(rdef.getDataContainerHeight(),"70").equals("70"))?" selected":"" %>>70%</option> 
-				<option value="60" <%=  (nvl(rdef.getDataContainerHeight(),"60").equals("60"))?" selected":"" %>>60%</option> 
-				<option value="50" <%=  (nvl(rdef.getDataContainerHeight(),"50").equals("50"))?" selected":"" %>>50%</option> 
-				<option value="40" <%=  (nvl(rdef.getDataContainerHeight(),"40").equals("40"))?" selected":"" %>>40%</option> 
-				<option value="30" <%=  (nvl(rdef.getDataContainerHeight(),"30").equals("30"))?" selected":"" %>>30%</option> 
-				<option value="20" <%=  (nvl(rdef.getDataContainerHeight(),"20").equals("20"))?" selected":"" %>>20%</option> 
-				<option value="10" <%=  (nvl(rdef.getDataContainerHeight(),"10").equals("10"))?" selected":"" %>>10%</option>
-				
-				 
-				<% if(!((new Integer(nvl(rdef.getDataContainerHeight(), "100")).intValue()%10 == 0) && (new Integer(nvl(rdef.getDataContainerHeight(), "100")).intValue() <= 200)) ) {
-				%>
-				<option value="<%=rdef.getDataContainerHeight()%>" selected><%=rdef.getDataContainerHeight()%>%</option> 
-                <%				
-					 } 
-                %>						
-		</td>
-	</tr>	
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Width of the Data Container  </font>
-		</td> 
-		<td class=rbg3 align="left">
-  		    <% if (nvl(rdef.getDataContainerWidth(), "100").equals ("auto") || nvl(rdef.getDataContainerWidth(), "100").equals ("100")) { rdef.setDataContainerWidth("100"); } %> 
-			<select name="widthContainer" style="width: 70px;" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<option value="200" <%=  (nvl(rdef.getDataContainerWidth(),"200").equals("200"))?" selected":"" %>>200%</option> 
-				<option value="190" <%=  (nvl(rdef.getDataContainerWidth(),"190").equals("190"))?" selected":"" %>>190%</option> 
-				<option value="180" <%=  (nvl(rdef.getDataContainerWidth(),"180").equals("180"))?" selected":"" %>>180%</option> 
-				<option value="170" <%=  (nvl(rdef.getDataContainerWidth(),"170").equals("170"))?" selected":"" %>>170%</option> 
-				<option value="160" <%=  (nvl(rdef.getDataContainerWidth(),"160").equals("160"))?" selected":"" %>>160%</option> 
-				<option value="150" <%=  (nvl(rdef.getDataContainerWidth(),"150").equals("150"))?" selected":"" %>>150%</option> 
-				<option value="140" <%=  (nvl(rdef.getDataContainerWidth(),"140").equals("140"))?" selected":"" %>>140%</option> 
-				<option value="130" <%=  (nvl(rdef.getDataContainerWidth(),"130").equals("130"))?" selected":"" %>>130%</option> 
-				<option value="120" <%=  (nvl(rdef.getDataContainerWidth(),"120").equals("120"))?" selected":"" %>>120%</option> 
-				<option value="110" <%=  (nvl(rdef.getDataContainerWidth(),"110").equals("110"))?" selected":"" %>>110%</option> 
-				<option value="100" <%=  (nvl(rdef.getDataContainerWidth(),"100").equals("100"))?" selected":"" %>>100%</option> 
-				<option value="90" <%=  (nvl(rdef.getDataContainerWidth(),"90").equals("90"))?" selected":"" %>>90%</option> 
-				<option value="80" <%=  (nvl(rdef.getDataContainerWidth(),"80").equals("80"))?" selected":"" %>>80%</option> 
-				<option value="70" <%=  (nvl(rdef.getDataContainerWidth(),"70").equals("70"))?" selected":"" %>>70%</option> 
-				<option value="60" <%=  (nvl(rdef.getDataContainerWidth(),"60").equals("60"))?" selected":"" %>>60%</option> 
-				<option value="50" <%=  (nvl(rdef.getDataContainerWidth(),"50").equals("50"))?" selected":"" %>>50%</option> 
-				<option value="40" <%=  (nvl(rdef.getDataContainerWidth(),"40").equals("40"))?" selected":"" %>>40%</option> 
-				<option value="30" <%=  (nvl(rdef.getDataContainerWidth(),"30").equals("30"))?" selected":"" %>>30%</option> 
-				<option value="20" <%=  (nvl(rdef.getDataContainerWidth(),"20").equals("20"))?" selected":"" %>>20%</option> 
-				<option value="10" <%=  (nvl(rdef.getDataContainerWidth(),"10").equals("10"))?" selected":"" %>>10%</option>
-				
-				 
-				<% if(!((new Integer(nvl(rdef.getDataContainerWidth(), "100")).intValue()%10 == 0) && (new Integer(nvl(rdef.getDataContainerWidth(), "100")).intValue() <= 200)) ) {
-				%>
-				<option value="<%=rdef.getDataContainerWidth()%>" selected><%=rdef.getDataContainerWidth()%>%</option> 
-                <%				
-					 } 
-                %>						
-		</td>
-	</tr>	
-
- 
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Allow Schedule?  </font>
-		</td> 
-		<td class=rbg3 align="left">
-           <input type="checkbox" class ="rtabletext" size="4" name="allowSchedule" value="Y" <%=((rdef.getAllowSchedule()!=null)?(rdef.getAllowSchedule().toUpperCase().charAt(0)== 'Y' ?" checked":""): (ReportLoader.isReportsAlreadyScheduled(rdef.getReportID())?" checked":"")) %>/>
-		</td>
-	</tr>	
-
-<%--    <tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Column Multi Group?  </font>
-		</td> 
-		<td class=rbg3 align="left">
-           <input type="checkbox" class ="rtabletext" size="4" name="multiGroupColumn" value="Y" <%=(rdef.getMultiGroupColumn()!=null)?(rdef.getMultiGroupColumn().toUpperCase().charAt(0)== 'Y' ?" checked":""): "" %>/>
-		</td>
-	</tr> --%>	
-   </tr>
-
-  <% if (!(AppUtils.getRequestNvlValue(request, "reportType").equals(AppConstants.RT_DASHBOARD) || rdef.getReportType().equals(AppConstants.RT_DASHBOARD)))  { %>	
-
-<%-- 	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Render Top - Down  </font>
-		</td> 
-		<td class=rbg3 align="left">
-           <input type="checkbox" class ="rtabletext" size="4" name="topDown" value="Y" <%=(rdef.getTopDownOption()!=null)?(rdef.getTopDownOption().toUpperCase().charAt(0)== 'Y' ?" checked":""):(AppUtils.getRequestNvlValue(request, "topDown").equals("Y")?" checked":"") %>/>
-		</td>
-	</tr>	 --%>
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext> Sized By Content  </font>
-		</td> 
-		<td class=rbg3 align="left">
-           <input type="checkbox" class ="rtabletext" size="4" name="sizedByContent" value="Y" <%=(rdef.getSizedByContentOption()!=null)?(rdef.getSizedByContentOption().toUpperCase().charAt(0)== 'Y' ?" checked":""):(AppUtils.getRequestNvlValue(request, "sizedByContent").equals("Y")?" checked":"") %>/>
-		</td>
-	</tr>	
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Display Options: </font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="hideForm" value="Y"<%= rdef.isDisplayOptionHideForm()?" checked":"" %>>
-			<font class=rtabletext>Hide Form Fields</font>
-			<input type="checkbox" name="hideChart" value="Y"<%= rdef.isDisplayOptionHideChart()?" checked":"" %>>
-			<font class=rtabletext>Hide Chart</font>
-			<input type="checkbox" name="hideData" value="Y"<%= rdef.isDisplayOptionHideData()?" checked":"" %>>
-			<font class=rtabletext>Hide Report Data</font>
-			<input type="checkbox" name="hideBtns" value="Y"<%= rdef.isDisplayOptionHideBtns()?" checked":"" %>>
-			<font class=rtabletext>Hide Download Buttons</font>
-			<input type="checkbox" name="hideMap" value="Y"<%= rdef.isDisplayOptionHideMap()?" checked":"" %>>
-			<font class=rtabletext>Hide Map</font>
-			<input type="checkbox" name="hideExcelIcons" value="Y"<%= rdef.isDisplayOptionHideExcelIcons()?" checked":"" %>>
-			<font class=rtabletext>Hide Excel Icons</font>
-			<input type="checkbox" name="hidePDFIcons" value="Y"<%= rdef.isDisplayOptionHidePDFIcons()?" checked":"" %>>
-			<font class=rtabletext>Hide PDF Icons</font>
-		</td>
-	</tr>
-
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>&nbsp; </font>
-		</td> 
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="runtimeColSortDisabled" value="Y"<%= rdef.isRuntimeColSortDisabled()?" checked":"" %>>
-			<font class=rtabletext>Disable column sort at runtime?</font>
-		</td>
-	</tr>
-	
-	
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Run-time Form Number Columns: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<select name="numFormCols" style="width: 70px;">
-				<option value="1"<%= (rdef.getNumFormColsAsInt()==1)?" selected":"" %>>1
-				<option value="2"<%= (rdef.getNumFormColsAsInt()==2)?" selected":"" %>>2
-				<option value="3"<%= (rdef.getNumFormColsAsInt()==3)?" selected":"" %>>3
-				<option value="4"<%= (rdef.getNumFormColsAsInt()==4)?" selected":"" %>>4
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Report Title<br>(if blank, the Report Name will be displayed): </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="reportTitle" style="width: 200px;" cols="40" rows="3"><%= nvl(rdef.getReportTitle()) %></textarea>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Report Sub-Title: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="reportSubTitle" style="width: 200px;" cols="40" rows="3"><%= nvl(rdef.getReportSubTitle()) %></textarea>
-		</td>
-	</tr>
-<%-- 	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Page Header (HTML): </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="reportHeader" style="width: 200px;" cols="40" rows="3"><%= Utils.htmlEncode(nvl(rdef.getReportHeader())) %></textarea>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Page Footer (HTML): </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<textarea name="reportFooter" style="width: 200px;" cols="40" rows="3"><%= Utils.htmlEncode(nvl(rdef.getReportFooter())) %></textarea>
-		</td>
-	</tr> --%>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Allowed Recurrance in Schedule: </font>
-		</td> 
-		<td class=rbg3 align="left">
-			<input type="checkbox" name="isOneTimeScheduleAllowed" value="Y" <%if (rdef.getIsOneTimeScheduleAllowed() == null || rdef.getIsOneTimeScheduleAllowed().equals("Y")){ %>checked <%} %>>One Time<br>
-			<input type="checkbox" name="isHourlyScheduleAllowed" value="Y" <%if (rdef.getIsHourlyScheduleAllowed() == null || rdef.getIsHourlyScheduleAllowed().equals("Y")){ %>checked<%} %> >Hourly<br>
-			<input type="checkbox" name="isDailyScheduleAllowed" value="Y" <%if (rdef.getIsDailyScheduleAllowed() == null || rdef.getIsDailyScheduleAllowed().equals("Y")){ %>checked<%} %> >Daily<br>
-			<input type="checkbox" name="isDailyMFScheduleAllowed" value="Y" <%if (rdef.getIsDailyMFScheduleAllowed() == null || rdef.getIsDailyMFScheduleAllowed().equals("Y")){ %>checked<%} %> >Daily Monday - Friday<br>
-			<input type="checkbox" name="isWeeklyScheduleAllowed" value="Y" <%if (rdef.getIsWeeklyScheduleAllowed() == null || rdef.getIsWeeklyScheduleAllowed().equals("Y")){ %>checked<%} %> >Weekly<br>
-			<input type="checkbox" name="isMonthlyScheduleAllowed" value="Y" <%if (rdef.getIsMonthlyScheduleAllowed() == null || rdef.getIsMonthlyScheduleAllowed().equals("Y")){ %>checked<%} %> >Monthly<br>			
-		</td>
-	</tr>
-	<input type="hidden" name="additionalFieldsShown" value="Y">
-<% } 	// else 
-%>
-
-<% } // if report type is empty %>
-
-</table>
-<br>
-
-	<script language="JavaScript">
-	<!--
-	<% 
-		Vector reportIdNames = ReportLoader.getUserReportNames(request); %>
-		var reportIds   = new Array(<%= reportIdNames.size() %>);
-		var reportNames = new Array(<%= reportIdNames.size() %>);
-		<% for(int i=0; i<reportIdNames.size(); i++) { 
-			IdNameValue value = (IdNameValue) reportIdNames.get(i); %>
-			reportIds[<%= i %>]   = "<%= value.getId() %>";
-			reportNames[<%= i %>] = "<%= Utils.javaSafe(value.getName()) %>";
-		<% } %>
-	
-		var dashboardReports = new Array ('reports1', 'reports2', 'reports3', 'reports4');
-		function dataValidate() {
-			if(document.getElementById('reportType').value=="-1") {
-				alert("Please enter Report Type");
-				document.getElementById('reportType').focus();
-				document.getElementById('reportType').select();
-				return false;
-			}
-			
-
-			if(document.getElementById('reportName').value=="") {
-				alert("Please enter Report Name");
-				document.forma.reportName.focus();
-				document.forma.reportName.select();
-				return false;
-			}   // if
-
-			if(document.forma.pageSize!=null && document.forma.pageSize.options.selectedIndex == 0) {
-				if(!checkNonNegativeInteger(document.forma.pageSize.options[document.forma.pageSize.options.selectedIndex].text)) {
-					alert("Please enter number in pageSize. No Characters are allowed.");
-					return false;
-				} else {
-					document.forma.pageSize.options[document.forma.pageSize.options.selectedIndex].value=document.forma.pageSize.options[document.forma.pageSize.options.selectedIndex].text;
-				}
-			}
-		
-			if(document.forma.frozenColumns!=null && document.forma.frozenColumns.options.selectedIndex == 0) {
-				if(!checkNonNegativeInteger(document.forma.frozenColumns.options[document.forma.frozenColumns.options.selectedIndex].text)) {
-					alert("Please enter number in frozenColumns. No Characters are allowed.");
-					return false;
-				} else {
-					document.forma.frozenColumns.options[document.forma.frozenColumns.options.selectedIndex].value=document.forma.frozenColumns.options[document.forma.frozenColumns.options.selectedIndex].text;
-				}
-			}
-
-			if(document.forma.heightContainer!=null && document.forma.heightContainer.options.selectedIndex == 0) {
-				if(!checkNonNegativeInteger(document.forma.heightContainer.options[document.forma.heightContainer.options.selectedIndex].text)) {
-					alert("Please enter positive number greater than 10% in \"Desired Container Height\". No Characters are allowed.");
-					return false;
-				} else {
-					if(eval(document.forma.heightContainer.options[document.forma.heightContainer.options.selectedIndex].text) < 10) {
-						alert("Please enter positive number less than 10% in \"Desired Container Height\". No Characters are allowed.");
-						return false;
-					}
-					if(eval(document.forma.heightContainer.options[document.forma.heightContainer.options.selectedIndex].text) > 300) {
-						alert("Please enter positive number greater than 300% in \"Desired Container Height\". No Characters are allowed.");
-						return false;
-					}
-					document.forma.heightContainer.options[document.forma.heightContainer.options.selectedIndex].value=document.forma.heightContainer.options[document.forma.heightContainer.options.selectedIndex].text;
-				}
-			}
-
-			if(document.forma.widthContainer!=null && document.forma.widthContainer.options.selectedIndex == 0) {
-				if(!checkNonNegativeInteger(document.forma.widthContainer.options[document.forma.widthContainer.options.selectedIndex].text)) {
-					alert("Please enter positive number greater than 10% in \"Desired Container Width\". No Characters are allowed.");
-					return false;
-				} else {
-					if(eval(document.forma.widthContainer.options[document.forma.widthContainer.options.selectedIndex].text) < 10) {
-						alert("Please enter positive number less than 10% in \"Desired Container Width\". No Characters are allowed.");
-						return false;
-					}
-					if(eval(document.forma.widthContainer.options[document.forma.widthContainer.options.selectedIndex].text) > 300) {
-						alert("Please enter positive number greater than 300% in \"Desired Container Width\". No Characters are allowed.");
-						return false;
-					}
-					document.forma.widthContainer.options[document.forma.widthContainer.options.selectedIndex].value=document.forma.widthContainer.options[document.forma.widthContainer.options.selectedIndex].text;
-				}
-			}
-
-			for(var i=0; i<reportIds.length; i++)
-				if((document.getElementById('reportName').value==reportNames[i])&&(reportIds[i]!="<%= reportID %>")) {
-					alert("Report with that name created by you already exists.\nPlease select another name");
-					document.forma.reportName.focus();
-					document.forma.reportName.select();
-					return false;
-				}   // if
-			return true;
-		}   // dataValidate
-	//-->
-	</script>
-<!-- Start Floating Layer -->
-<div 
-   id="uniquename1" 
-   style="display:none; 
-      position:absolute; 
-      border-style: solid; 
-      background-color: white; 
-      padding: 5px;">
-              <!-- place your HTML content here-->
-		               <h3>Background color selector</h3>
-				<% if (rdef !=null && rdef.getDashBoardReports()!=null && (rdef.getDashBoardReports().getReportsList().get(0)!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(0)).getBgcolor()!=null) &&(((Reports)rdef.getDashBoardReports().getReportsList().get(0)).getBgcolor().length()>0)) {%>		     
- 					<input id="hashCode1" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="<%=((Reports)rdef.getDashBoardReports().getReportsList().get(0)).getBgcolor()%>" type="text"	/>
- 				<%} else { %>
- 					<input id="hashCode1" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="#FFFFFF" type="text"	/> 				
- 				<% } %>	
-					<input type="button" value="Submit & Close" onClick="document.forma.repBgColor1.value=document.getElementById('hashCode1').value; document.forma.repBgColor1.style.backgroundColor = document.getElementById('hashCode1').value; HideContent('uniquename1');"/>
-
-
-              <!-- End of content area -->
-
-</div>
-<div 
-   id="uniquename2" 
-   style="display:none; 
-      position:absolute; 
-      border-style: solid; 
-      background-color: white; 
-      padding: 5px;">
-              <!-- place your HTML content here-->
-		               <h3>Background color selector</h3>
-				<% if (rdef !=null && rdef.getDashBoardReports()!=null && (rdef.getDashBoardReports().getReportsList().get(1)!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(1)).getBgcolor()!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(1)).getBgcolor().length()>0)) {%>		     
- 					<input id="hashCode2" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="<%=((Reports)rdef.getDashBoardReports().getReportsList().get(1)).getBgcolor()%>" type="text"	/>
- 				<%} else { %>
- 					<input id="hashCode2" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="#FFFFFF" type="text"	/> 				
- 				<% } %>	
-					<input type="button" value="Submit & Close" onClick="document.forma.repBgColor2.value=document.getElementById('hashCode2').value; document.forma.repBgColor2.style.backgroundColor = document.getElementById('hashCode2').value;HideContent('uniquename2');"/>
-
-
-              <!-- End of content area -->
-
-</div>
-<div 
-   id="uniquename3" 
-   style="display:none; 
-      position:absolute; 
-      border-style: solid; 
-      background-color: white; 
-      padding: 5px;">
-              <!-- place your HTML content here-->
-		               <h3>Background color selector</h3>
-				<% if (rdef !=null && rdef.getDashBoardReports()!=null && (rdef.getDashBoardReports().getReportsList().get(2)!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(2)).getBgcolor()!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(2)).getBgcolor().length()>0)) {%>		     
- 					<input id="hashCode3" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="<%=((Reports)rdef.getDashBoardReports().getReportsList().get(2)).getBgcolor()%>" type="text"	/>
- 				<%} else { %>
- 					<input id="hashCode3" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="#FFFFFF" type="text"	/> 				
- 				<% } %>	
-					<input type="button" value="Submit & Close" onClick="document.forma.repBgColor3.value=document.getElementById('hashCode3').value; document.forma.repBgColor3.style.backgroundColor = document.getElementById('hashCode3').value; HideContent('uniquename3');"/>
-
-
-              <!-- End of content area -->
-
-</div>
-<div 
-   id="uniquename4" 
-   style="display:none; 
-      position:absolute; 
-      border-style: solid; 
-      background-color: white; 
-      padding: 5px;">
-              <!-- place your HTML content here-->
-		               <h3>Background color selector</h3>
-				<% if (rdef !=null && rdef.getDashBoardReports()!=null && (rdef.getDashBoardReports().getReportsList().get(3)!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(3)).getBgcolor()!=null) && (((Reports)rdef.getDashBoardReports().getReportsList().get(3)).getBgcolor().length()>0)) {%>		     
- 					<input id="hashCode4" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="<%=((Reports)rdef.getDashBoardReports().getReportsList().get(3)).getBgcolor()%>" type="text"	/>
- 				<%} else { %>
- 					<input id="hashCode4" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="#FFFFFF" type="text"	/> 				
- 				<% } %>	
-					<input type="button" value="Submit & Close" onClick="document.forma.repBgColor4.value=document.getElementById('hashCode4').value; document.forma.repBgColor4.style.backgroundColor = document.getElementById('hashCode4').value; HideContent('uniquename4');"/>
-
-
-              <!-- End of content area -->
-
-</div>
-
-<div id="FloatingLayer" style="position:absolute;width:250px;left:100;top:100;visibility:hidden"> 
-  <table border="0" width="250" bgcolor="#FF6600" cellspacing="0" cellpadding="5">
-    <tr> 
-      <td width="100%"> <table border="0" width="100%" cellspacing="0" cellpadding="0" height="36">
-          <tr> 
-            <td id="titleBar" style="cursor:move" width="100%"> <ilayer width="100%" onSelectStart="return false"> 
-              <layer width="100%" onMouseover="isActive=true;if (isN4) MoveN4(FloatingLayer)" onMouseout="isActive=false"> 
-              <font face="Arial" color="#FFFFFF">Layer Title</font></layer>
-              </ilayer></td>
-            <td style="cursor:hand" valign="top"> <a href="#" onClick="ToggleFloatingLayer('FloatingLayer',0);return false"><font color="#ffffff" size="2" face="arial"  style="text-decoration:none">X</font></a> 
-            </td>
-          </tr>
-          <tr> 
-            <td width="100%" bgcolor="#FFFFFF" style="padding:4px" colspan="2"> 
-              <!-- place your HTML content here-->
-		               <h3>Background color selector</h3>
-					<input id="hashCode" style="position: absolute; right: 15px; top: 239px;" size="8" class="color" value="#FF0000" type="text"	/>
-					<input type="button" value="Submit & Close" onClick="document.forma.dashBgColor1.value=document.getElementById('hashCode').value; javascript:ToggleFloatingLayer('FloatingLayer',0);"/>
-
-
-              <!-- End of content area -->
-            </td>
-          </tr>
-        </table></td>
-    </tr>
-  </table>
-</div>
-<!-- End Floating layer -->
-<%!
-	private String nvl(String s)                   { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault)  { return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_edit.jsp
deleted file mode 100644
index 7589f73f..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_edit.jsp
+++ /dev/null
@@ -1,320 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.ColFilterType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page errorPage="error_page.jsp" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-
-	boolean isEdit  = curSubStep.equals(AppConstants.WSS_EDIT);
-	
-	String filterId = AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID);
-	String colId    = isEdit?filterId.substring(0, filterId.indexOf('|')):null;
-	int filterPos = -1;
-	if(isEdit)
-		try {
-			filterPos = Integer.parseInt(filterId.substring(colId.length()+1));
-		} catch(NumberFormatException e) {}
-	
-	DataColumnType currColumn = isEdit?rdef.getColumnById(colId):null;
-	ColFilterType  currFilter = isEdit?rdef.getFilterById(colId, filterPos):null;
-	
-	String arg = null; %>
-
-<script language="JavaScript">
-<!--
-function showFormFieldPopup() {
-	var w = window.open("", "filterPopup", "width=400,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Form Fields</title>");
-	w.document.writeln("<link rel=stylesheet type=text/css href='<%= AppUtils.getBaseFolderURL() %>css/raptor.css'>");
-	w.document.writeln("<script language=JavaScript>");
-	w.document.writeln("function setValue(newValue, fieldType) {");
-	w.document.writeln("    window.opener.document.forma.argValue.value      = newValue;");
-	w.document.writeln("    window.opener.document.forma.formFieldType.value = fieldType;");
-	w.document.writeln("    window.close();");
-	w.document.writeln("}   // setValue");
-	w.document.writeln("</"+"script>");
-	w.document.writeln("</head><body>");
-	
-	w.document.writeln("<table width=94% border=0 cellspacing=1 align=center>");
-	w.document.writeln("	<tr class=rbg1>");
-	w.document.writeln("		<td height=30>&nbsp;</td>");
-	w.document.writeln("		<td><b class=rtableheader>Report Form Fields</b></td>");
-	w.document.writeln("	</tr>");
-<%	int iCnt = 0;
-	if(rdef.getFormFieldList()!=null)
-		for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); iCnt++) { 
-			FormFieldType fft = (FormFieldType) iter.next(); %>
-	w.document.writeln("	<tr<%= (iCnt%2==0)?" class=rbg8":"" %>>");
-	w.document.writeln("		<td align=center valign=middle height=30><font class=rtabletext><%= (iCnt+1) %></font></td>");
-	w.document.writeln("		<td valign=middle>");
-	w.document.writeln("			<b class=rtabletext><a href=\"javascript:setValue('[<%= fft.getFieldName() %>]', '<%= fft.getFieldType() %>')\"><%= fft.getFieldName() %></a></b>");
-	w.document.writeln("		</td>");
-	w.document.writeln("	</tr>");
-<%			}	// for
-	if(iCnt==0) { %>
-	w.document.writeln("	<tr class=rbg3 height=30>");
-	w.document.writeln("		<td colspan=2 align=center valign=middle><b class=rtabletext>There are no form fields defined</b></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr>");
-	w.document.writeln("		<td colspan=2 align=center><br><input type=Submit class=Button value=Close onClick=\"window.close();\"></td>");
-	w.document.writeln("	</tr>");
-<%	} else { %>
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("	</tr>");
-<%	}	// if 
-%>
-	w.document.writeln("</table>");
-	
-	w.document.writeln("</body></html>");
-	w.document.close();
-}   // showFormFieldPopup
-
-function showArgPopup() {
-	var argType = document.forma.argType.options[document.forma.argType.selectedIndex].value;
-	if(argType=="<%= AppConstants.AT_FORMULA %>") {
-		alert("Please select Argument Type to be one of the following:\n - Simple Value\n - Another Column\n - List of Values\n - Run-time Form Field");
-		document.forma.argType.focus();
-		return;
-	}
-	
-	if(argType=="<%= AppConstants.AT_FORM %>") {
-		showFormFieldPopup();
-		return;
-	}
-	
-<% if(isEdit) { %>
-	var colId = "<%= colId %>";
-<% } else { %>
-	var colId = document.forma.filterColId.options[document.forma.filterColId.selectedIndex].value;
-<% } %>
-	
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.filter."+((argType=="<%= AppConstants.AT_COLUMN %>")?"col":"data&<%= AppConstants.RI_ARG_TYPE %>="+argType+"&<%= AppConstants.RI_COLUMN_ID %>="+colId)+"&<%= AppConstants.RI_JS_TARGET_FIELD %>=document.forma.argValue&<%= AppConstants.RI_RESET_PARAMS %>=Y", "filterPopup", "width=440,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showArgPopup
-//-->
-</script>
-
-
-<table width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-<% if((isEdit?filterPos:rdef.getAllFilters().size())==0) { %>
-	<input type="hidden" name="filterJoin" value="AND">
-<% } else { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Join Condition: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%  arg = (request.getParameter("filterJoin")!=null)?request.getParameter("filterJoin"):(isEdit?currFilter.getJoinCondition():""); %>
-			<select name="filterJoin">
-				<option value="AND"<%= arg.equals("AND")?" selected":"" %>>AND
-				<option value="OR"<%=  arg.equals("OR") ?" selected":"" %>>OR
-			</select></font></td>
-	</tr>
-<% } %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Opening Brackets: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%  arg = (request.getParameter("openBrackets")!=null)?request.getParameter("openBrackets"):(isEdit?nvl(currFilter.getOpenBrackets()):""); %>
-			<select name="openBrackets">
-				<option value=""<%=      arg.equals("")     ?" selected":"" %>>
-				<option value="("<%=     arg.equals("(")    ?" selected":"" %>>(
-				<option value="(("<%=    arg.equals("((")   ?" selected":"" %>>((
-				<option value="((("<%=   arg.equals("(((")  ?" selected":"" %>>(((
-				<option value="(((("<%=  arg.equals("((((") ?" selected":"" %>>((((
-				<option value="((((("<%= arg.equals("(((((")?" selected":"" %>>(((((
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Filter By Column: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-		<% if(isEdit) { %>
-			<%= currColumn.getDisplayName() %>
-		    <input type="hidden" name="filterColId" value="<%= colId %>">
-		    <input type="hidden" name="filterPos" value="<%= filterPos %>">
-		<% } else { %>
-			<select name="filterColId">
-<%				int iCount = 0;
-				List reportCols = rdef.getAllColumns();
-				for(Iterator iter=reportCols.iterator(); iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next(); %>
-				    <option value="<%= dct.getColId() %>"<%= ((request.getParameter("filterColId")==null)?(iCount==0):dct.getColId().equals(request.getParameter("filterColId")))?" selected":"" %>><%= dct.getDisplayName() %>
-<%				}   // for 
-%>
-			</select>
-		<% } %>
-		</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Expression: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%  arg = (request.getParameter("filterExpr")!=null)?request.getParameter("filterExpr"):(isEdit?currFilter.getExpression():""); %>
-			<select name="filterExpr">
-				<option value="="<%=           arg.equals("=")          ?" selected":"" %>>=
-				<option value="&lt;&gt;"<%=    arg.equals("<>")         ?" selected":"" %>>&lt;&gt;
-				<option value="&gt;"<%=        arg.equals(">")          ?" selected":"" %>>&gt;
-				<option value="&gt;="<%=       arg.equals(">=")         ?" selected":"" %>>&gt;=
-				<option value="&lt;"<%=        arg.equals("<")          ?" selected":"" %>>&lt;
-				<option value="&lt;="<%=       arg.equals("<=")         ?" selected":"" %>>&lt;=
-				<option value="LIKE"<%=        arg.equals("LIKE")       ?" selected":"" %>>LIKE
-				<option value="IS NULL"<%=     arg.equals("IS NULL")    ?" selected":"" %>>IS NULL
-				<option value="IS NOT NULL"<%= arg.equals("IS NOT NULL")?" selected":"" %>>IS NOT NULL
-				<option value="IN"<%=          arg.equals("IN")         ?" selected":"" %>>IN (list)
-				<option value="NOT IN"<%=      arg.equals("NOT IN")     ?" selected":"" %>>NOT IN (list)
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Argument Type: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%  arg = (request.getParameter("argType")!=null)?request.getParameter("argType"):(isEdit?nvl(currFilter.getArgType()):""); %>
-			<select name="argType" onChange="document.forma.formFieldType.value=''; if(options[selectedIndex].value=='<%= AppConstants.AT_COLUMN %>') document.forma.argValue.value='';">
-				<option value="<%= AppConstants.AT_VALUE %>"<%=   arg.equals(AppConstants.AT_VALUE)  ?" selected":"" %>>Simple Value
-				<option value="<%= AppConstants.AT_COLUMN %>"<%=  arg.equals(AppConstants.AT_COLUMN) ?" selected":"" %>>Another Column
-				<option value="<%= AppConstants.AT_FORMULA %>"<%= arg.equals(AppConstants.AT_FORMULA)?" selected":"" %>>Expression
-				<option value="<%= AppConstants.AT_LIST %>"<%=    arg.equals(AppConstants.AT_LIST)   ?" selected":"" %>>List of Values
-				<option value="<%= AppConstants.AT_FORM %>"<%=    arg.equals(AppConstants.AT_FORM)   ?" selected":"" %>>Run-time Form Field
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Argument Value: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%	String argValue = nvl(request.getParameter("argValue"), isEdit?(nvl(currFilter.getArgType()).equals(AppConstants.AT_COLUMN)?"["+rdef.getColumnById(currFilter.getArgValue()).getDisplayName()+"]":nvl(currFilter.getArgValue())):"");
-				String formFieldType = "";
-				if(arg.equals(AppConstants.AT_FORM)&&rdef.getFormFieldList()!=null)
-					for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); iCnt++) { 
-						FormFieldType fft = (FormFieldType) iter.next();
-						if(argValue.equals("["+fft.getFieldName()+"]")) {
-							formFieldType = fft.getFieldType();
-							break;
-						}	// if
-					}	// for 
-			%>
-		    <input type="hidden" name="formFieldType" value="<%= formFieldType %>">
-			<input type="text" size="30" name="argValue" class=rtabletext value="<%= argValue %>" 
-				onFocus="if(document.forma.argType.options[document.forma.argType.selectedIndex].value=='<%= AppConstants.AT_COLUMN %>') blur();" onChange="document.forma.formFieldType.value='';"></font>
-		    <a href="javascript:showArgPopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Select from list" width="12" height="12"></a>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Closing Brackets: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<%  arg = (request.getParameter("closeBrackets")!=null)?request.getParameter("closeBrackets"):(isEdit?nvl(currFilter.getCloseBrackets()):""); %>
-			<select name="closeBrackets">
-				<option value=""<%=      arg.equals("")     ?" selected":"" %>>
-				<option value=")"<%=     arg.equals(")")    ?" selected":"" %>>)
-				<option value="))"<%=    arg.equals("))")   ?" selected":"" %>>))
-				<option value=")))"<%=   arg.equals(")))")  ?" selected":"" %>>)))
-				<option value="))))"<%=  arg.equals("))))") ?" selected":"" %>>))))
-				<option value=")))))"<%= arg.equals(")))))")?" selected":"" %>>)))))
-			</select></font></td>
-	</tr>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	var selExpr = "";
-	selExpr = document.forma.filterExpr.options[document.forma.filterExpr.selectedIndex].value;
-	var selArgType = "";
-	selArgType = document.forma.argType.options[document.forma.argType.selectedIndex].value;
-	
-	var isListArgument = false;
-	if(selArgType=="<%= AppConstants.AT_LIST %>")
-		isListArgument = true;
-	
-	var isFormSingleValueArgument = false;	// text with popup, drop-down, list-box and radio-buttons are always single value
-	var isFormMultiValueArgument  = false;	// check boxes and multi-select list box are always multi-value; text box and text area can be either
-	var isFormArgument            = false;	// text box and text area can be used for both single-value and multi-value
-	if(selArgType=="<%= AppConstants.AT_FORM %>") {
-		isFormArgument = true;
-		
-		if( document.forma.formFieldType.value=="<%= FormField.FFT_TEXT_W_POPUP %>"||
-			document.forma.formFieldType.value=="<%= FormField.FFT_COMBO_BOX %>"||
-			document.forma.formFieldType.value=="<%= FormField.FFT_LIST_BOX %>"||
-			document.forma.formFieldType.value=="<%= FormField.FFT_RADIO_BTN %>")
-			isFormSingleValueArgument = true;
-		
-		if( document.forma.formFieldType.value=="<%= FormField.FFT_CHECK_BOX %>"||
-			document.forma.formFieldType.value=="<%= FormField.FFT_LIST_MULTI %>")
-			isFormMultiValueArgument = true;
-	}	// if
-	
-	if((selExpr!="IS NULL")&&(selExpr!="IS NOT NULL")) {
-		if((selExpr=="IN")||(selExpr=="NOT IN")) {
-			if(! (isListArgument||(isFormArgument&&(! isFormSingleValueArgument)))) {
-				alert("This expression requires argument which is List of Values.\nPlease either select the argument type List of Values or\nselect argument type Run-time Form Field and then select Form Field which is Text Box, Text Area, Check Boxes or Multi-select List Box.");
-				document.forma.argValue.focus();
-				document.forma.argValue.select();
-				
-				return false;
-			}
-		} else
-			if(isListArgument||(isFormArgument&&isFormMultiValueArgument)) {
-				alert("This expression cannot have argument type List of Values.\nPlease select another argument type.\n\nNote: Form Field which is Check Boxes or Multi-select List Box is also considered to be List of Values.");
-				document.forma.argValue.focus();
-				document.forma.argValue.select();
-				
-				return false;
-			}
-		
-		if(selArgType!="<%= AppConstants.AT_FORM %>")
-			if(document.forma.argValue.value=="") {
-				alert("Please provide argument value");
-				document.forma.argValue.focus();
-				document.forma.argValue.select();
-				
-				return false;
-			}
-	}	// if
-	 
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_list.jsp
deleted file mode 100644
index 71898b35..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_filters_list.jsp
+++ /dev/null
@@ -1,115 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.ColFilterType" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-%>
-<table class="mTAB" width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=8 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="10%"><b class=rtableheader>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="5%"><b class=rtableheader>&nbsp;&nbsp;&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="33%"><b class=rtableheader>Column</b></td>
-		<td align="center" valign="Middle" width="26%"><b class=rtableheader>Filter</b></td>
-		<td align="center" valign="Middle" width="5%"><b class=rtableheader>&nbsp;&nbsp;&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="14%" colspan=2><input type="button" class=button value="Add" border="0" width="71" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit()"></td>
-	</tr>
-<%	int iCount = 0;
-	int iPos   = 0;
-	int nOpenBrackets  = 0;
-	int nCloseBrackets = 0;
-	String colId = "";
-	List reportFilters = rdef.getAllFilters();
-	for(Iterator iter=reportFilters.iterator(); iter.hasNext(); iCount++, iPos++) { 
-		ColFilterType cft = (ColFilterType) iter.next();
-		
-		nOpenBrackets  += nvl(cft.getOpenBrackets()).length();
-		nCloseBrackets += nvl(cft.getCloseBrackets()).length();
-		
-		if(! colId.equals(cft.getColId()))
-			iPos = 0;
-		colId = cft.getColId(); %>
-		<tr class=<%=(iCount % 2 == 0)?"rowalt1":"rowalt2"%>>
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %></font></td>
-		<td align="center"><font class=rtabletext><%= iCount>0?cft.getJoinCondition():"&nbsp;" %></font></td>
-		<td align="center"><font class=rtabletext><%= nvl(cft.getOpenBrackets(), "&nbsp;") %></font></td>
-		<td><font class=rtabletext><%= rdef.getColumnById(colId).getDisplayName() %></font></td>
-		<td><font class=rtabletext><%= HTMLEncode(rdef.getFilterLabel(cft)) %></font></td>
-		<td align="center"><font class=rtabletext><%= nvl(cft.getCloseBrackets(), "&nbsp;") %></font></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_EDIT %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= colId+"|"+iPos %>';"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove this filter?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= colId+"|"+iPos %>'; }"></td>
-	</tr>
-<%	}   // for
-	if(iCount==0) { %>
-	<tr class=rbg2>
-		<td colspan=8 align="center" height="30"><font class=rtabletext>No filters defined</font></td>
-	</tr>
-<%	} %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-<%	if(nOpenBrackets!=nCloseBrackets) { %>
-	alert("The number of opening brackets (<%= nOpenBrackets %>) must be equal to the number of closing brackets (<%= nCloseBrackets %>).");
-	return false;
-<%	} %>
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-   private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)=='<')
-				sb.replace(i, i+1, "&lt;");
-			else if(sb.charAt(i)=='>')
-				sb.replace(i, i+1, "&gt;");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, "&quot;");
-
-		return sb.toString();
-	}   // HTMLEncode
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp
deleted file mode 100644
index 84c14510..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_edit.jsp
+++ /dev/null
@@ -1,771 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="java.text.SimpleDateFormat"%>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-	String dependsOnHelp = "Custom SQL can be defined";
-%>
-
-<%	String[] dateFormats   = { "MM/DD/YYYY", "MM/YYYY", "DD-MON-YYYY", "Month DD, YYYY", "Month, YYYY" };
-	String[] charFormats   = { "N/A" }; 
-	
-	boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT);
-	FormFieldType currField  = null;
-	if(isEdit)
-		currField  = rdef.getFormFieldById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID)); 
-	
-	String currColId = (currField!=null)?nvl(currField.getColId()):""; 
-	String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-
-	String colTableName     = null;
-	String colColumnName    = null;
-	String colDisplayFormat = null;
-	String colDisplayName   = null;
-	if(isSQLBased)
-		if(currColId.length()>0) {
-			colTableName     = ReportWrapper.getSQLBasedFFTColTableName(currColId);
-			colColumnName    = ReportWrapper.getSQLBasedFFTColColumnName(currColId);
-			colDisplayFormat = ReportWrapper.getSQLBasedFFTColDisplayFormat(currColId);
-			
-			if(currColId.indexOf("|")>=0)
-				currColId = currColId.substring(0, currColId.indexOf('|'));
-			colDisplayName   = colColumnName;
-			//colDisplayName = currColId.substring(currColId.indexOf('.')+1);
-		} %>
-
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/editabledropdown.js"></script>
-<script language="JavaScript">
- 
-<!--
-var fieldColName = "";
-
-	function toggleDiv(isChecked) {
-		if(isChecked) {
-			if(document.getElementById('showDefaultSql'))
-			document.getElementById('showDefaultSql').style.display="";
-			if(document.getElementById('showDefaultValue'))
-			document.getElementById('showDefaultValue').style.display="none";
-			if(document.forma.defaultValue)
-			   document.forma.defaultValue.value="";
-		} else {
-			if(document.getElementById('showDefaultSql'))
-			document.getElementById('showDefaultSql').style.display="none";
-			if(document.getElementById('showDefaultValue'))
-			document.getElementById('showDefaultValue').style.display="";	
-			if(document.getElementById('showDefaultSql') && document.forma.fieldDefaultSQL)
-			   document.forma.fieldDefaultSQL.value="";		
-		}
-					
-	}
-	
-	function toggleFieldTypeSelection() {
-		   var selectBox = document.forma.fieldType;
-		   var selectedString = "";
-		   if(selectBox)
-			selectedString = selectBox.options[selectBox.selectedIndex].value;
-		   else {
-			 <%	if(currField!=null) { %>  
-             		selectString = '<%=currField.getFieldType()%>';
-             <% } %>
-		   }
-		   
-		   if(selectedString == '<%= FormField.FFT_LIST_MULTI %>'){
-			   document.getElementById('multiSelectListSizeDiv').style.display="block";	
-		   } else {
-			   document.getElementById('multiSelectListSizeDiv').style.display="none";
-			   document.getElementById('multiSelectListSize').value="4";
-		   }
-	}
-	
-<% if(isSQLBased) { %>
-function showTableColsPopup() {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.table.cols&single_value=Y&return_table_name=Y&return_col_type=Y&remoteDbPrefix=<%=remoteDbPrefix%>", "tableColsPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTableColsPopup
-
-function setDisplayTypeValues(dbType) {
-	if(document.forma.colType.value!=dbType) {
-		document.forma.colType.value = dbType;
-		
-		document.forma.displayFormat.options.length = 0;
-		
-		if(document.forma.colType.value=="<%= AppConstants.CT_DATE %>") {
-		<% for(int i=0; i<dateFormats.length; i++) { %>
-			document.forma.displayFormat.options[<%= i %>] = new Option("<%= dateFormats[i] %>", "<%= dateFormats[i] %>");
-		<%  } %>
-		} else {
-		<% for(int i=0; i<charFormats.length; i++) { %>
-			document.forma.displayFormat.options[<%= i %>] = new Option("<%= charFormats[i] %>", "<%= charFormats[i].equals("N/A")?"":charFormats[i] %>");
-		<%  } %>
-		}	// else
-		
-		document.forma.displayFormat.selectedIndex = 0;
-		
-		if(document.layers)
-			history.go(0);
-	}	// if
-}   // setDisplayTypeValues
-
-function addText(newValue) {
-	var newText = "";
-	if(newValue.indexOf("|")<0)
-		newText = newValue;
-	else {
-		setDisplayTypeValues(newValue.substring(newValue.lastIndexOf("|")+1));
-		newText = newValue.substring(0, newValue.lastIndexOf("|"));
-	}	// else
-	
-	document.getElementById('fieldColId').value = newText;
-	
-	var newFieldColName = "";
-	newFieldColName = newText.substring(newText.lastIndexOf(".")+1);
-	
-	if(document.getElementById('fieldName').value==""||document.getElementById('fieldName').value==fieldColName)
-		document.getElementById('fieldName').value = newFieldColName;
-	fieldColName = newFieldColName;
-}   // addText
-
-function clearText() {
-	document.getElementById('fieldColId').value = "";
-}   // clearText
-
-<% } else { %>
-function changeColId() {
-	var newFieldColName = document.getElementById('fieldColId').options[document.getElementById('fieldColId').selectedIndex].text;
-	if(document.getElementById('fieldColId').selectedIndex>0&&(document.getElementById('fieldName').value==""||document.getElementById('fieldName').value==fieldColName))
-		document.getElementById('fieldName').value = newFieldColName;
-	fieldColName = newFieldColName;
-}   // changeColId
-
-function showDefaultValuePopup() {
-	if(document.getElementById('fieldColId').selectedIndex==0) {
-		alert("The assistance is available only if this field is based on a column.\nYou can select a column from the list or just type a default value.");
-		document.getElementById('fieldColId').focus();
-		return;
-	}	// if
-	
-	var colId = document.getElementById('fieldColId').options[document.getElementById('fieldColId').selectedIndex].value;
-	
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.filter.data&<%= AppConstants.RI_ARG_TYPE %>=<%= AppConstants.AT_VALUE %>&<%= AppConstants.RI_COLUMN_ID %>="+colId+"&<%= AppConstants.RI_JS_TARGET_FIELD %>=document.forma.defaultValue&<%= AppConstants.RI_RESET_PARAMS %>=Y", "defaultValuePopup", "width=440,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showDefaultValuePopup
-<% }	//  else if(isSQLBased) 
-%>
-
-function showTestRunSQLPopup() {
-	//var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.testrun.sql&<%= AppConstants.RI_FORMATTED_SQL %>="+escape(""+document.getElementById('fieldSQL').value)+"&<%= AppConstants.RI_CHK_FIELD_SQL %>=Y", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.field.testrun.jsp", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestRunSQLPopup
-
-function showTestRunDefaultSQLPopup() {
-	//var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.testrun.sql&<%= AppConstants.RI_FORMATTED_SQL %>="+escape(""+document.getElementById('fieldSQL').value)+"&<%= AppConstants.RI_CHK_FIELD_SQL %>=Y", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.field.default.testrun.jsp", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestRunDefaultSQLPopup
-
-function showStartDatetRunSQLPopup( ) {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.field.date.start.testrun.jsp", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestRunRangeSQLPopup
-
-function showEndDateRunSQLPopup( ) {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.field.date.end.testrun.jsp", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-} 
-function setDefaultVerifyFlag() {
-	document.forma.fieldDefaultSQLOrig.value = document.forma.fieldDefaultSQL.value;
-}   // setDefaultVerifyFlag
-
-function setVerifyFlag() {
-	document.forma.fieldSQLOrig.value = document.getElementById('fieldSQL').value;
-}   // setVerifyFlag
-
-function showSQLInstructions() {
-	var w = window.open("", "instrPopup", "width=400,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Form Field SQL Instructions</title>");
-	w.document.writeln("<link rel=stylesheet type=text/css href='<%= AppUtils.getBaseFolderURL() %>css/raptor.css'>");
-	w.document.writeln("</head><body>");
-	
-	w.document.writeln("<table width=94% border=0 cellspacing=1 cellpadding=3 align=center>");
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td><b class=rtableheader>Form Field SQL Instructions</b></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr class=rbg3 align=center valign=middle>");
-	w.document.writeln("		<td align=left valign=middle><font class=rtabletext>");
-	w.document.writeln("			The SQL result set must have a column <b>id</b> and a column <b>name</b>. ");
-	w.document.writeln("			If selecting date values in visual report, the <b>id</b> must be formatted <b>MM/DD/YYYY</b>; the <b>name</b> can use any display format. ");
-	w.document.writeln("			Example:<br><br><b>SELECT DISTINCT</b><br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TO_CHAR(t.start_date, 'MM/DD/YYYY') <b>id</b>,<br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TO_CHAR(t.start_date, 'Month YYYY') <b>name</b><br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;<b>FROM</b><br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;my_table t<br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;<b>WHERE</b><br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;t.start_date IS NOT NULL<br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;<b>ORDER BY</b><br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;t.start_date DESC");
-	w.document.writeln("		</font></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr>");
-	w.document.writeln("		<td align=center><br><input type=Submit class=Button value=Close onClick=\"window.close();\"></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("</table>");
-	
-	w.document.writeln("</body></html>");
-	w.document.close();
-}	// showSQLInstructions
-
-function showRangeSQLInstructions() {
-	var w = window.open("", "instrPopup", "width=400,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Form Field Range SQL Instructions</title>");
-	w.document.writeln("<link rel=stylesheet type=text/css href='<%= AppUtils.getBaseFolderURL() %>css/raptor.css'>");
-	w.document.writeln("</head><body>");
-	
-	w.document.writeln("<table width=94% border=0 cellspacing=1 cellpadding=3 align=center>");
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td><b class=rtableheader>Form Field Range SQL Instructions</b></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr class=rbg3 align=center valign=middle>");
-	w.document.writeln("		<td align=left valign=middle><font class=rtabletext>");
-	w.document.writeln("			The SQL should ALWAYS return a valid Oralce date. If the return is not a valid date, the range will not be set.<br>");
-	w.document.writeln("			The SQL will always get precedence over the static values.<br>");
-	w.document.writeln("			");
-	w.document.writeln("			Example:<br><br><b>SELECT</b> SYSDATE<br> ");
-	w.document.writeln("			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>FROM</b> DUAL");
-	w.document.writeln("		</font></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr>");
-	w.document.writeln("		<td align=center><br><input type=Submit class=Button value=Close onClick=\"window.close();\"></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("</table>");
-	
-	w.document.writeln("</body></html>");
-	w.document.close();
-}	// showRangeSQLInstructions
-//-->
-</script>
-
-	
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Field Name: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<input type="text" style="width: 100px;" class="rtabletext" size="30" maxlength="30" id="fieldName" name="fieldName" value="<%= isEdit?currField.getFieldName():"" %>"></font></td>
-	</tr>
- 	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Based On Column: </font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-<%			if(isSQLBased) { %>
-			<input type=text  style="width: 100px;" class="rtabletext" size=50 id="fieldColId" name="fieldColId" value="<%= currColId %>" onFocus="blur()">
-			<a href="javascript:showTableColsPopup()"><img border=0 src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Select database column" width=12 height=12></a>
-<%			} else { %>
-			<select name="fieldColId" class="rtabletext" onChange="changeColId()" style="width: 100px;" >
-				    <option value=""<%= currColId.equals("")?" selected":"" %>>--- None ---
-<%				int iCount = 0;
-				List reportCols = rdef.getAllColumns();
-				for(Iterator iter=reportCols.iterator(); iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next(); %>
-				    <option value="<%= dct.getColId() %>"<%= currColId.equals(dct.getColId())?" selected":"" %>><%= dct.getDisplayName() %>
-<%					if(currColId.equals(dct.getColId()))
-						colDisplayName = dct.getDisplayName();
-				}   // for 
-%>
-			</select>
-<%			}   // else if(isSQLBased)
-			if(colDisplayName!=null) { %>
-<script language="JavaScript">
-<!--
-fieldColName = "<%= colDisplayName %>";
-//-->
-</script>
-<%			}   // if 
-%>
-			</font>
-		</td>
-	</tr>  
-<%	if(isSQLBased) {
-		String colType = AppConstants.CT_CHAR;
-		if(colTableName!=null&&colColumnName!=null)
-			try {
-				colType  = nvl(DataCache.getReportTableDbColumnType(colTableName, colColumnName,((String) session.getAttribute("remoteDB"))), AppConstants.CT_CHAR);
-			} catch(Exception e) {}
-			
-		String[] fmt;
-		if(colType.equals(AppConstants.CT_DATE)) 
-			fmt = dateFormats;
-		else 
-			fmt = charFormats; %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Display Format: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="displayFormat" style="width: 100px;" >
-			<%	for(int i=0; i<fmt.length; i++) { %>
-				<option value="<%= fmt[i].equals("N/A")?"":fmt[i] %>"<%= (nvl(colDisplayFormat).toUpperCase().equals(fmt[i].toUpperCase()))?" selected":"" %>><%= fmt[i] %>
-			<%  } %>
-			</select>
-			<input type="hidden" name="colType" value="<%= colType %>">
-		</font></td>
-	</tr> 
-<%	}	// if 
-%>
-
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Visible? </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="visible" style="width: 100px;" >
-				<option value="Y"<%= isEdit?(nvl(currField.getVisible(),"Y").startsWith("Y")?" selected":""):" selected" %>>Yes
-				<option value="N"<%= (isEdit&&(! nvl(currField.getVisible(),"Y").startsWith("Y")))?" selected":""        %>>No
-			</select></font></td>
-	</tr>
-   <% if(Globals.getAllowSQLBasedReports() || AppUtils.isAdminUser(request)) { %>
-	<tr>
-		<td class=rbg2 height="30" align="right">
-			<font class=rtabletext>Is used in Group By Clause?</font>
-		</td>
-		<td class=rbg3 align="left" nowrap>
-			<input type="checkbox" name="isGroupFormField" value="Y" <%=(currField!=null && (currField.isGroupFormField()!=null && currField.isGroupFormField().booleanValue()))?" checked":"" %>>
-		</td>
-	</tr>
-	<% } %>
-	
-	
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Field Type: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<% String curValue = nvl((currField!=null)?currField.getFieldType():"", FormField.FFT_TEXT_W_POPUP); %>
-			<select name="fieldType" onChange="toggleFieldTypeSelection()" style="width: 100px;" >
-				<%--<option value="<%= FormField.FFT_TEXT_W_POPUP %>"<%= curValue.equals(FormField.FFT_TEXT_W_POPUP)?" selected":"" %>>Text Box with Popup --%>
-				<option value="<%= FormField.FFT_TEXT         %>"<%= curValue.equals(FormField.FFT_TEXT        )?" selected":"" %>>Text Box
-				<%--<option value="<%= FormField.FFT_TEXTAREA     %>"<%= curValue.equals(FormField.FFT_TEXTAREA    )?" selected":"" %>>Text Area--%>
-				<%--<option value="<%= FormField.FFT_COMBO_BOX    %>"<%= curValue.equals(FormField.FFT_COMBO_BOX   )?" selected":"" %>>Drop-Down List--%>
-				<option value="<%= FormField.FFT_LIST_BOX     %>"<%= curValue.equals(FormField.FFT_LIST_BOX    )?" selected":"" %>>List Box
-				<%--<option value="<%= FormField.FFT_RADIO_BTN    %>"<%= curValue.equals(FormField.FFT_RADIO_BTN   )?" selected":"" %>>Radio Buttons
-				<option value="<%= FormField.FFT_CHECK_BOX    %>"<%= curValue.equals(FormField.FFT_CHECK_BOX   )?" selected":"" %>>Check Boxes --%>
-				<option value="<%= FormField.FFT_LIST_MULTI   %>"<%= curValue.equals(FormField.FFT_LIST_MULTI  )?" selected":"" %>>Multi-select List Box
-				<option value="<%= FormField.FFT_HIDDEN       %>"<%= curValue.equals(FormField.FFT_HIDDEN      )?" selected":"" %>>Hidden
-			</select>
-		</font></td>
-	</tr> 
-
-	<tr id="multiSelectListSizeDiv">
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Visible Size: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select id="multiSelectListSize" name="multiSelectListSize" onKeyDown="fnKeyDownHandler(this, event);" onKeyUp="fnKeyUpHandler_A(this, event); return false;" onKeyPress = "return fnKeyPressHandler_A(this, event);"  onChange="fnChangeHandler_A(this, event);">
-				<option value="1"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("1")?" selected":"" )%>>1
-				<option value="2"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("2")?" selected":"" )%>>2
-				<option value="3"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("3")?" selected":"" )%>>3
-				<option value="4"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("4")?" selected":"" )%>>4
-				<option value="5"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("5")?" selected":"" )%>>5
-				<option value="6"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("6")?" selected":"" )%>>6
-				<option value="7"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("7")?" selected":"" )%>>7
-				<option value="8"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("8")?" selected":"" )%>>8
-				<option value="9"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("9")?" selected":"" )%>>9
-				<option value="10"<%= (currField!=null && nvl(currField.getMultiSelectListSize(), "4").equals("10")?" selected":"" )%>>10
-				<option value="" style="COLOR:#ff0000;BACKGROUND-COLOR:#ffff00;">Custom</option> <!-- This is the Editable Option -->
-				<% if(currField!=null && isNumber(nvl(currField.getMultiSelectListSize())) && new Integer(nvl(currField.getMultiSelectListSize(), "0")).intValue() <= 20) {
-				%>
-					<option value="<%=nvl(currField.getMultiSelectListSize())%>" selected><%=nvl(currField.getMultiSelectListSize())%></option> <!-- This is the Editable Option -->
-                <%				
-					 } 
-                %>						
-			</select>			
-		</font></td>
-	</tr> 
-	
-		<%if(! isSQLBased) { %>	
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Default Value: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<input type="text" class="rtabletext" size="20" maxlength="50" name="defaultValue" value="<%= isEdit?nvl(currField.getDefaultValue()):"" %>"></font>
-		    <a href="javascript:showDefaultValuePopup()"><img border="0" src="<%= AppUtils.getImgFolderURL() %>shareicon.gif" alt="Select from list" width="12" height="12"></a>
-        </td></tr>
-		<% } else { %>
-            <% if(Globals.getAllowSQLBasedReports() || AppUtils.isAdminUser(request)) { %>
-
-			<tr>
-				<td class=rbg2 height="30" align="right">
-					<font class=rtabletext>Is Default Value should be SQL</font>
-				</td>
- 				<td class=rbg3 align="left" nowrap>
-					<input type="checkbox" id="isDefaultSQL" name="isDefaultSQL" value="N" <%=currField!=null && currField.getFieldDefaultSQL()!=null && currField.getFieldDefaultSQL().length()>0?" checked":"" %> onClick="toggleDiv(this.checked)">
-				</td>
-			</tr>
-            
-
-            <tbody id="showDefaultSql" style="display:none;">
-               <tr>
-                <td class=rbg2 height="30" align="right">Default SQL: </td>
-				<td class=rbg3>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td valign="top" rowspan="2">
-			<input type="hidden" name="fieldDefaultSQLOrig" value="<%= (currField!=null)?nvl(currField.getFieldDefaultSQL()):"" %>">
-			<textarea class="buttonLabelField" name="fieldDefaultSQL" cols="40" rows="3"><%= (currField!=null)?nvl(currField.getFieldDefaultSQL()):"" %></textarea>
-			</td>
-			<td align="center" valign="top">&nbsp;<input type="Button" att-button btn-type="primary" size="small" class=button value="Verify SQL" onClick="if(document.forma.fieldDefaultSQL.value=='') {alert('Please provide SQL.'); return false; } showTestRunDefaultSQLPopup();">&nbsp;</td>
-			<td rowspan="2" width="60%">&nbsp;</td></tr><tr>
-			<td align="center" valign="middle">&nbsp;<a href="javascript:showSQLInstructions()" class=rtabletext>Instructions</a>&nbsp;</td>
-			</tr></table>
-                </td> 
-              </tr>
-			</tbody>
-            <% if(Globals.getAllowSQLBasedReports() || AppUtils.isAdminUser(request)) { %>
-             <script language="Javascript">
-             toggleDiv(document.getElementById('isDefaultSQL').checked);
-             </script>
-           <% } %>
-		    <% } // if admin user  %>  
-            <tbody id="showDefaultValue">
-               <tr> 
- 				<td class=rbg2 height="30" align="right"> Default Value: </td>
-				<td class=rbg3>
-				<table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td valign="top" rowspan="2">
-					<input type="text" style="width:200px" class="rtabletext" size="20" maxlength="50" name="defaultValue" value="<%= isEdit?nvl(currField.getDefaultValue()):"" %>"></font>
-                 </td>
-				</tr></table>
-		</td>
-	</tr>
-			</tbody>
-            <% if(Globals.getAllowSQLBasedReports() || AppUtils.isAdminUser(request)) { %>
-             <script language="Javascript">
-             toggleDiv(document.getElementById('isDefaultSQL').checked);
-             </script>
-            <% } %>
-		<% } //else %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Verify Field Value As: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<% curValue = nvl((currField!=null)?currField.getValidationType():"", FormField.VT_NONE); %>
-			<select name="validation" onChange="if (this.value =='<%= FormField.VT_DATE%>') ; else dateRangeRow.style.display='none'" style="width: 200px;" >
-				<option value="<%= FormField.VT_NONE               %>"<%= curValue.equals(FormField.VT_NONE              )?" selected":"" %>>--- Do Not Perform Validation ---
-				<option value="<%= FormField.VT_DATE               %>"<%= curValue.equals(FormField.VT_DATE              )?" selected":"" %>>Date
-				<option value="<%= FormField.VT_TIMESTAMP_HR       %>"<%= curValue.equals(FormField.VT_TIMESTAMP_HR      )?" selected":"" %>>TimeStamp (Hour)
-				<option value="<%= FormField.VT_TIMESTAMP_MIN      %>"<%= curValue.equals(FormField.VT_TIMESTAMP_MIN     )?" selected":"" %>>TimeStamp (Hour, Min)
-				<option value="<%= FormField.VT_TIMESTAMP_SEC      %>"<%= curValue.equals(FormField.VT_TIMESTAMP_SEC     )?" selected":"" %>>TimeStamp (Hour, Min, Sec)
-				<option value="<%= FormField.VT_INT                %>"<%= curValue.equals(FormField.VT_INT               )?" selected":"" %>>Integer
-				<option value="<%= FormField.VT_INT_NON_NEGATIVE   %>"<%= curValue.equals(FormField.VT_INT_NON_NEGATIVE  )?" selected":"" %>>Positive Integer
-				<option value="<%= FormField.VT_INT_POSITIVE       %>"<%= curValue.equals(FormField.VT_INT_POSITIVE      )?" selected":"" %>>Positive Integer, Cannot Be Zero
-				<option value="<%= FormField.VT_FLOAT              %>"<%= curValue.equals(FormField.VT_FLOAT             )?" selected":"" %>>Any Number
-				<option value="<%= FormField.VT_FLOAT_NON_NEGATIVE %>"<%= curValue.equals(FormField.VT_FLOAT_NON_NEGATIVE)?" selected":"" %>>Positive Number
-				<option value="<%= FormField.VT_FLOAT_POSITIVE     %>"<%= curValue.equals(FormField.VT_FLOAT_POSITIVE    )?" selected":"" %>>Positive Number, Cannot Be Zero
-			</select></font>
-		</td>
-	</tr> 	
-	<tr id="dateRangeRow" <%if(curValue.equals(FormField.VT_DATE) || curValue.equals(FormField.VT_TIMESTAMP_HR) || curValue.equals(FormField.VT_TIMESTAMP_MIN) || curValue.equals(FormField.VT_TIMESTAMP_SEC)){%><%}else{%>style="display:none"<%}%>>
-		<td colspan="2" class=rbg2>
-		<table width="100%">
-			<tr>
-				<td class=rbg2 align="right" width="33%" height="30"><font class=rtabletext>Valid Date Range: </font></td> 
-				<td width="15%" align="left">
-					<font class=rtabletext >From </font>
-				</td>
-				<td align="left">
-					<font class=rtabletext >To </font>
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<a href="javascript:showRangeSQLInstructions()" class=rtabletext>Instructions</a>&nbsp;
-				</td>
-				
-			</tr>				
-			<tr>
-				<td class=rbg2 align="right"></td> 
-				</td>
-				<td width="15%" align="left">
-					<input type="hidden" name="rangeStartDateSQLOrig" value="<%= (currField!=null)?nvl(currField.getRangeStartDateSQL()):"" %>">
-					<textarea name="rangeStartDateSQL" class="rtabletext" style="width: 200px;height: 100px" cols="20" rows="3"><%= (currField!=null)?nvl(currField.getRangeStartDateSQL()):"" %></textarea>
-					
-				</td>
-				<td align="left">
-					<input type="hidden" name="rangeEndDateSQLOrig" value="<%= (currField!=null)?nvl(currField.getRangeEndDateSQL()):"" %>">
-					<textarea name="rangeEndDateSQL" class="rtabletext" style="width: 200px;height: 100px" cols="20" rows="3"><%= (currField!=null)?nvl(currField.getRangeEndDateSQL()):"" %></textarea>
-					
-				</td>
-			</tr>
-			<tr>
-				<td class=rbg2 align="right"></td> 
-				</td>
-				<td width="15%" align="left">
-					<input type="Button" class=button att-button btn-type="primary" size="small" value="Verify SQL" onClick="if(document.forma.rangeStartDateSQL.value=='') {alert('Please provide SQL.'); return false; } showStartDatetRunSQLPopup();">&nbsp;</td>
-				</td>
-				<td align="left">
-					<input type="Button" class=button att-button btn-type="primary" size="small" value="Verify SQL" onClick="if(document.forma.rangeEndDateSQL.value=='') {alert('Please provide SQL.'); return false; } showEndDateRunSQLPopup();">&nbsp;</td>
-				</td>
-			</tr>
-			<tr>
-				<td class=rbg2 align="right"></td> 
-				<td class=rbg3 align="left">
-					<%	String stDate = "";
-						String endDate = "";
-						if (currField!= null 
-						  && currField.getRangeStartDate() != null && currField.getRangeStartDate().equals("") == false
-						  && currField.getRangeEndDate() != null && currField.getRangeEndDate().equals("") == false){
-							SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy");
-							stDate = dtf.format(currField.getRangeStartDate().toGregorianCalendar().getTime());
-							endDate = dtf.format(currField.getRangeEndDate().toGregorianCalendar().getTime());
-						}
-					%>
-					<input type="text" class="rtabletext" size="10" maxlength="10" style="width: 100px;" name="rangeStartDate" id="rangeStartDate" value="<%=stDate%>">
-					<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar.select(document.getElementById('rangeStartDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">
-					
-
-				</td>
-				<td>
-					<input type="text" class="rtabletext" size="10" maxlength="10" style="width: 100px;" name="rangeEndDate" id="rangeEndDate" value="<%=endDate%>">
-					<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar.select(document.getElementById('rangeEndDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">								
-				</td>
-			</tr>
-			
-		</table>
-		</td>
-		
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>&nbsp; </font></td> 
-		<td class=rbg3 align="left">
-			<% curValue = nvl((currField!=null)?currField.getMandatory():"", "N"); %>
-			<input type="Checkbox" class="checkbox" name="mandatory" value="Y"<%= curValue.equals("Y")?" checked":"" %>>
-			<font class=rtabletext>User must provide value for this field</font>
-		</td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Field Help Text: </font></td> 
-		<td class=rbg3 align="left">
-			<textarea name="fieldHelp" style="width: 100px;" class="rtabletext" cols="40" rows="3"><%= (currField!=null)?nvl(currField.getComment()):"" %></textarea>
-		</td>
-	</tr>
-<% if(Globals.getAllowSQLBasedReports()||AppUtils.isAdminUser(request)) { %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>SQL Generating Custom List of Values: <br>(overrides default list) </font></td> 
-		<td class=rbg3 align="left">
-			<table width="100%" border="0" cellspacing="0" cellpadding="0"><tr><td valign="top" rowspan="2">
-			<input type="hidden" name="fieldSQLOrig" value="<%= (currField!=null)?nvl(currField.getFieldSQL()):"" %>">
-			<textarea id="fieldSQL" name="fieldSQL" class="rtabletext" cols="40" rows="3"><%= (currField!=null)?nvl(currField.getFieldSQL()):"" %></textarea>
-			</td>
-			<td align="center" valign="top">&nbsp;<input type="Button" class=button att-button btn-type="primary" size="small" value="Verify SQL" onClick="if(document.getElementById('fieldSQL').value=='') {alert('Please provide SQL.'); return false; } showTestRunSQLPopup();">&nbsp;</td>
-			<td rowspan="2" width="60%">&nbsp;</td></tr><tr>
-			<td align="center" valign="middle">&nbsp;<a href="javascript:showSQLInstructions()" class=rtabletext>Instructions</a>&nbsp;</td>
-			</tr></table>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" height="30"></td> 
-		<td class=rbg3 align="left">
-		<% curValue = nvl((currField!=null)?currField.getDependsOn():"", "N"); %>
-		<font class=rtabletext><input id='dependsOn' type="checkbox" name="dependsOn" value="Y"<%= curValue.equals("Y") ? "checked":"" %>>
-		<label title="<%=dependsOnHelp%>" style="cursor: pointer;" for="dependsOn">Depends on another Form Field.</label>
-		</td>
-	</tr>
-<% } else { %>
-			<input type="hidden" id="fieldSQL" name="fieldSQL" value="<%= (currField!=null)?nvl(currField.getFieldSQL()):"" %>">
-<% } %>
-<% 	List predefinedValues = (currField!=null&&currField.getPredefinedValueList()!=null)?currField.getPredefinedValueList().getPredefinedValue():null; %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Provide Predefined List of Values:</font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<%	if(predefinedValues==null||predefinedValues.size()==0) { %>
-				Do not use Predefined list - Generate list from database
-			<%	} else { 
-					String value = (String) predefinedValues.get(0); %>
-				<%= value %>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>'; document.forma.delPredefinedValue.value='<%= value %>'; }">
-			<%	} %>
-			</font></td>
-	</tr>
-<%	if(predefinedValues!=null&&predefinedValues.size()>1)
-		for(int i=1; i<predefinedValues.size(); i++) { 
-			String value = (String) predefinedValues.get(i); %>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>&nbsp;</font></td> 
-		<td class=rbg3 align="left" nowrap><font class=rtabletext>
-			<%= value %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>'; document.forma.delPredefinedValue.value='<%= value %>'; }">
-			</font></td>
-	</tr>
-<%		}	// for 
-%>
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>&nbsp; </font></td> 
-		<td class=rbg3 align="left" valign="middle" nowrap><font class=rtabletext>
-			<input type="hidden" name="delPredefinedValue" value="">
-			<input type="text" style="width: 200px;" size="20" maxlength="50" name="newPredefinedValue" value="">
-			<input type="Submit" att-button btn-type="primary" size="small" class=button value="Add To List" onClick="if(document.forma.newPredefinedValue.value=='') {alert('Value cannot be empty.'); return false; } if(! stepDataValidate(false)) return false;  <%= (predefinedValues==null||predefinedValues.size()==0)?"if(! confirm('If you create a list of predefined values, it will be displayed instead of the list selected from the database.\\nAre you sure you want to do that?')) return false; ":"" %>document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_USER %>';">
-			</font></td>
-	</tr>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function stepDataValidate(checkCol) {
-	if(document.getElementById('fieldName').value=="") {
-		alert("Please enter Field Name");
-		document.getElementById('fieldName').focus();
-		document.getElementById('fieldName').select();
-		
-		return false;
-	}   // if
-	
-<% if(rdef.getFormFieldList()!=null) { %>
-	if(false
-<% 		for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); ) { 
-			FormFieldType fft = (FormFieldType) iter.next();
-			
-			if(! (isEdit&&fft.getFieldId().equals(currField.getFieldId()))) { %>
-			    ||(document.getElementById('fieldName').value=="<%= fft.getFieldName() %>")
-<% 		    }
-		} %>
-	   ) {
-		alert("Form field with name "+document.getElementById('fieldName').value+" already exists.\nPlease select another name.");
-		document.getElementById('fieldName').focus();
-		document.getElementById('fieldName').select();
-		
-		return false;
-	}
-<% } %>
-	
-<% if(predefinedValues==null||predefinedValues.size()==0) { %>
-	if(checkCol)
-		if(document.getElementById('fieldColId').selectedIndex==0)
-			if(document.forma.fieldType.selectedIndex!=1&&document.forma.fieldType.selectedIndex!=2) {
-				alert("Field Type can be only Text Box or Text Area if this field is not based on a column.\nPlease change the Field Type or select a column from the list.");
-				document.forma.fieldType.focus();
-				
-				return false;
-			}	// if
-<% } %>
-	
-<% if((Globals.getAllowSQLBasedReports()||AppUtils.isAdminUser(request)) && (rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED))) { %>
-	if(document.forma.fieldSQL.value!=""&&document.forma.fieldSQL.value!=document.forma.fieldSQLOrig.value) {
-		alert("You must verify the SQL.");
-		document.forma.fieldSQL.focus();
-		document.forma.fieldSQL.select();
-		
-		return false;
-	}   // if
-	if(document.forma.fieldDefaultSQL.value!=""&&document.forma.fieldDefaultSQL.value!=document.forma.fieldDefaultSQLOrig.value) {
-		alert("You must verify the Default SQL.");
-		document.forma.fieldDefaultSQL.focus();
-		document.forma.fieldDefaultSQL.select();
-		
-		return false;
-	}   // if
-	if(document.forma.fieldSQL.value.length<=0 && document.forma.fieldDefaultSQL.value.length > 1 ) {
-      alert("SQL Field cannot be empty when Default sql has value.");
-	  return false;
-	}	
-<% } %>
-
-if(document.getElementById('multiSelectListSize') && document.getElementById('multiSelectListSize').options.selectedIndex == 0) {
-	if(!checkNonNegativeInteger(document.forma.multiSelectListSize.options[document.forma.multiSelectListSize.options.selectedIndex].text)) {
-		alert("Please enter number in Multi Select List Size. No Characters are allowed.");
-		return false;
-	} else {
-		if(document.getElementById('multiSelectListSize').options[document.getElementById('multiSelectListSize').options.selectedIndex].text>20) {
-			alert("Please not only 20 items are allowed in Multi-Select form field.");
-			return false;
-		}
-		document.getElementById('multiSelectListSize').options[document.getElementById('multiSelectListSize').options.selectedIndex].value=document.getElementById('multiSelectListSize').options[document.getElementById('multiSelectListSize').options.selectedIndex].text;
-	}
-}
-
-	return true;
-}   // dataValidate
-
-function dataValidate() {
-	return stepDataValidate(true);
-}   // dataValidate
-
-toggleFieldTypeSelection();
-//-->
-</script>
-
-<%-- TODO : need a calendar popup functionality --%>
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
-<iframe id="calendarFrame" class="nav" z-index:199; scrolling="no"  frameborder="0"  width=165px height=165px src="" style="position:absolute; display:none;">
-</iframe>
-<div id="calendarDiv" name="calendarDiv" style="position:absolute; z-index:20000; visibility:hidden; background-color:white;layer-background-color:white;"></div>
-
-	<SCRIPT LANGUAGE="JavaScript">
- 	var oCalendar = new CalendarPopup("calendarDiv", "calendarFrame");    	
-    	oCalendar.setCssPrefix("raptor");
-	</SCRIPT>
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-    private boolean isNumber(String value) { // As per Raptor def, like
-
-        // -$3,270.56
-        value = value.trim();
-    	if(value.length()>2) return false;
-        for (int i = 0; i < value.length(); i++) {
-            char c = value.charAt(i);
-            if (!(Character.isDigit(c) || c == '.' || c == '-' || c == '+' || c == ','
-                    || c == '$' || c == '%'))
-                return false;
-        } // for
-
-        return true;
-    } // isNumber
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_list.jsp
deleted file mode 100644
index 8470dbbc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_form_fields_list.jsp
+++ /dev/null
@@ -1,107 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@page import="org.openecomp.portalsdk.analytics.model.runtime.FormField"%>
-<%@page import="org.openecomp.portalsdk.analytics.system.Globals"%>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-   	
-%>
-
-<table class=mTAB width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=5 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="72%"><b class=rtableheader>Field Name</b></td>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>Re-order</b></td>
-		<td align="center" valign="Middle" width="14%" colspan=2>
-		  <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit()" border="0" width="40" height="28"  att-button btn-type="primary" size="small" title='Add'>Add</button>
-		 <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WSS_ADD_BLANK %>';document.forma.submit()" border="0" width="40" height="28"  att-button btn-type="primary" size="small" title='Add Blank'>Add Blank</button>
-		</td>
-	</tr>
-<%	int iCount = 0;
-	if(rdef.getFormFieldList()!=null)
-		for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); iCount++) { 
-			FormFieldType fft = (FormFieldType) iter.next(); %>
-	<tr class=<%=(iCount % 2 == 0)?"rowalt1":"rowalt2"%>>
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %><!--fft.getOrderBySeq(): <%= fft.getOrderBySeq() %>--></font></td>
-		<td><font class=rtabletext><%= fft.getFieldName() %>&nbsp;[<%= fft.getFieldId()%>]</font></td>
-		<td align="center" nowrap>
-<% 			if(iCount==0) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankdown.gif" width="25" height="7">
-<% 			} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columnup.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_UP %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= fft.getFieldId() %>';">
-<% 			} %>
-<% 			if(iCount==rdef.getFormFieldList().getFormField().size()-1) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankup.gif" width="25" height="7">
-<% 			} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columndown.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_DOWN %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= fft.getFieldId() %>';">
-<% 			} %>
-		</td>
-		
-		<td align="center">
-		  <%if(!fft.getFieldType().equals(FormField.FFT_BLANK)) { %>
-		  <input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_EDIT %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= fft.getFieldId() %>';">
-		  <% } else { %> &nbsp;
-		  <% } %>
-		 </td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to delete form field <%= fft.getFieldName() %> from the report?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= fft.getFieldId() %>'; }"></td>
-	</tr>
-<%		}	// for
-	if(iCount==0) { %>
-	<tr class=rbg2>
-		<td colspan=5 align="center" height="30"><font class=rtabletext>No form fields defined</font></td>
-	</tr>
-<%	} %>
-</table>
-<% if(Globals.customizeFormFieldInfo()) { %>
-<% if(rdef.getFormFieldList()!=null) { %>
-<table class=mTAB width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-  <tr><td class=rbg1 valign="middle"><b class=rtableheader> Defining the Information Bar </b></td></tr>
-  <tr><td align="center">
-    <textarea name="blueBarField" id="blueBarField" rows="20" cols="200" style="width: 200px"><%= nvl(rdef.getFormFieldList().getComment()).length()>0?rdef.getFormFieldList().getComment():""%></textarea>
-  </td></tr>
-  <tr><td align="center">
-    <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WSS_INFO_BAR %>';document.forma.submit()" att-button btn-type="primary" size="small" title='Submit'>Submit</button> 
-  </td></tr>
-  </table>
-<% } %>
-<% } %>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_javascript.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_javascript.jsp
deleted file mode 100644
index d225cb56..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_javascript.jsp
+++ /dev/null
@@ -1,167 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants"%>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence"%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType"%>
-<%@ page import="java.util.Iterator"%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.JavascriptItemType"%>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils"%>
-
-<% 
-   ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-   WizardSequence ws = rdef.getWizardSequence();
-   FormFieldType fft = null;
-   boolean isFormfieldPresent = (rdef.getFormFieldList()!=null && rdef.getFormFieldList().getFormField().size()<=0);
-%>
-
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 valign="top"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - <%= ws.getCurrentStep() %> Wizard <%= isFormfieldPresent?" <a href=\"javascript:uitmpl_qh('javascript_text'); if(typeof window.parent.resizeWindow == 'function') window.parent.resizeWindow();\" class=\"qh-link\" style=\"position:fixed;\"></a>":""%></b></td>
-	</tr>
-      <% if(isFormfieldPresent) { %>	  
-	   <tr>
-	   	<td class="nopad"><!-- quick help text -->
-	   	<div id="javascript_text" class="mQH">
-	   		<p><span class="label">Form Field Information:<BR></span>
-	   		   <table>
-	   		 <%
-	   		    
-	      		for(Iterator iter1=rdef.getFormFieldList().getFormField().iterator(); iter1.hasNext();) { 
-	    			fft = (FormFieldType) iter1.next(); 
-	   		 %>
-	   		        
-	   		        <%= "<TR><TD align=\"right\">" +  fft.getFieldName() +":</TD><TD>&nbsp;</TD><TD>document.formd." + fft.getFieldId()+"</TD></TR>" %> 
-	   		 <% } 
-	   		 %> 
-	   		  </table>  
-	   		</p>
-	   	</div>
-	   	<!-- /quick help text --></td>	   	
-	</tr>
-	   <% } %>
-	<tr>
-		<td  width="65%" class=rbg3 align="center">
-			<textarea name="<%= AppConstants.RI_JAVASCRIPT%>" cols="100" rows="30"><%= (rdef.getJavascriptElement()!=null)?rdef.getJavascriptElement():"" %></textarea> 
-		</td>
-	</tr> 
-    <tr>
-		<table class=mTAB width="100%" class="tableBorder" border="3" cellspacing="1" cellpadding="3" align=center>
-			<tr class=rbg1>
-				<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-				<td align="center" valign="Middle" width="7%"><b class=rtableheader>Form Field</b></td>
-				<td align="center" valign="Middle" width="72%"><b class=rtableheader>Calling Javascript</b></td>
-				<td align="center" valign="Middle" width="14%">
-		                   &nbsp;
-                 </td>
-			</tr>
-            <%
-            int iCount = 0;
-            String javascriptFieldId = "";
-            String id = "";
-            String callText = "";
-            
-            int count = 0;
-            if(rdef.getJavascriptList()!=null )  {
-      		for(Iterator iter=rdef.getJavascriptList().getJavascriptItem().iterator(); iter.hasNext(); ) { 
-      			count++;
-      			JavascriptItemType javascriptItem = (JavascriptItemType) iter.next();
-      			id = javascriptItem.getId();
-      			javascriptFieldId = javascriptItem.getFieldId();
-      			callText = javascriptItem.getCallText();
-      		%> 
-			<tr class=<%=(count%2==0)?"rowalt2":"rowalt1"%>> 
-				<td align="center" height="30"><font class=rtabletext><%= ++iCount %></font></td>
-				<td align="center" >
-                 <select name="javascriptFormField-<%=id %>" style="width: 100px">
-     				<option value="-1"> <-- SELECT --> </option>
-					<option value="ol1" <%= ("ol1".equals(javascriptFieldId))?" selected":""%>>OnLoad</option>
-	                <option value="os1" <%= ("os1".equals(javascriptFieldId))?" selected":""%>>OnSubmit</option>
-
-
-	              <%
-	              if(rdef.getFormFieldList()!=null){
-	      		for(Iterator iter1=rdef.getFormFieldList().getFormField().iterator(); iter1.hasNext();) { 
-	    			fft = (FormFieldType) iter1.next(); 
-	    			%>
-					<option value="<%=fft.getFieldId() %>" <%= (fft.getFieldId().equals(javascriptFieldId))?" selected":""%>><%=fft.getFieldName() %></option>
-				<%					
-	              }
-	              }
-	             %> 
-	              
-				</select>
-				</td>
-				<td align="center">
-					<textarea name="callText-<%=id %>" rows="3" cols="100"><%=callText %></textarea>	
-				</td>
-                <td width="30%"> 
-                  <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_SAVE %>'; document.forma.<%=AppConstants.RI_JAVASCRIPT_ITEM_ID %>.value='<%= id %>'; document.forma.submit();" width="12" height="12"   att-button btn-type="primary" size="small" title='Save'>Save</button>
-                  <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%=AppConstants.RI_JAVASCRIPT_ITEM_ID %>.value='<%= id %>'; document.forma.submit();" width="12" height="12"   att-button btn-type="primary" size="small" title='Delete'>Delete</button>
-                </td>
-			</tr>
-			<% } %>
-			<% } 
-             
-             id = "-1";
-             %>
-			<tr class=rowalt1>
-				<td align="center" height="30"><font class=rtabletext><%= ++iCount %></font></td>
-				<td align="center">
-                 <select name="javascriptFormField-<%=id %>" style="width: 100px">
-    				<option value="-1"> <-- SELECT --> </option>
-					<option value="ol1">OnLoad</option>
-					<option value="os1">OnSubmit</option>
-					
-	              <%
-	              if(rdef.getFormFieldList()!=null){
-	      		for(Iterator iter1=rdef.getFormFieldList().getFormField().iterator(); iter1.hasNext();) { 
-	    			fft = (FormFieldType) iter1.next(); 
-	    			%>
-					<option value="<%=fft.getFieldId() %>"><%=fft.getFieldName() %></option>
-				<%					
-	              }
-	              }
-	              %>
-				</select>
-				</td>
-				<td align="center">
-					<textarea name="callText-<%=id %>" rows="3" cols="100"></textarea>		
-				</td>
-                <td width="40%"> 
-                  <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_SAVE %>'; document.forma.<%=AppConstants.RI_JAVASCRIPT_ITEM_ID %>.value='<%= id %>'; document.forma.submit();" width="12" height="12"   att-button btn-type="primary" size="small" title='Save'>Save</button>
-                  <button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%=AppConstants.RI_JAVASCRIPT_ITEM_ID %>.value='<%= id %>'; document.forma.submit();" width="12" height="12"   att-button btn-type="primary" size="small" title='Delete'>Delete</button>
-                </td>
-			</tr>
-		</table>	
-	</tr>  
-	
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
- return true;
-}   // dataValidate
-//-->
-</script>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp
deleted file mode 100644
index 2b170385..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_log.jsp
+++ /dev/null
@@ -1,109 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Log" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportLogEntry" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-
-<%	String errorMsg = null;
-	Vector reportLogEntries = null; 
-	try {
-		reportLogEntries = ReportLoader.loadReportLogEntries(reportID);
-	} catch(Exception e) { 
-		Log.write("ERROR [wizard_log.jsp] Unable to load report log entries. Exception: "+e.getMessage());
-		errorMsg = "<b>ERROR: </b>Unable to load report log entries from the database <!--Exception: "+e.getMessage()+"-->";
-	} %>
-
-<table class="mTAB" width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=6 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="31%"><b class=rtableheader>Date/Time</b></td>
-		<td align="center" valign="Middle" width="31%"><b class=rtableheader>User Name</b></td>
-		<td align="center" valign="Middle" width="31%"><b class=rtableheader>Action</b></td>
-	    <td align="center" valign="Middle" width="31%"><b class=rtableheader>Execution Time</b></td>				
-	    <td align="center" valign="Middle" width="31%"><b class=rtableheader>Run</b></td>	    
-	</tr>
-<%	int iCount = 0;
-	if(reportLogEntries!=null)
-		for(Iterator iter=reportLogEntries.iterator(); iter.hasNext(); iCount++) { 
-			ReportLogEntry logEntry = (ReportLogEntry) iter.next(); %>
-	<tr <%= (iCount%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" height="30" class="tdborder"><font class=rtabletext><%= iCount+1 %></font></td>
-		<td align="center" class="tdborder"><font class=rtabletext><%= logEntry.getLogTime() %></font></td>
-		<td class="tdborder"><font class=rtabletext><%= logEntry.getUserName() %></font></td>
-		<td class="tdborder"><font class=rtabletext><%= logEntry.getAction() %></font></td>
-        <td class="tdborder"><font class=rtabletext><%= logEntry.getTimeTaken() %></font></td>				
-        <td class="tdborder"><font class=rtabletext><%= logEntry.getRunIcon() %></font></td>        
-        		
-	</tr>
-<%	}   // for
-	if(errorMsg!=null) { %>
-	<tr class=rbg6>
-		<td colspan=6 align="center" height="30"><font class=rerrortextsm><%= errorMsg %></font></td>
-	</tr>
-<%	} else if(iCount==0) { %>
-	<tr class=rbg2>
-		<td colspan=6 align="center" height="30"><font class=rtabletext>No log entries found</font></td>
-	</tr>
-<%	} else { %>
-	<tr class=rbg1>
-		<td colspan=6 align="left" valign="Middle" height="30">
-			<input type="Submit" class=button value="Clear Log" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>';">
-		</td>
-	</tr>
-<%	}	// if 
-%>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp
deleted file mode 100644
index 50fe1da6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_map.jsp
+++ /dev/null
@@ -1,424 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@page import="org.openecomp.portalsdk.analytics.xmlobj.ReportMap"%>
-<%
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-   	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED);    
-	ReportMap repMap = rdef.getReportMap();
-	String addressColumn = "";
-	String latColumn = "";
-	String longColumn = "";
-	String legendColumn = "";
-	String colorColumn = "";
-	String dataColumn = "";
-	String isMapAllowed = "";
-	String addAddress = "N";
-	String useDefaultSize = "";
-	String width = "";
-	String height = "";
-
-	int reportMapSize = 0;
-	if (repMap != null){
-		if (repMap.getAddressColumn() != null)
-			addressColumn = repMap.getAddressColumn();
-		
-		if (repMap.getDataColumn() != null)
-			dataColumn = repMap.getDataColumn();
-		if (repMap.getIsMapAllowedYN() != null)
-			isMapAllowed = repMap.getIsMapAllowedYN();
-		if (repMap.getAddAddressInDataYN() != null)
-			addAddress = repMap.getAddAddressInDataYN();
-		if (repMap.getLatColumn() != null)
-			latColumn = repMap.getLatColumn();
-		if (repMap.getLongColumn() != null)
-			longColumn = repMap.getLongColumn();
-		if (repMap.getColorColumn() != null)
-			colorColumn = repMap.getColorColumn();
-		if (repMap.getLegendColumn() != null)
-			legendColumn = repMap.getLegendColumn();
-		if (repMap.getUseDefaultSize() != null)
-			useDefaultSize = repMap.getUseDefaultSize();
-		if (repMap.getHeight() != null)
-			height = repMap.getHeight();
-		if (repMap.getWidth() != null)
-			width = repMap.getWidth();
-		
-		reportMapSize = repMap.getMarkers().size();
-	}
-	
-%>
-<%@page import="org.openecomp.portalsdk.analytics.xmlobj.Marker"%>
-
-<script>
-function enable_text(status)
-{
-//status=!status; 
-document.forma.height.disabled = status;
-document.forma.width.disabled = status;
-}
-
-function isNumberKey(evt)
-{
-
-  if (document.forma.useDefaultSize.checked==true)
-  {
-	  document.forma.height.disabled = status;
-	  document.forma.width.disabled = status;
-	  return false;
-  }
-			
-   var charCode = (evt.which) ? evt.which : event.keyCode
-   if (charCode > 31 && (charCode < 48 || charCode > 57))
-      return false;
-
-   return true;
-}
-
-
-function checkValue()
-{
-	   
-	   if (document.forma.isMapAllowed.checked==false)
-	   {
-		  return true;
-	   }
-	   if (document.forma.useDefaultSize.checked==true)
-	   {
-		  return true;
-	   }
-	   if ((document.forma.height.value < 1) )
-	   {
-		   alert(document.forma.height.name + ' can not be zero');
-		   document.forma.height.focus(); return false;
-	   } 
-	   if ((document.forma.width.value < 1) )
-	   {
-		   alert(document.forma.width.name + ' can not be zero');
-		   document.forma.width.focus(); return false;
-	   } 
-	   return true;
-}
-
-</script>
-<table class=mTAB width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=8 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		
-	</tr>
-	<tr>
-		<td align="left" width="10%">Map Enabled ?</td>
-		<td colspan=8>
-			<input id = "isMapAllowed" name="isMapAllowed" type="checkbox" value="Y" <%if(isMapAllowed != null && isMapAllowed.equals("Y")){ %> checked <%} %>/>
-		</td>
-	</tr>
-	
-		<tr>
-		<td align="left" width="10%">Default Size ?</td>
-		<td width="15%">
-			<input id = "useDefaultSize" name="useDefaultSize" type="checkbox" 
-			 onclick="enable_text(this.checked)" 
-			value="Y" <%if(useDefaultSize != null && useDefaultSize.equals("Y")){ %> checked <%} %>/>
-		</td>
-		
-		<td align="left" width="10%">Height </td>
-		<td width="15%">
-			<input id = "height" name="height" onkeypress="return isNumberKey(event)"   type="textbox" value="<%=height%> "   />
-			<!-- 
-			<input id = "dummy" name=""dummy" type="textbox"  visible="false"  />
-			 -->
-			 <input type="hidden" name="checkbox" value="checked">
-		</td>
-		
-		<td align="left" width="10%">Width </td>
-		<td width="15%">
-			<input id = "width" name="width"  onkeypress="return isNumberKey(event)"    type="textbox" value="<%=width%> "    />
-		</td>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-	
-	
-	<tr>
-		<td align="left" width="10%">Lat Column</td>
-		<td width="15%">
-			<select name="latColumn">
-				<option value=""> --Select-- </option>
-<%
-				int iCount = 0;
-				List reportCols = rdef.getAllColumns();
-				Iterator iter = reportCols.iterator();
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();
-%>				
-					<option value="<%= dct.getColId() %>" <%if(latColumn.equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>
-		
-		<td align="left" width="10%">Long Column</td>
-		<td width="15%">
-			<select name="longColumn">
-				<option value=""> --Select-- </option>
-<%
-				iCount = 0;
-				iter = reportCols.iterator();
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();
-%>				
-					<option value="<%= dct.getColId() %>" <%if(longColumn.equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>
-		<td align="left" width="10%">Color Column</td>
-		<td width="15%">
-			<select name="colorColumn">
-				<option value=""> --Select-- </option>
-<%
-				iCount = 0;
-				iter = reportCols.iterator();
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();
-%>				
-					<option value="<%= dct.getColId() %>" <%if(colorColumn.equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>
-		<td align="left" width="10%">Legend Column</td>
-		<td width="15%">
-			<select name="legendColumn">
-				<option value=""> --Select-- </option>
-<%
-				iCount = 0;
-				iter = reportCols.iterator();	
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();				
-%>
-					<option value="<%= dct.getColId() %>" <%if(legendColumn.equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>
-		
-	</tr>
-	<tr>
-		<td align="left" width="10%">&nbsp;</td>
-		<td colspan=7>
-			<input type="button" value="Add Marker Details" onclick="javascript:createClicked();"/>
-		</td>
-	</tr>
-	<input type="hidden" name="markerCount" id="markerCount" value="<%=reportMapSize%>" />
-	<tr style="display:none;" id="cloneableRow">
-				  	
-		<td align="left" width="10%">Data Header </td>
-		<td width="15%">
-			<input type="text" name="dataHeader" value="" />
-		
-		</td>
-		<td align="left" width="10%">Display Column</td>
-		<td width="15%">
-			<select name="dataColumn">
-				<option value=""> --Select-- </option>
-<%
-				iCount = 0;
-				iter = reportCols.iterator();	
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();				
-%>
-					<option value="<%= dct.getColId() %>" <%if(dataColumn.equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>		
-		<td width="5%">
-			<img onclick="javascript:deleteRow(this);" height="12" alt="Remove" width="12" src="<%=AppUtils.getImgFolderURL()%>deleteicon.gif" border="0" value="" />
-		</td>
-	    <td colspan="3">&nbsp;</td>
-	</tr>
-	
-	
-<%		for (int i = 1; repMap != null && i < repMap.getMarkers().size(); i ++){ 
-		Marker marker = (Marker) repMap.getMarkers().get(i);
-%>
-		<tr>
-		<td align="left" width="10%">Data Header</td>
-		<td width="15%">
-			<input type="text" name="dataHeader<%=i%>" value="<%=marker.getDataHeader()%>" />
-		</td>
-		
-		<td align="left" width="10%">Display Column</td>
-		<td width="15%">
-			<select name="dataColumn<%=i%>">
-				<option value=""> --Select-- </option>
-<%
-				iCount = 0;
-				iter = reportCols.iterator();	
-				for(; iter.hasNext(); iCount++) { 
-					DataColumnType dct = (DataColumnType) iter.next();				
-%>
-					<option value="<%= dct.getColId() %>" <%if(marker.getDataColumn().equals(dct.getColId())){ %> selected <%}%> ><%= dct.getDisplayName() %></option>
-<%
-				}
-%>
-			</select>
-		
-		
-		</td>
-		<td width="5%">
-			<img onclick="javascript:deleteRow(this);" height="12" alt="Remove" width="12" src="<%=AppUtils.getImgFolderURL()%>deleteicon.gif" border="0" value="" />
-		</td>
-		<td colspan="3">&nbsp;</td>
-		</tr>
-		<%}%>
-
-	
-	
-</table>
-<br>
-
-<script >
-
-function createClicked() {
-	var alreadyEditable = "New";
-	
-	var row = document.getElementById('cloneableRow');
-	var newR = duplicateRowByIndex(row, 0);
-	var tbl = getParentTable(newR);
-	var editIndex = 0;
-	if (document.all.markerCount != null || document.all.markerCount.value != ""){
-		editIndex = document.all.markerCount.value;
-	}
-	if (tbl.rows.length%2 == 0){
-		newR.className="alternateRow";
-	}
-	for (var xx = 0; xx < newR.cells.length; xx ++){
-		for (var yy=0; yy < newR.cells[xx].childNodes.length; yy++){
-			if (newR.cells[xx].childNodes[yy] != null 
-				&& newR.cells[xx].childNodes[yy].name){
-				newR.cells[xx].childNodes[yy].name = "" + newR.cells[xx].childNodes[yy].name + editIndex;
-				newR.cells[xx].childNodes[yy].id = newR.cells[xx].childNodes[yy].name ;
-			}
-		}
-	}
-	editIndex = parseInt(editIndex) + parseInt(1);
-	document.all.markerCount.value = editIndex;
-	newR.style.display = "block";
-	//document.getElementById('scrollableTable').scrollTop =0;
-    return false;
-}  
-
-function deleteRow(item){
-	var row = getParentRow(item);
-	var tab = getParentTable(row);
-	tab.deleteRow(row.rowIndex);
-	
-}
-
-duplicateRowByIndex = function()
-{
-	if(arguments.length == 0 ) { return };
-	pRow = arguments[0];
-	var tbl = getParentTable(pRow);
-	var newRowIndex = 1 ;
-	if(arguments[1] && parseInt(arguments[1]) != NaN )
-	{
-		newRowIndex = parseInt(arguments[1]);
-		if(newRowIndex == 0 ){ newRowIndex = tbl.rows.length - 1 ; }
-	}
-
-	if(pRow == null) { return ; }
-	var oldRow = pRow;
-	var newRow = oldRow.cloneNode(true);
-	if (arguments[1] == 0){
-		oldRow.parentNode.insertBefore(newRow, oldRow.nextSibling);
-	}
-	else{
-		oldRow.parentNode.insertBefore(newRow, tbl.rows[newRowIndex]);
-	}
-	newRow.id = "";
-	return newRow;
-}
-
-function getParentRow(cell)
-{
-	var pNode = cell.parentNode;
-	for( var xx = 0 ; xx < 10 ; xx++)
-	{
-		if(pNode.cells) { return pNode;}
-		else { pNode = pNode.parentNode; }
-	}
-	alert("Unable to find parent row"); return false;
-}
-
-function getParentTable(row)
-{
-	var pNode = row.parentNode;
-	for( var xx = 0 ; xx < 10 ; xx++)
-	{
-
-		if(pNode.rows && (pNode.tagName == "TABLE" || pNode.tagName == "table")) {return pNode;}
-		else { pNode = pNode.parentNode; }
-	}
-	alert("Unable to find parent table"); return false;
-}
-
-
-
-function dataValidate() {
-	return checkValue();
-	//return true;
-}
-
-</script>
-
-
-
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp
deleted file mode 100644
index 688e7ff7..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_run.jsp
+++ /dev/null
@@ -1,74 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-%>
-<script language="JavaScript">
-<!--
-function showSQLPopup() {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.sql", "showSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showSQLPopup
-//-->
-</script>
-
-<table width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr>
-		<td class=rbg2>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td align="right" valign="middle" height="20" width="100%" nowrap>
-						<b class=rtabletext>
-						    <a href="javascript:showSQLPopup()">SQL&nbsp;<img border="0" src="<%= AppUtils.getImgFolderURL() %>txt_icon.gif" alt="Click here to view the generated SQL" width="12" height="12"></a>&nbsp;
-						</b>
-					</td>
-				</tr>
-				<tr>
-					<td align="center" valign="middle" height="60" width="100%">
-						<font class=rtabletext>
-							<b>Report definition successfully completed.</b><br>
-							<br>
-							<input type="hidden" name="<%= AppConstants.RI_RESET_PARAMS %>" value="Y">
-							<input type="hidden" name="<%= AppConstants.RI_REFRESH %>" value="Y">
-							<a att-button btn-type="primary" size="small"  href="report.htm#/report_run/c_master=<%=rdef.getReportID()%>&refresh=Y">Run</a>
-						</font>
-					</td>
-				</tr>
-				<tr>
-					<td height="20">&nbsp;</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-<br>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
deleted file mode 100644
index df5df348..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule.jsp
+++ /dev/null
@@ -1,376 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<% 
-  ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-  WizardSequence ws = rdef.getWizardSequence();
-  ReportSchedule reportSchedule = rdef.getReportSchedule(); 
-  String remoteDbPrefix = (String) session.getAttribute("remoteDB");
-  boolean isSQLAllowed = Globals.getAllowSQLBasedReports();
-  
-%>
-<%@page import="java.util.Calendar"%>
-<%@page import="java.text.DateFormat"%>
-<%@page import="java.text.SimpleDateFormat"%>
-<%@page import="java.util.TimeZone"%>
-<%@page import="java.util.Date"%>
-<%@page import="org.openecomp.portalsdk.analytics.model.ReportLoader"%>
-<script language="JavaScript">
-<!--
-function showTestConditionPopup() {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.test.cond&remoteDbPrefix=<%=remoteDbPrefix%>&<%= AppConstants.RI_FORMATTED_SQL %>="+escape(""+document.forma.conditionSQL.value), "testCondSQLPopup", "width=450,height=180,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestConditionPopup
-	
-function exclusiveCheckBox(which) {
-	  var size = 2;
-	  for (i=0; i<size; i++) {
-	    if(document.getElementById("notify" + i) != which) {
-	    	document.getElementById("notify" + i).checked = false;
-	    } 
-	  }
-	  //alert("exclusive " + which.form.notify_type.value);
-}	
-function initFormFields() {
-
-	var requestStr = "<%=reportSchedule.getFormFields()%>";
-	//alert(requestStr);
-       if(requestStr.length > 0) {
-	SplitName = requestStr.substring(1,requestStr.length).split("&");
- 	for (num = 0; num < SplitName.length; num++) {
- 			keyValue = SplitName[num].split("=");
-			//alert(keyValue[0]+ " " + keyValue[1]);
-			var obj = eval("document.forma."+keyValue[0]);
-			if(obj) {
-			    if(obj.tagName == "SELECT") {
-					//var opt = document.getElementsByName(keyValue[0]);
-					var selString = "";
-					for (var intLoop=0; intLoop < obj.length; intLoop++) {
-					         if (obj[intLoop].value == keyValue[1]) {
-                                  obj[intLoop].selected=true; 
-                                  break;					            
-					         }
-					}
-								    	
-			    } else 
-			  document.getElementsByName(keyValue[0])[0].value = unescape(keyValue[1]);
-	}
-       }
-}
-}	
-//-->
-</script>
-<script language="javascript" src="<%= AppUtils.getBaseFolderURL() %>js/other_scripts.js"></script>
-<%-- TODO : need a calendar popup functionality --%>
-<link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/calendar.css">
- <iframe id="calendarFrame" class="nav" z-index:199; scrolling="no"  frameborder="0"  width=165px height=165px src="" style="position:absolute; display:none;">
-</iframe>
- <div id="calendarDiv" name="calendarDiv" style="position:absolute; z-index:20000; visibility:hidden; background-color:white;layer-background-color:white;"></div>
- <%
- Calendar startCalendarDate = Calendar.getInstance();
- startCalendarDate.add(Calendar.DAY_OF_MONTH, - 540); 
- Calendar endCalendarDate = Calendar.getInstance();
- endCalendarDate.add(Calendar.DAY_OF_MONTH, 540);
- SimpleDateFormat dtf = new SimpleDateFormat("MM/dd/yyyy");
- SimpleDateFormat oracleDateFormat = new SimpleDateFormat("MM/dd/yyyy kk:mm:ss");
- Date sysdate = oracleDateFormat.parse(ReportLoader.getSystemDateTime());
- SimpleDateFormat dtimestamp = new SimpleDateFormat(Globals.getScheduleDatePattern());
- //dtimestamp.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone())); 
- 
-
- 
-	 
- %>
-
-	<SCRIPT LANGUAGE="JavaScript">
- 	var oCalendar = new CalendarPopup("calendarDiv");
-    	
-    	oCalendar.addDisabledDates(null, "<%=dtf.format(startCalendarDate.getTime())%>");
-		oCalendar.addDisabledDates("<%=dtf.format(endCalendarDate.getTime())%>", null);
-
-
-    	oCalendar.setCssPrefix("raptor");
-	</SCRIPT>
-<table class=mSDL width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-   <% if(request.getAttribute("schedule_only")!=null) { %>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-   <% } %>	
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader><a href="javascript:uitmpl_qh('schedule_help')" class="qh-link"></a>Please enter Time in <%= Globals.getTimeZone()%>. The Current System Time is <%=dtimestamp.format(sysdate)%>&nbsp;<%=Globals.getTimeZone()%></b></td>
-	</tr>
-	<tr>
-			<td colspan=2 class="nopad"><!-- quick help text -->
-				<div id="schedule_help" class="mQH">
-					<p><span class="label">Quick Help:</span>
-						</p>
-				</div>
-			<!-- /quick help text --></td>
-	</tr>	
-	
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Schedule Emails: </font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap><font class=rtabletext>
-			<input type='radio' name='schedEnabled' id='schedEnabled' value='Y' <%= reportSchedule.getSchedEnabled().equals("Y")?" checked":"" %> />Yes
-			&nbsp;
-			<input type='radio' name='schedEnabled' id='schedEnabled' value='N' <%= reportSchedule.getSchedEnabled().equals("N")?" checked":"" %> />No
-			</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Email Attachment:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap>
-			<font class=rtabletext>
-			<input type='radio' name='notify' id='notify' value='2' <%= reportSchedule.getNotify_type().equals("2")?" checked":(reportSchedule.getNotify_type().length()<=0)?" checked":(!reportSchedule.getNotify_type().equals("4"))? " checked " :"" %> />PDF Attachment
-			&nbsp;&nbsp;
-			<input type='radio' name='notify' id='notify' value='4' <%= reportSchedule.getNotify_type().equals("4")?" checked":"" %> />Excel Attachment
-			<input type='hidden' name='notify_type' value='1'/>
-			</font>
-	    </td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Recurrence: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="schedRecurrence">
-				<option value=""                                  <%= reportSchedule.getRecurrence().equals(""                         )?" selected":"" %>>One Time
-				<option value="<%= AppConstants.SR_HOURLY      %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_HOURLY     )?" selected":"" %>>Hourly
-				<option value="<%= AppConstants.SR_DAILY       %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_DAILY      )?" selected":"" %>>Daily
-				<option value="<%= AppConstants.SR_DAILY_MO_FR %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_DAILY_MO_FR)?" selected":"" %>>Daily Mo-Fr
-				<option value="<%= AppConstants.SR_WEEKLY      %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_WEEKLY     )?" selected":"" %>>Weekly
-				<option value="<%= AppConstants.SR_MONTHLY     %>"<%= reportSchedule.getRecurrence().equals(AppConstants.SR_MONTHLY    )?" selected":"" %>>Monthly
-			</select></font></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Start Date: </font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<input type="text" size="10" maxlength="10" name="schedStartDate" value="<%= reportSchedule.getStartDate() %>">
-			<!--<a href="#" onClick="window.dateField = document.forma.schedStartDate;calendar = window.open('<%= AppUtils.getRaptorActionURL() %>popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;">
-				<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20">
-			</a>-->
-			<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar.select(document.getElementById('schedStartDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<select name="schedHour">
-				<option value="01"<%= reportSchedule.getRunHour().equals("01")?" selected":"" %>>1
-				<option value="02"<%= reportSchedule.getRunHour().equals("02")?" selected":"" %>>2
-				<option value="03"<%= reportSchedule.getRunHour().equals("03")?" selected":"" %>>3
-				<option value="04"<%= reportSchedule.getRunHour().equals("04")?" selected":"" %>>4
-				<option value="05"<%= reportSchedule.getRunHour().equals("05")?" selected":"" %>>5
-				<option value="06"<%= reportSchedule.getRunHour().equals("06")?" selected":"" %>>6
-				<option value="07"<%= reportSchedule.getRunHour().equals("07")?" selected":"" %>>7
-				<option value="08"<%= reportSchedule.getRunHour().equals("08")?" selected":"" %>>8
-				<option value="09"<%= reportSchedule.getRunHour().equals("09")?" selected":"" %>>9
-				<option value="10"<%= reportSchedule.getRunHour().equals("10")?" selected":"" %>>10
-				<option value="11"<%= reportSchedule.getRunHour().equals("11")?" selected":"" %>>11
-				<option value="12"<%= reportSchedule.getRunHour().equals("12")?" selected":"" %>>12
-			</select>
-			<select name="schedMin">
-				<option value="00"<%= reportSchedule.getRunMin().equals("00")?" selected":"" %>>00
-				<option value="15"<%= reportSchedule.getRunMin().equals("15")?" selected":"" %>>15
-				<option value="30"<%= reportSchedule.getRunMin().equals("30")?" selected":"" %>>30
-				<option value="45"<%= reportSchedule.getRunMin().equals("45")?" selected":"" %>>45
-			</select>
-			<select name="schedAMPM">
-				<option value="AM"<%= reportSchedule.getRunAMPM().equals("AM")?" selected":"" %>>AM
-				<option value="PM"<%= reportSchedule.getRunAMPM().equals("PM")?" selected":"" %>>PM
-			</select>
-			
-			</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>End Date: </font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<input type="text" size="10" maxlength="10" name="schedEndDate" value="<%= reportSchedule.getEndDate() %>">
-			<!--<a href="#" onClick="window.dateField = document.forma.schedEndDate;calendar = window.open('<%= AppUtils.getRaptorActionURL() %>popup.calendar','cal','WIDTH=200,HEIGHT=250');return false;">
-				<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20">
-			</a>-->
-			<img src="<%= AppUtils.getImgFolderURL() %>calender_icon.gif" align=absmiddle border=0 width="20" height="20" onClick="oCalendar.select(document.getElementById('schedEndDate'),event,'MM/dd/yyyy'); return false;"  style="cursor:hand">
-			</font></td>
-	</tr>
-
-        <% if(AppUtils.isAdminUser(request) || isSQLAllowed ) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Use Condition:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap><font class=rtabletext>
-			<input type="checkbox" name="conditional" value="Y"<%= reportSchedule.getConditional().equals("Y")?" checked":"" %>> Send Emails Only When Condition Is Met
-			</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Condition SQL:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap><font class=rtabletext>SELECT 1 FROM DUAL WHERE EXISTS (<br>
-			<textarea name="conditionSQL" cols="40" rows="3"><%= nvl(reportSchedule.getConditionSQL()) %></textarea>
-			)
-			&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type="Button" class=button value="Test" onClick="showTestConditionPopup()">
-			&nbsp;
-			</font></td>
-	</tr>
-        <% } %>	 	
-
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Max rows in attachment:</font></td> 
-		<td class=rbg3 align="left" width="50%" valign="middle" nowrap>
-			<input type='text' name='downloadLimit' value="<%=reportSchedule.getDownloadLimit()%>" size='4'/>
-	   </td>
-	</tr> 			
-	
-	<jsp:include page="wizard_schedule_formfield_include.jsp" flush="true" />
-	<script type="text/javascript">initFormFields();</script>	
-	
-<% 	List emailToUsers = reportSchedule.getEmailToUsers();
-	for(int i=0; i<emailToUsers.size(); i++) { 
-		IdNameValue userValue = (IdNameValue) emailToUsers.get(i); %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (i==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-			<%= userValue.getName() %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= userValue.getId() %>'; }">
-			</font></td>
-	</tr>
-<%	}	// for 
-	List emailToRoles = reportSchedule.getEmailToRoles();
-	for(int i=0; i<emailToRoles.size(); i++) { 
-		IdNameValue roleValue = (IdNameValue) emailToRoles.get(i); %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (emailToUsers.size()==0&&i==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>Everyone With Role:&nbsp;
-			<%= roleValue.getName() %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! dataValidate()) {return false;} else if(! confirm('Are you sure?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_ROLE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= roleValue.getId() %>'; }">
-			</font></td>
-	</tr>
-<%	}	// for 
-	
-	Vector remainingUsers = Utils.getUsersNotInList(emailToUsers,request);
-	Vector remainingRoles = Utils.getRolesNotInList(emailToRoles,request);
-	if((emailToUsers.size()+emailToRoles.size()==0)||(remainingUsers.size()>0)||(remainingRoles.size()>0)) { %>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext><%= (emailToUsers.size()+emailToRoles.size()==0)?"Email To: ":"&nbsp;" %></font></td> 
-		<td class=rbg3 align="left" width="50%" nowrap><font class=rtabletext>
-<%		if(remainingUsers.size()>0) { %>
-			<select name="schedEmailAdd" onChange="if(! dataValidate()) {selectedIndex=0;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_USER %>'; document.forma.submit();}">
-			    <option value="" selected>--- Select User ---
-<% 			for(int i=0; i<remainingUsers.size(); i++) {
-				IdNameValue userValue = (IdNameValue) remainingUsers.get(i); %>
-			    <option value="<%= userValue.getId() %>"><%= userValue.getName() %>
-<% 			}	// for %>
-			</select>
-<%		} else { %>
-			No user emails available
-<%		} %>
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<%		if(remainingRoles.size()>0) { %>
-			<select name="schedEmailAddRole" onChange="if(! dataValidate()) {selectedIndex=0;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_ROLE %>'; document.forma.submit();}">
-			    <option value="" selected>--- Select Role ---
-<% 			for(int i=0; i<remainingRoles.size(); i++) {
-				IdNameValue roleValue = (IdNameValue) remainingRoles.get(i); %>
-			    <option value="<%= roleValue.getId() %>"><%= roleValue.getName() %>
-<% 			}	// for %>
-			</select>
-<%		} else { %>
-			No roles available
-<%		} %>
-		</font></td>
-	</tr>
-<%	}	// if 
-%>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	if(! checkDate(document.forma.schedStartDate.value, true)) {
-		alert("Invalid Start Date. The date format should be MM/DD/YYYY");
-		document.forma.schedStartDate.focus();
-		document.forma.schedStartDate.select();
-		return false;
-	}
-	if(! checkDate(document.forma.schedEndDate.value, true)) {
-		alert("Invalid End Date. The date format should be MM/DD/YYYY");
-		document.forma.schedEndDate.focus();
-		document.forma.schedEndDate.select();
-		return false;
-	}
-	/*if(! checkDate(document.forma.schedRunDate.value, true)) {
-		alert("Invalid Execution Date. The date format should be MM/DD/YYYY");
-		document.forma.schedRunDate.focus();
-		document.forma.schedRunDate.select();
-		return false;
-	}*/
-<% if (AppUtils.isAdminUser(request) || isSQLAllowed){ %>
-	if(document.forma.conditional.checked&&document.forma.conditionSQL.value=="") {
-		alert("Please provide Condition SQL");
-		document.forma.conditionSQL.focus();
-		document.forma.conditionSQL.select();
-		return false;
-	}
-  <% } %>
-	if(! checkNonNegativeInteger(document.forma.downloadLimit.value)) {
-		alert("Max row in attachment is not a valid integer.\nPlease enter a valid value.");
-		document.forma.downloadLimit.focus();
-		document.forma.downloadLimit.select();
-		return false;
-	}
-	else 
-	{
-		if((document.forma.downloadLimit.value) > <%=Globals.getDownloadLimit()%>) {
-			alert("Max row you can download should not be more than <%=Globals.getDownloadLimit()%> rows.\nPlease enter a valid value.");
-			document.forma.downloadLimit.focus();
-			document.forma.downloadLimit.select();
-			return false;			
-		}
-		
-	}
-	for (var i=0; i < document.forma.notify.length; i++) {
-   		if (document.forma.notify[i].checked) {
-      		  document.forma.notify_type.value = document.forma.notify[i].value;
-       	        }
-	    } 
-	return validateForm();
-		
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp
deleted file mode 100644
index 206e23de..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_formfield_include.jsp
+++ /dev/null
@@ -1,754 +0,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.
-  ================================================================================
-  --%>
-<%--
- Name: wizard_schedule_formfield_include.jsp
- Use : Shows formfield of the report in the schedule page. 
- 
- Change Log
- ==========
- 
- 28-Aug-2009 : Version 8.5.1 (Sundar); Checkbox and Radio button are also handled. 
- 18-Aug-2009 : Version 8.5.1 (Sundar); 
- 				
-				a) ajax.js is loaded in startup for AJAX functionality.
-				b) showArgPopupNew is modified as per report_form.jsp
-				c) Ajax function is added very similiar to report_form.jsp
-				d) "auto" bug is resolved.
-
-14-Jul-2009 : Version 8.4 (Sundar); 
- 				
- 				<UL> 
- 				<LI> Shows the form field of the first Dashboard report in schedule page if the report is dashboard.</LI>
- 				</UL>
---%>
-<%@ page import="java.io.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.text.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportHandler" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.JavascriptItemType"%>
-<%@ page import="java.util.regex.*"%>
-<%@ page import="javax.servlet.http.*"%>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportSchedule" %>
-
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    ReportHandler rh = new ReportHandler();
-    ReportRuntime rr = rh.loadReportRuntime(request, rdef.getReportID());
-    request.getSession().setAttribute(AppConstants.SI_REPORT_RUNTIME, rr);
-    boolean isDashboard =  rr.isDashboardType();
-    ReportFormFields rff = rr.getReportFormFields();
-	ReportFormFields rff1 = (ReportFormFields) rff.clone();
-	ReportFormFields rff2 = (ReportFormFields) rff.clone();
-	ReportFormFields rff5 = (ReportFormFields) rff.clone();
-	boolean isFirstTime = nvl(request.getParameter("refresh")).toUpperCase().startsWith("Y");
-	ReportSchedule reportSchedule = (ReportSchedule) request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-
-    int dashboardFlag = 0;
-	ReportRuntime rr1 = null;
-	java.text.SimpleDateFormat sdf = null;
-
-%>
-
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/ajax.js"></script>
-<%--=(rr.getJavascriptElement()!=null && rr.getJavascriptElement().length()>0)?rr.getJavascriptElement().replaceAll("formd","forma"):""--%>
-<script language="JavaScript">
-<!--
-function showArgPopup(fieldName, jsTargetField) {
-	var url = "<%= AppUtils.getRaptorActionURL() %>report.popup.field&<%= AppConstants.RI_FIELD_NAME %>="
-						+ fieldName+ "&<%= AppConstants.RI_JS_TARGET_FIELD %>="+jsTargetField;
-	var w = window.open(url, "formLookup", "width=440,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showArgPopup
-
-function showArgPopupNew(fld, targetField) {
-	var newElementCreated = true;
-
-	var oldTarget = null;
-	var oldRAction = null;
-	var frm = document.forma;
-	var w = window.open("<%= AppUtils.getBaseFolderURL() %>loading.jsp", "formLookup", "width=440,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	
-	oldTarget = frm.target ;
-	oldRAction = frm.r_action.value ;
-	frm.target = "formLookup";
-	frm.r_action.value = "report.popup.field";
-	if(document.getElementById("<%= AppConstants.RI_FIELD_NAME %>")) {
-		frm.removeChild(document.getElementById("<%= AppConstants.RI_FIELD_NAME %>"));
-		frm.removeChild(document.getElementById("<%= AppConstants.RI_JS_TARGET_FIELD %>"));
-	}
-	var fld1 = document.createElement("input");
-	fld1.setAttribute("type", "hidden");
-	fld1.setAttribute("name", "<%= AppConstants.RI_FIELD_NAME %>");
-	fld1.setAttribute("id", "<%= AppConstants.RI_FIELD_NAME %>");
-	fld1.setAttribute("value", fld);
-
-	var fld2 = document.createElement("input");
-	fld2.setAttribute("type", "hidden");
-	fld2.setAttribute("name", "<%= AppConstants.RI_JS_TARGET_FIELD %>");
-	fld2.setAttribute("id", "<%= AppConstants.RI_JS_TARGET_FIELD %>");
-	fld2.setAttribute("value", targetField);
-	
-	frm.appendChild(fld1);	
-	frm.appendChild(fld2);	
-	frm.submit();
-	w.focus();
-	w.opener = this;
-	
-	frm.target = oldTarget ;
-	frm.r_action.value = oldRAction ;
-	
-	
-}   // showArgPopupNew
-
-function validateForm() {
-   //if(document.getElementById("schedEnabled").checked && document.getElementById("schedEnabled").value == 'Y') {
-	<%for(rff.resetNext(); rff.hasNext(); ) { %>
-		<%= rff.getNext().getValidateJavaScript().replaceAll("formd","forma") %>
-	<%}%>
-	
-	var formfields_value="";
-	
-	for(i=0; i<document.forma.elements.length;i++) {	
-		if((document.forma.elements[i].name).substring(0,2)=='ff') {
-			//alert("i-" + i+ " "+ document.forma.elements[i].name + " " + document.forma.elements[i].type + " " + document.forma.elements[i].value);
-			var obj = document.forma.elements[i];
-			if ((document.forma.elements[i].tagName == "SELECT") /*&& !(obj.name.match('_Hr') || obj.name.match('_Min') || obj.name.match('_Sec'))*/ ){
-				var selString = "";
-					for (var intLoop=0; intLoop < obj.length; intLoop++) {
-					         if (obj[intLoop].selected) {
-					            formfields_value += "&"+document.forma.elements[i].name+"=" + escape(obj[intLoop].value);
-				            
-				         }
-				}
-			}
-			else{
-				if(escape(document.forma.elements[i].value).charAt(0) == '[' ) {
-					var nameObj = document.forma.elements[i].name;
-					if(nameObj.indexOf("_")!=-1 && (nameObj.match('_Hr') || nameObj.match('_Min') || nameObj.match('_Sec')) ) {
-					} else {
-			formfields_value += "&"+document.forma.elements[i].name+"="+escape(document.forma.elements[i].value);
-	}
-				} else {
-					var opt = document.forma.elements[i].name;
-					var optValue = "";
-					//alert('not in select' + opt);
-					var auto_incr = '<%=Boolean.toString(Globals.isScheduleDateParamAutoIncr())%>';
-					//alert(auto_incr);
-					//alert(document.getElementById(opt+"_auto") + " " + (opt+"_auto"));
-					if(document.getElementById(opt+"_auto")/* || opt.lastIndexOf("_auto")>= 0 */) {
-							for(k=0; k<document.forma.elements.length;k++) {	
-								if(document.forma.elements[k].name == opt) {
-									optValue = document.forma.elements[k].value;
-								}
-							}
-							//alert('opt info  ' +opt + " "+ optValue);
-							
-							 if(auto_incr == 'true') {
-								 formfields_value += "&"+document.forma.elements[i].name+"_auto="+escape(optValue);
-							 } else if (document.getElementById(opt).checked) {
-								formfields_value += "&"+document.forma.elements[i].name+"_auto="+escape(optValue);
-							 } /*else 
-								 formfields_value += "&"+document.forma.elements[i].name+"="+escape(document.forma.elements[i].value);*/
-					} else if (opt.lastIndexOf("_auto") < 0){
-                        if(document.forma.elements[i].type == 'checkbox' || document.forma.elements[i].type == 'radio') {
-                        	if (document.forma.elements[i].checked)
-								formfields_value += "&"+document.forma.elements[i].name+"="+escape(document.forma.elements[i].value);
-                        } else {
-							formfields_value += "&"+document.forma.elements[i].name+"="+escape(document.forma.elements[i].value);
-                        }
-					}
-				}
-	        }
-                    }
-	}
-	<% 
-	   String  sessionParams[] = Globals.getSessionParamsForScheduling().split(",");
-	   String formfields = "";
-	   for (int i=0; i<sessionParams.length; i++) {
-		   if(sessionParams[i].equals("login_id"))
-				   formfields += "&"+java.net.URLEncoder.encode("login_id","UTF-8")+"="+ java.net.URLEncoder.encode(AppUtils.getUserBackdoorLoginId(request),"UTF-8");
-		   else {
-		   	if(session.getAttribute(sessionParams[i])!=null)
-		   				formfields += "&"+ java.net.URLEncoder.encode(sessionParams[i], "UTF-8") + "="+ java.net.URLEncoder.encode((String)session.getAttribute(sessionParams[i]),"UTF-8");
-		   }
-	   }
-	%>
-	formfields_value += '&<%= AppConstants.RI_NEXT_PAGE %>=-1';
-	formfields_value += '<%=formfields%>';
-	//alert(formfields_value);
-	document.getElementById("formFields").value = formfields_value;
-	   var javascriptText = "<%=getCallableJavascriptForSubmit(rr)%>";
-	    javascriptText = javascriptText.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-	    if(javascriptText.length > 0) {
-			  if(<%=(getCallableJavascriptForSubmit(rr).trim().length())>0?getCallableJavascriptForSubmit(rr).replaceAll("formd","forma"):"false"%>)
-		  return true;
-			  else
-				  return false;
-		  } 
-     // }	
-	return true;
-}	// validateForm
-function systemDateTime() {
-  <%
-  sdf = new java.text.SimpleDateFormat("MM/dd/yyyy HH:mm:ss z");
-  sdf.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone()));
-  String sysDateTime = sdf.format(new java.util.Date());
-  %>
-  var sysdate = "<%=sysDateTime%>";
-  return sysdate;
-}
-
-function systemDate() {
-  <%
-  sdf = new java.text.SimpleDateFormat("MM/dd/yyyy");
-  sdf.setTimeZone(TimeZone.getTimeZone(Globals.getTimeZone()));
-  String sysDate = sdf.format(new java.util.Date());
-  %>
-  var sysdate = "<%=sysDate%>";
-  return sysdate;
-}
-//-->
-</script>
-	<%
-  if(rr.getReportType().equals(AppConstants.RT_DASHBOARD)) {
-	  dashboardFlag = 1;
-      String strHTML = rr.getDashboardLayoutHTML(); //getdashboardLayoutHTML();
-      String rep_id = parseAndGetFirstReportID(strHTML);
-      ReportHandler rh1 = new ReportHandler();
-	  rr1 = null;
-	  int requestFlag = 1;
-	  try {
-			rr1 = rh1.loadReportRuntime(request, rep_id, true, requestFlag);
-	  } catch(Exception e) {
-      }
-	  rff = rr1.getReportFormFields();
-  }
-  %>	
-	<%if((dashboardFlag == 0 && rr.needFormInput()) || (dashboardFlag == 1 && rr1.needFormInput())) { %>
-	<tr>
-		
-		<td class=rbg3 align="center" width="50%" valign="middle" colspan=2><font class=rtabletext>
-			Please input values into the Form Fields for email attachment. Note those fields user must provide value can not leave as blank.
-			</font>
-			<table width="94%" border="0" cellspacing="1" cellpadding="3" align=center>
-				<%
-				int colidx = 0;
-				java.util.HashMap paramsMap = Globals.getRequestParamtersMap(request, false);
-				java.util.HashMap getScheduleMap = getFormFieldsHashMap (request, reportSchedule.getFormFields());
-				java.util.HashMap paramsScheduleMap = Globals.getRequestParametersMap(request, getScheduleMap); 
-				for (int i = 0; i < rff.size(); i ++){
-					FormField ff = (FormField) rff.get(i);
-					ff.setDbInfo(rr.getDbInfo());
-					ff.setUserId(AppUtils.getUserID(request));					
-					if(ff.getFieldType().equals(FormField.FFT_HIDDEN)) {
-						%>
-									<%
-									  if(nvl(reportSchedule.getFormFields()).length() <= 0)
-									  	out.println(ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap, rr, true));
-									  else
-										out.println(ff.getHtml(getParameterString(request, ff.getFieldName(), getScheduleMap), paramsScheduleMap, rr, true).replaceAll("formd","forma"));  
-									  	
-									  
-									%>
-						<%		}					
-					if(!ff.getFieldType().equals(FormField.FFT_HIDDEN) && ff.isVisible()) {
-
- 				%>
-		 		<%if (colidx == 0){%><tr><%}%>
-					<td class=rbg3 width="10%" align="right" nowrap='yes'>
-						<font class=rtabletext>
-							<%if (!ff.getFieldType().equals(FormField.FFT_BLANK)){%> 
-								<%= ff.getDisplayNameHtml() %>:
-							<%}%>
-						</font>
-					</td> 
-					<td class=rbg3 width="15%" align="left" nowrap='yes'>
-						<%-- ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap,rr, true).replaceAll("formd","forma") --%>
-						<%
-									  if(nvl(reportSchedule.getFormFields()).length() <= 0)
-									  	out.println(ff.getHtml(rr.getParamValue(ff.getFieldName()), paramsMap, rr, true).replaceAll("formd","forma"));
-									  else
-										out.println(ff.getHtml(getParameterString(request, ff.getFieldName(), getScheduleMap), paramsScheduleMap, rr, true).replaceAll("formd","forma"));  
-						%>
-					</td>
-					<td ></td>
-					<%colidx++;%>
-				<%if (colidx == rr.getNumFormColsAsInt()){%></tr><%colidx=0;}%>
-			<%    }	
-				}   //for  %>
-			</table>
-		</td>
-	</tr> 		
-<% 	} //if(rr.needFormInput()) %>
-
-<input type='hidden' name='formFields' value=''/>
-
-<script>
-<% if(!isDashboard) {  %>
-var map = new Object();
-var defaultValues = new Object();
-<% rff = rr.getReportFormFields();
-int idx = 0;
-int row = 0;
-	
-java.util.Map fNameMap = new java.util.HashMap();
-for(rff.resetNext(); rff.hasNext(); idx++) { 
-	FormField ff = rff.getNext();
-	fNameMap.put(ff.getFieldName(), ff.getFieldDisplayName());
-}
-
-
-idx = 0;
-row = 0;
-
-for(rff.resetNext(); rff.hasNext(); idx++) { 
-	FormField ff = rff.getNext();
-	if(!(ff.getFieldType().equals(FormField.FFT_BLANK)) 
-			&& ff.isVisible() && !(ff.getFieldType().equals(FormField.FFT_TEXT_W_POPUP))) {
-	%>
-	
-	
-	 <%
-	
-	  if( ff.getDependsOn() != null && ff.getDependsOn().trim().length()>0 ) {
-	  	%> // <%=ff.getFieldName()%>	<%=ff.getDependsOn()%>
-	     if(document.forma.<%=ff.getFieldName()%>) {
-				document.forma.<%=ff.getFieldName()%>.onchange = updateDropDown;
-		 }
-	  		map['<%=ff.getDependsOn()%>'] = '<%=ff.getFieldName()%>';
-	  		// Made double quotes as it conflicts with query.
-	  		defaultValues['<%=ff.getFieldName()%>'] = "<%=rr.getParamValue(ff.getFieldName())%>" ;
-	  	<%
-	  }
-     }
-}
-%>
-
-var oldTarget = null;
-var oldr_action = null;
-	var ajax = new Array();
-
-	function getOpts(oSelect) {
-		var opt, i = 0, selVals = new Array();
-		//alert(oSelect.length + " " + oSelect.options);
-		if(oSelect && oSelect.options) { 
-		while (opt = oSelect[i++]) { 
-			if (opt.selected) {
-			  selVals[selVals.length] = encodeURIComponent(opt.value);
-			  //alert(opt.value)
-		}
-		}
-		//return selVals;
-		} else {
-			if(oSelect && oSelect.value)
-				selVals[0] = encodeURIComponent(oSelect.value);
-			//return selVals;
-		}
-		return selVals;
-	}
-
-	function trim(str) {
-		return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-	}
-		
-	function updateDropDown(srcElem_) {
-
-		var srcElem = null;
-		if(srcElem_ == null) { 
-			if (event != null)  
-				srcElem = event.srcElement; 
-		} else {
-		 	srcElem = srcElem_; 
-		}
-		//alert(srcElem.name);
-		//var parentFormField = srcElem.options[srcElem.selectedIndex].value;
-		if(srcElem !=null) {
-		var parentFormField = getOpts(srcElem);
-		var parentFieldName = srcElem.name;
-		
-		//alert(parentFormField);
-		var parentFieldValue = "";
-		for (i=0;i<=parentFormField.length-1;i++) {
-			if(parentFormField[i] != 'undefined')
-			parentFieldValue = parentFieldValue+srcElem.name+'='+parentFormField[i];
-			if(i<parentFormField.length-1)
-				parentFieldValue = parentFieldValue + "&";
-		}
-		//alert("ParentFieldValue " +  parentFieldValue + " srcElem.name " + srcElem.name); 
-    		
-	if(srcElem != null && srcElem.name!=null) {
-	<%
-		FormField ff =  null;
-		String javaScriptText = "";
-		String javaScriptAfterChainingText = "";
-	%> 
-	<%		
-		for(rff5.resetNext(); rff5.hasNext();idx++) { 
-			ff = rff5.getNext();
-	%>		
-		    if(srcElem && srcElem.name && srcElem.name == "<%=ff.getFieldName()%>") {
-		    	 <% javaScriptText = nvl(ff.getCallableOnChangeJavascript(ff.getFieldName(), rr)); 
-                    javaScriptAfterChainingText = nvl(ff.getCallableAfterChainingJavascript(ff.getFieldName(), rr)); 
-		    	    if(javaScriptText.length() > 0 ) { %>
-						<%=javaScriptText+";"%>
-						//document.forma.<%--=ff.getFieldName()--%>//.onchange = 
-	 		     <% } %>
-		    }						    
-	 <%	} %>
-	 <%	for(rff5.resetNext(); rff5.hasNext();idx++) { 
-	%> 
-	<%		
-			ff = rff5.getNext();
-		%>
-		    //alert (" In For " + "<%=ff.getFieldName()%> <%=rff.hasNext()%>");
-		<%	
-			if(!(ff.getFieldType().equals(FormField.FFT_BLANK))) { 
-				/*&& ff.isVisible()*/ /*&& !(ff.getFieldType().equals(FormField.FFT_TEXT_W_POPUP))*/
-	%>
-				<% if( ff.getDependsOn() != null && !ff.getDependsOn().equals("") ) { 
-				     if(!(ff.getFieldType().equals(FormField.FFT_TEXT_W_POPUP))) { %>
-					<% if(!ff.getFieldType().equals(FormField.FFT_HIDDEN)) { %>
-					if(srcElem && srcElem.name && srcElem.name == "<%=ff.getFieldName()%>") {
-						parentFieldValue = parentFieldValue + '&parentFieldName=<%=ff.getFieldName()%>';					 
-						//if(document.forma.<%=ff.getFieldName()%> && document.forma.<%=ff.getFieldName()%>.style) document.forma.<%=ff.getFieldName()%>.style.display='none';
-					 //if(document.forma.<%=ff.getFieldName()%> && document.forma.<%=ff.getFieldName()%>.style) document.forma.<%=ff.getFieldName()%>.style.display='none';
-         					 if(document.getElementById("<%=ff.getFieldName()%>_content") && document.getElementById("<%=ff.getFieldName()%>_content").style ) document.getElementById('<%=ff.getFieldName()+"_content"%>').style.display='block';
-					}
-					  	
-				    <% } %>
-				    <% } %>
-				var otherFieldValue = "";
-
-		<%
-			    for(rff1.resetNext(); rff1.hasNext();) {
-			    	FormField ff1 = rff1.getNext(); 
-						if( ff1.getDependsOn() != null && !ff1.getDependsOn().equals("") ) { %> 
-					    //alert (srcElem.name + " <%=ff1.getFieldName()%>");  
-					    if(srcElem && srcElem.name && srcElem.name != '<%=ff1.getFieldName()%>') {
-						    var otherFormFields = getOpts(document.forma.<%=ff1.getFieldName()%>);
-							for (i=0;i<=otherFormFields.length-1;i++) {
-								if(otherFormFields[i] != 'undefined')
-								otherFieldValue = otherFieldValue+'<%=ff1.getFieldName()%>'+'='+escape(otherFormFields[i])+'&';
-								if(i<otherFormFields.length-1)
-									otherFieldValue = otherFieldValue + "&";
-							}
-						     
-					    }
-					    <% } 
-				    }
-      %>	    		
-                 //alert("IF OPTIONS 0 AFTER <%=ff.getFieldName()%>" + parentFormField);
-                
-				//if(parentFormField.length>0) {
-				//if(srcElem.name == "<%=ff.getFieldName()%>") {
-					if(document.forma.<%=ff.getFieldName()%> && document.forma.<%=ff.getFieldName()%>.options) 
-						document.forma.<%=ff.getFieldName()%>.options.length = 0;
-				  try { 
-					var index = ajax.length;
-					ajax[index] = new sack("raptor.htm");
-					//alert("P" + parentFieldValue);
-					//alert("O" + otherFieldValue);
-					ajax[index].method='POST';
-					//alert('raptor.htm?action=raptor&r_action=report.childDropDown&parentFieldName='+srcElem.name+'&fieldName=<%=ff.getFieldName()%>&'+parentFieldValue+'&'+otherFieldValue);
-						ajax[index].setVar("action","raptor");
-						ajax[index].setVar("r_action","report.childDropDown");
-						ajax[index].setVar("fieldName","<%=ff.getFieldName()%>");
-						ajax[index].setVar("inSchedule","Y");
-						//alert("parentFieldValue " + parentFieldValue);
-						var parentFieldTokens = parentFieldValue.split( "&" );
-						var parentNameValuePair = "";
-						var nameValuePairTokens;
-						for (var i = 0; i < parentFieldTokens.length; i++) {
-							parentNameValuePair = parentFieldTokens[i];
-							parentNameValuePairTokens = parentNameValuePair.split("=");
-							if (parentNameValuePairTokens.length>0) {
-								//alert("ParentNameValuePairTokens " + parentNameValuePairTokens[0]+ " " + decodeURIComponent(parentNameValuePairTokens[1]));
-								ajax[index].setVar(parentNameValuePairTokens[0], decodeURIComponent(parentNameValuePairTokens[1]), i);
-							}
-						}
-						//alert("otherFieldValue " + otherFieldValue + " " );
-						if(otherFieldValue && otherFieldValue.length>0) {
-							if (otherFieldValue.substr(otherFieldValue.length-1) == '&')
-								otherFieldValue = otherFieldValue.substr(0,otherFieldValue.length-1); 
-						}
-						//alert("otherFieldValue1 " + otherFieldValue + " " );
-						
-						var otherFieldTokens = otherFieldValue.split( "&" );
-						var otherNameValuePair = "";
-						var otherNameValuePairTokens;
-						for (var k = 0; k < otherFieldTokens.length; k++) {
-							otherNameValuePair = otherFieldTokens[k];
-							otherNameValuePairTokens = otherNameValuePair.split("=");
-							if (otherNameValuePairTokens.length>0) {
-								//alert("otherNameValuePairTokens " + otherNameValuePairTokens[0]+ " " + decodeURIComponent(otherNameValuePairTokens[1]));
-								ajax[index].setVar(otherNameValuePairTokens[0], decodeURIComponent(otherNameValuePairTokens[1]), k);
-							}
-						}
-						//ajax[index].requestFile = 'raptor.htm?action=raptor&r_action=report.childDropDown&fieldName=<%=ff.getFieldName()%>&'+parentFieldValue+'&'+otherFieldValue;	// Specifying which file to get
-					ajax[index].onCompletion = function(){ createChildFormField(index, document.forma.<%=ff.getFieldName()%>) };	// Specify function that will be executed after file has been found
-					ajax[index].onError 	= function() {bringBacktoNormal(index, document.forma.<%=ff.getFieldName()%>);}
-					ajax[index].onFail	 	= function() {bringBacktoNormal(index, document.forma.<%=ff.getFieldName()%>);}
-					//ajax[index].onCompletion = function(){ var obj = null; obj = document.forma.<%=ff.getFieldName()%>;eval(ajax[index].response);document.getElementById(obj.name+"_content").style.display='none';obj.style.display='block';  };	// Specify function that will be executed after file has been found
-					ajax[index].runAJAX(null,false,100);		// Execute AJAX function
-					//alert(ajax[index].readyState);
-					//while (ajax[index].xmlhttp.readyState == 4 || ajax[index].xmlhttp.readyState == "complete" ) {
-					//}
-					//while(ajax[index].xmlhttp.readyState ==4){
-					//	 alert("ready State " + ajax[index].xmlhttp.readyState);
-					//}
-					//setTimeout("Func1()", 5000);
-				    } catch (err) {
-				    	if(err=="session_exp") {
-					    	document.write("session has been expired.");
-				    	}
-				    }					
-					
-				//} else {
-					<% if(!ff.getFieldType().equals(FormField.FFT_HIDDEN)) { %>
-						if(document.getElementById("<%=ff.getFieldName()%>_content") && document.getElementById("<%=ff.getFieldName()%>_content").style ) document.getElementById("<%=ff.getFieldName()%>_content").style.display='none';
-						//if(document.forma.<%=ff.getFieldName()%> && document.forma.<%=ff.getFieldName()%>.style) document.forma.<%=ff.getFieldName()%>.style.display='block';
-					<% } else  {%>	
-						if(document.getElementById("<%=ff.getFieldName()%>_content") && document.getElementById("<%=ff.getFieldName()%>_content").style ) document.getElementById("<%=ff.getFieldName()%>_content").style.display='none';
-						//if(document.forma.<%=ff.getFieldName()%> && document.forma.<%=ff.getFieldName()%>.style) document.forma.<%=ff.getFieldName()%>.style.display='none';
-					<% } %>	
-				//}
-                //} // if src.Elem
-				<% } %>
-	   <% } %>
-	                   
-	<% } %>	
-	         <%
-			for(rff.resetNext(); rff.hasNext();idx++) { 
-				ff = rff.getNext();
-				%>
-			    if(srcElem && srcElem.name && srcElem.name == "<%=ff.getFieldName()%>") {
-				<%    
-                   javaScriptAfterChainingText = nvl(ff.getCallableAfterChainingJavascript(ff.getFieldName(), rr));
-				%>
-				<%
-	           if(javaScriptAfterChainingText.length()>0 && javaScriptAfterChainingText.trim().startsWith("afterchaining")) {
-	        	   javaScriptAfterChainingText = Utils.replaceInString(javaScriptAfterChainingText,"afterchaining","");
-	        	   javaScriptAfterChainingText = Utils.replaceInString(javaScriptAfterChainingText,"\"","");
-	        	   javaScriptAfterChainingText = Utils.replaceInString(javaScriptAfterChainingText,"=","");
-	        	 %>
-	        	<%   
-	          %>
-	              <%=javaScriptAfterChainingText%>
-	          <%	   
-	           }
-	         %>
-			    }						    
-	<% } %>	
-	         
-	              
-      }  
-      }  
-   }
-
-	function dummyFunction(){
-		//alert("Server operation timed out");
-	}
-	
-	function bringBacktoNormal(index, obj) {
-		if(obj) {
-			//alert('bringing to normal');
-			var field_name = obj.name;
-			//alert("'"+field_name+"_content"+"'");
-			if(document.getElementById(field_name+"_content") && document.getElementById(field_name+"_content").style ) document.getElementById(field_name+"_content").style.display='none';
-			//if(obj.style) obj.style.display='block';
-		}
-	}
-	function createChildFormField(index, obj) {
-	    //alert('create Cities');
-		//var obj = document.getElementById('dhtmlgoodies_city');
-		var obj = obj;
-		var resp = trim(ajax[index].response);
-	    //alert(index + " " + ajax[index]);
-	    //alert('response ' + ajax[index].response);
-	    if(resp.length > 0 && resp.indexOf("<script type=")!=-1) {
-		    document.write(resp);
-			if(obj) {
-				//alert('obj.name ' + obj.name);
-				var field_name = obj.name;
-				//alert("'"+field_name+"_content"+"'");
-				if(document.getElementById(field_name+"_content") && document.getElementById(field_name+"_content").style ) document.getElementById(field_name+"_content").style.display='none';
-				//if(obj.style) obj.style.display='block';
-			}
-		    throw "session_exp";
-	    }
-		if(obj) {
-	    	if(resp.length > 0)
-				eval(resp);	// Executing the response from Ajax as Javascript code
-			//alert('obj.name ' + obj.name);
-			var field_name = obj.name;
-			//alert("'"+field_name+"_content"+"'");
-			if(document.getElementById(field_name+"_content") && document.getElementById(field_name+"_content").style ) document.getElementById(field_name+"_content").style.display='none';
-			//if(obj.style) obj.style.display='block';
-		}
-	}
-function changeCombo(data){
-	var list = data;
-	for (var i = 0; i < list.length; i ++){
-		var fieldName = list[i].substr(0, list[i].indexOf(":"));
-		var selectVal = list[i].substr(list[i].indexOf(":") + 1, list[i].length);
-		
-		var elem = document.getElementsByName(fieldName);
-		var j = 0;
-		while (elem[j].tagName == 'INPUT' && elem[j].type=='hidden'){
-			j ++;
-		}
-		
-		var oldVal = elem[j].value
-		elem[j].parentNode.innerHTML = selectVal;
-		elem[j].value=oldVal;
-		elem[j].onchange = updateDropDown;
-	}	
-	document.getElementById('childFieldpopup').style.display='none';
-	
-
-
-	
-}
-<% } %>
-/*
-	
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="source_page" value="report_run">
-	<input type="hidden" name="r_action" value="report.download.pdf">
-
-*/
-</script>
-<% /* if(request.getAttribute(AppConstants.RI_REPORT_DATA) == null){  */ %>
-<script>
- if(<%=isFirstTime%>) {
-	 
-		<%
-		if(!isDashboard) {
-		outFor:
-	    for(rff2.resetNext(); rff2.hasNext();) {
-	    	FormField ff1 = rff2.getNext(); 
-				if( ff1.getDependsOn() != null && !ff1.getDependsOn().equals("") ) { %>
-				<% if (!ff1.getFieldType().equals(FormField.FFT_HIDDEN))  { %>
-				//alert("in First Time <%=ff1.getFieldName()%>");
-					if(document.forma.<%=ff1.getFieldName()%>)
-						updateDropDown(document.forma.<%=ff1.getFieldName()%>);
-                <% } %>
-				<% break outFor;
-				} 
-			} 
-		}
-			%>		 
-  }
-</script>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-	private String getCallableJavascriptForSubmit(ReportRuntime rr) {
-		JavascriptItemType javascriptItemType = null;
-		StringBuffer callJavascriptText = new StringBuffer("");
-		if(rr.getJavascriptList()!=null) {
-			for (Iterator iter = rr.getJavascriptList().getJavascriptItem().iterator(); iter.hasNext();) {
-				javascriptItemType  = (JavascriptItemType)iter.next();
-				if(javascriptItemType.getFieldId().equals("os1")) {
-					callJavascriptText.append(" "+javascriptItemType.getCallText());
-					break;
-				}
-			}
-		}
-		return callJavascriptText.toString();
-	}    
-
-	private HashMap getFormFieldsHashMap (HttpServletRequest request, String formFieldsString) {
-		String splitName[] = null;
-		ArrayList keyValue = new ArrayList();
-		HashMap keyValueMap = new HashMap();
-        String newValue = "";
-        //System.out.println("Request Str "+ formFieldsString);
-        StringTokenizer st = null;
-        StringTokenizer st2 = null;
-        String key1 = "";
-        String value = "";
-        
-		if(formFieldsString.length() > 0) {
-			st = new StringTokenizer(formFieldsString, "&");
-			while (st.hasMoreTokens()) {
-				keyValue.add(st.nextToken());
-			}
-			if(keyValue.size() > 0) {
-				
-				for (int num = 0; num < keyValue.size(); num++) {
-					st2 = new StringTokenizer((String) keyValue.get(num), "=");
-					while(st2.hasMoreTokens()) {
-						key1 = ""; value = "";
-						key1 = st2.nextToken();
-						key1 = Utils.replaceInString(key1, "_auto", "");
-						try {
-							value = st2.nextToken();
-						}catch (NoSuchElementException ex) { value  = "";}
-							if(!keyValueMap.containsKey(key1)) 
-								keyValueMap.put(key1,value);
-							else {
-								String value1 = (String) keyValueMap.get(key1);
-								value = value+"|"+value1;
-								keyValueMap.put(key1,value);
-							}
-					}
-				}
-		
-	        }
-		}
-		return keyValueMap;
-	}
-	
-	private String getParameterString (HttpServletRequest request, String key, HashMap keyValueMap) {
-        String newValue = "";
-				if(keyValueMap.containsKey(key)) {
-					//System.out.println("VALUE IN MAP IS " +key+ " "+ (String) keyValueMap.get(key));
-					newValue = XSSFilter.filterRequestOnlyScript((String) keyValueMap.get(key));
-					if(nvl(newValue).length()<=0) {
-						newValue = XSSFilter.filterRequestOnlyScript((String) keyValueMap.get(key+"_auto"));
-					}
-				}
-		return newValue;
-	}
-	private String parseAndGetFirstReportID(String strHTML) {
-		  String sourcestring = strHTML;
-		  //System.out.println("String HTML1 " + strHTML);
-		  Pattern re = Pattern.compile("\\[(.*?)\\]");   //\\[(.*?)\\]
-		  Matcher m = re.matcher(sourcestring);
-		  int mIdx = 0;
-		    while (m.find()){
-		      for( int groupIdx = 0; groupIdx < m.groupCount(); groupIdx++ ){
-		    	String str = m.group(groupIdx);
-		    	//System.out.println("REP ID1 " + str.substring(str.indexOf("#")+1, str.length()-1)) ;
-              return str.substring(str.indexOf("#")+1, str.length()-1);
-		      }
-		      mIdx++;
-		      
-		    }return "";
-	}	
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp
deleted file mode 100644
index 70c9812a..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_multiple.jsp
+++ /dev/null
@@ -1,157 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-<%! 
-class ValueComparator implements Comparator {
-	  public int compare(Object o1, Object o2) {
-	    Map.Entry e1 = (Map.Entry) o1;
-	    Map.Entry e2 = (Map.Entry) o2;
-	    Comparable c1 = (Comparable)e1.getValue();
-	    Comparable c2 = (Comparable)e2.getValue();
-	    return c1.compareTo(c2);
-	  }
-}
-%>
-<%
-HashMap hashMap = ReportLoader.loadReportsToSchedule(request);
-ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-if(rdef ==null) rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-Set mapSet = hashMap.entrySet();
-List entrylist = new ArrayList(mapSet);
-Collections.sort(entrylist, new ValueComparator());
-Map.Entry me;
-session.removeAttribute(AppConstants.SI_REPORT_SCHEDULE);
-session.removeAttribute(AppConstants.SI_REPORT_DEFINITION);
-ReportSchedule reportSchedule = (ReportSchedule) session.getAttribute(AppConstants.SI_REPORT_SCHEDULE);
-%>
- <jsp:include page="header.jsp" flush="true" />
- <!-- <link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">-->
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
- 
-
-<jsp:include page="error_include.jsp" flush="true" />
-<br/><br/><br/>
-<% if (rdef == null || request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE) == null) {%>
-
-<form name="formb" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.schedule.multiple">
-
-
-<table width="94%"  class="tableBorder"  border="0" cellspacing="0" cellpadding="0" align=center valign="center">
-<tr><td colspan="2">
-	<table width="100%" border="0" cellspacing="0" cellpadding="3">
-
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= "Scheduling Report" %></b></td>
-		</tr>
-		<% if(request.getAttribute("message")!=null) { %>
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= (String) request.getAttribute("message") %></b></td>
-		</tr>
-		<% } %>
-	</table>
-</td></tr>
-<tr> <td> <font class=rtabletext> Reports: </font></td><td height="30" align="center"> 
-  		         <% if (rdef !=null && request.getSession().getAttribute(AppConstants.SI_REPORT_SCHEDULE) != null ) {%>  		       
-                   <font class=rtabletext><%= rdef.getReportName()%></font>
-                   <% } else { %> 		
-  		       <select name="schedule_reports" onChange="document.formb.<%= AppConstants.RI_ACTION %>.value='report.schedule.report.submit'; document.formb.submit();">
-  		             <option value="-1" selected> -->select report <-- </option>
-         <%      for (Iterator iter = entrylist.iterator(); iter.hasNext();) { 
-  		        	      me=(Map.Entry)iter.next();
-  		         %>
-  		         <% if (rdef !=null && rdef.getReportID().equals((String)me.getKey())) {%>  		         
-                    	<option value="<%=(String) me.getKey()%>" selected> <%=(String) me.getValue()%> </option>
-                  <%  } else { %>
-                    	<option value="<%=(String) me.getKey()%>"> <%=(String) me.getValue()%> </option>
-                  <%  } %>  				         
-                  <% } %>
-  		       </select>
-  		       <% } %>
-		
-</td> </tr>
-
-</table>	
-</form>
-<% } %>
-<% if(reportSchedule!=null)  { %> 
-  <jsp:include page="wizard_schedule_only.jsp" flush="true"/>
-<% } %>  
- <jsp:include page="footer.jsp" flush="true" />
-</div>
-</td>
-</tr>
-</table>
-<%--<jsp:include page="disclaimer.jsp" flush="true" />--%>
-<script>
-	//document.getElementById('loadingMessageDiv').style.display='none';
-    //adding the bread crumb on the folder tree
-	<%
-		String isTreeHidden = "true";
-		if(request.getSession().getAttribute("isTreeHidden") != null && ((String)request.getSession().getAttribute("isTreeHidden")).equals("true")){
-			isTreeHidden = "true";
-		}else{
-			isTreeHidden = "false";
-		}
-	%>
-	//if ("<%=isTreeHidden%>" == "true"){
-	//	hideTree();
-	//}
-	//document.getElementById('contentDiv').style.height=document.body.offsetHeight - 50;
-</script>
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)=='<')
-				sb.replace(i, i+1, "&lt;");
-			else if(sb.charAt(i)=='>')
-				sb.replace(i, i+1, "&gt;");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, "&quot;");
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)==' ')
-				sb.replace(i, i+1, "&nbsp;");
-   		
-		return sb.toString();
-	}   // clearSpaces
-	
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
- 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp
deleted file mode 100644
index ad3c612e..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only.jsp
+++ /dev/null
@@ -1,172 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-
-
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	
-
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	StringBuffer title = new StringBuffer("");
-	title.append(Globals.getBaseTitle()+" > "+(reportID.equals("-1")?"Create Report":"Schedule Report"));
-	title.append(" > "+rdef.getReportName());
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-<!--  Set All variable to request, to enable included jsp to access it -->	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- <jsp:include page="header.jsp" flush="true" />
- <!-- <link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">-->
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
- 
-
-<jsp:include page="error_include.jsp" flush="true" />
-
-<table width="100%" >
-<tr><td id="folderTreeContainer" width="1%" height='300' valign='top' ><table>
-		<!--<jsp:include page="tree/folderNav.jsp" flush="true" >	
-        	<jsp:param name="doCollapseTree" value="Y" />
-       	</jsp:include>-->
-	</table>
-</td>
-<td id="searchContentContainer" valign='top' >
-<div id="contentDiv" style="position:relative;overflow:auto;">
-<form name="forma" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.schedule.submit">
-	<input type="hidden" name="<%= AppConstants.RI_REPORT_ID %>" value="<%= reportID %>">
-	<input type="hidden" name="<%= AppConstants.RI_DETAIL_ID %>" value="<%= AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID) %>">
-	<input type="hidden" name="<%= AppConstants.RI_GO_TO_STEP %>" value="">
-	<input type="hidden" name="<%= AppConstants.RI_WIZARD_ACTION %>" value="<%= AppConstants.WA_BACK %>">
-	<input type="hidden" name="<%= AppConstants.RI_SCHEDULE_ID %>" value="<%= AppUtils.getRequestNvlValue(request, AppConstants.RI_SCHEDULE_ID) %>">
-
-
-<table width="94%"  class="tableBorder" border="0" cellspacing="0" cellpadding="0" align=center>
-<tr><td>
-	<table width="100%" border="0" cellspacing="0" cellpadding="3">
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= title.toString() %></b></td>
-		</tr>
-		<% if(request.getAttribute("message")!=null) { %>
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= (String) request.getAttribute("message") %></b></td>
-		</tr>
-		<% } %>
-	</table>
-</td></tr><tr><td>
-		 <jsp:include page="wizard_adhoc_schedule.jsp"/>
-</td></tr><tr><td>
-	<table width="100%" border="0" cellspacing="1" cellpadding="3">
-		<tr>
-			<td width="10%" align="right">
-				&nbsp;
-			</td>
-			<td align=center>
-					<input type=submit class="button" border="0" value="Submit" width="71" height="28" onClick="if(! dataValidate()) return false;  document.forma.<%= AppConstants.RI_ACTION %>.value='report.schedule.submit';">
-					<%--<input type=submit class="button" border="0" value="Report Search Page" width="71" height="28" onClick="document.forma.<%= AppConstants.RI_ACTION %>.value='report.search.public.container';">--%>
-					
-			</td>
-		</tr>
-	</table>	
-</td></tr>
-</table>	
-</form>
-
- <jsp:include page="footer.jsp" flush="true" />
-</div>
-</td>
-</tr>
-</table>
-<%--<jsp:include page="disclaimer.jsp" flush="true" />--%>
-<script>
-	//document.getElementById('loadingMessageDiv').style.display='none';
-    //adding the bread crumb on the folder tree
-	if (window.parent && window.parent.addBreadCrumb)
-		window.parent.addBreadCrumb(true, "000<%=rdef.getReportID()%>");
-	//displayTree("000<%=rdef.getReportID()%>");
-	<%
-		String isTreeHidden = "true";
-		if(request.getSession().getAttribute("isTreeHidden") != null && ((String)request.getSession().getAttribute("isTreeHidden")).equals("true")){
-			isTreeHidden = "true";
-		}else{
-			isTreeHidden = "false";
-		}
-	%>
-	//if ("<%=isTreeHidden%>" == "true"){
-	//	hideTree();
-	//}
-	//document.getElementById('contentDiv').style.height=document.body.offsetHeight - 50;
-</script>
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)=='<')
-				sb.replace(i, i+1, "&lt;");
-			else if(sb.charAt(i)=='>')
-				sb.replace(i, i+1, "&gt;");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, "&quot;");
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)==' ')
-				sb.replace(i, i+1, "&nbsp;");
-   		
-		return sb.toString();
-	}   // clearSpaces
-	
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
- 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp
deleted file mode 100644
index af951cc2..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_schedule_only_from_search.jsp
+++ /dev/null
@@ -1,173 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="java.util.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.*" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.*" %>
-
-<%@ page errorPage="error_page.jsp" %>
-
-
-
-<%	ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION);
-	
-	String reportID   = rdef.getReportID();
-	
-
-    
-	String dbInfo = null;
-	dbInfo = rdef.getDBInfo();
-	int sessionflag = 0;
-	if(dbInfo == null  || dbInfo.length() == 0) {
-	   dbInfo = (String) session.getAttribute("remoteDB");
-       sessionflag = 1; 
-	}
-       session.setAttribute("remoteDB", dbInfo);
-	if((dbInfo == null) && (request.getParameter("dataSource")!=null)) 
-	   session.setAttribute("remoteDB", request.getParameter("dataSource"));
-
-	StringBuffer title = new StringBuffer("");
-	title.append(Globals.getBaseTitle()+" > "+(reportID.equals("-1")?"Create Report":"Schedule Report"));
-	title.append(" > "+rdef.getReportName());
-	
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-%>
-<!--  Set All variable to request, to enable included jsp to access it -->	
-<%
-	request.setAttribute(AppConstants.SI_REPORT_DEFINITION,rdef);
-%>	
-
- <jsp:include page="header.jsp" flush="true" />
- <!-- <link rel="stylesheet" type="text/css" href="<%= AppUtils.getBaseFolderURL() %>css/raptor.css">-->
-<script language="JavaScript" src="<%= AppUtils.getBaseFolderURL() %>js/raptor.js"></script>
- 
-
-<jsp:include page="error_include.jsp" flush="true" />
-
-<table width="100%" >
-<tr><td id="folderTreeContainer" width="1%" height='300' valign='top' ><table>
-		<!--<jsp:include page="tree/folderNav.jsp" flush="true" >	
-        	<jsp:param name="doCollapseTree" value="Y" />
-       	</jsp:include>-->
-	</table>
-</td>
-<td id="searchContentContainer" valign='top' >
-<div id="contentDiv" style="position:relative;overflow:auto;">
-<form name="forma" action="<%= AppUtils.getBaseURL() %>" method="post">
-	<input type="hidden" name="action" value="raptor">
-	<input type="hidden" name="<%= AppConstants.RI_ACTION %>" value="report.schedule.submit_from_search">
-	<input type="hidden" name="<%= AppConstants.RI_REPORT_ID %>" value="<%= reportID %>">
-	<input type="hidden" name="<%= AppConstants.RI_DETAIL_ID %>" value="<%= AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID) %>">
-	<input type="hidden" name="<%= AppConstants.RI_GO_TO_STEP %>" value="">
-	<input type="hidden" name="<%= AppConstants.RI_WIZARD_ACTION %>" value="<%= AppConstants.WA_BACK %>">
-	<input type="hidden" name="<%= AppConstants.RI_SCHEDULE_ID %>" value="<%= AppUtils.getRequestNvlValue(request, AppConstants.RI_SCHEDULE_ID) %>">
-
-
-<table width="94%" class="tableBorder" cellspacing="0" cellpadding="0" align=center>
-<tr><td>
-	<table width="100%" border="0" cellspacing="0" cellpadding="3">
-		<% if(request.getAttribute("message")!=null) { %>
-		<tr >
-			<td valign="Middle"><b class=rerrortext><%= (String) request.getAttribute("message") %></b></td>
-		</tr>
-		<% } %>
-		<tr class=rbg1>
-			<td valign="Middle"><b class=rtableheader><%= title.toString() %></b></td>
-		</tr>
-		
-	</table>
-</td></tr><tr><td>
-		 <jsp:include page="wizard_adhoc_schedule.jsp"/>
-</td></tr><tr><td>
-	<table width="100%" border="0" cellspacing="1" cellpadding="3">
-		<tr>
-			<td width="10%" align="right">
-				&nbsp;
-			</td>
-			<td align=center>
-					<input type=submit class="button" border="0" value="Submit" width="71" height="28" onClick="if(! dataValidate()) return false;  document.forma.<%= AppConstants.RI_ACTION %>.value='report.schedule.submit_from_search';">
-					<%--<input type=submit class="button" border="0" value="Report Search Page" width="71" height="28" onClick="document.forma.<%= AppConstants.RI_ACTION %>.value='report.search.public.container';">--%>
-					
-			</td>
-		</tr>
-	</table>	
-</td></tr>
-</table>	
-</form>
-
- <jsp:include page="footer.jsp" flush="true" />
-</div>
-</td>
-</tr>
-</table>
-<%--<jsp:include page="disclaimer.jsp" flush="true" />--%>
-<script>
-	//document.getElementById('loadingMessageDiv').style.display='none';
-    //adding the bread crumb on the folder tree
-	if (window.parent && window.parent.addBreadCrumb)
-		window.parent.addBreadCrumb(true, "000<%=rdef.getReportID()%>");
-	//displayTree("000<%=rdef.getReportID()%>");
-	<%
-		String isTreeHidden = "true";
-		if(request.getSession().getAttribute("isTreeHidden") != null && ((String)request.getSession().getAttribute("isTreeHidden")).equals("true")){
-			isTreeHidden = "true";
-		}else{
-			isTreeHidden = "false";
-		}
-	%>
-	//if ("<%=isTreeHidden%>" == "true"){
-	//	hideTree();
-	//}
-	//document.getElementById('contentDiv').style.height=document.body.offsetHeight - 50;
-</script>
-<%!	private String HTMLEncode(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)=='<')
-				sb.replace(i, i+1, "&lt;");
-			else if(sb.charAt(i)=='>')
-				sb.replace(i, i+1, "&gt;");
-			else if(sb.charAt(i)=='"')
-				sb.replace(i, i+1, "&quot;");
-   		
-		return sb.toString();
-	}   // HTMLEncode
-	
-	private String clearSpaces(String value) {
-		StringBuffer sb = new StringBuffer(value);
-		
-		for(int i=0; i<sb.length(); i++)
-			if(sb.charAt(i)==' ')
-				sb.replace(i, i+1, "&nbsp;");
-   		
-		return sb.toString();
-	}   // clearSpaces
-	
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } %>
-
- 
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp
deleted file mode 100644
index 18c450ba..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_edit.jsp
+++ /dev/null
@@ -1,86 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-	boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT);
-	DataColumnType currColumn = null;
-	if(isEdit)
-		currColumn = rdef.getColumnById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID)); %>
-
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %><%= curSubStep.equals(AppConstants.WSS_EDIT)?"Edit Sorting":(curSubStep.equals(AppConstants.WSS_ADD)?"Add Sorting":"") %></b></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;">
-			<font class=rtabletext>Sort By Column: </font>
-		</td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-		<% if(isEdit) { %>
-			<%= currColumn.getDisplayName() %>
-		<% } else { %>
-			<select name="sortColId">
-			<% 	int iCount = 0;
-				List reportCols = rdef.getAllColumns();
-				for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-					DataColumnType dct = (DataColumnType) iter.next();
-					if(dct.getOrderBySeq()<=0) { %>
-						<option value="<%= dct.getColId() %>"<%= ((iCount++)==0)?" selected":"" %>><%= dct.getDisplayName() %>
-			<% 		}   // if
-				}   // for 
-			%>
-			</select>
-		<% }	// else 
-		%>
-		</font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" width="25%" height="30"><font class=rtabletext>Sort Type: </font></td> 
-		<td class=rbg3 align="left" width="50%"><font class=rtabletext>
-			<select name="sortAscDesc">
-				<option value="<%= AppConstants.SO_ASC %>" <%= (isEdit&&nvl(currColumn.getOrderByAscDesc(), AppConstants.SO_ASC).equals(AppConstants.SO_DESC))?"":" selected" %>>Ascending
-				<option value="<%= AppConstants.SO_DESC %>"<%= (isEdit&&nvl(currColumn.getOrderByAscDesc(), AppConstants.SO_ASC).equals(AppConstants.SO_DESC))?" selected":"" %>>Descending
-			</select>
-		</font></td>
-	</tr>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp
deleted file mode 100644
index 63bf9cd3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_list.jsp
+++ /dev/null
@@ -1,116 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderSeqComparator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-	List reportCols = rdef.getAllColumns();
-	Collections.sort(reportCols, new OrderSeqComparator());
-	int numSortCols = rdef.getNumSortColumns(); %>
-<table class="mTAB" width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=6 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>Sort Order</b></td>
-		<td align="center" valign="Middle" width="65%"><b class=rtableheader>Sort By Column</b></td>
-		<td align="center" valign="Middle" width="7%"><b class=rtableheader>Sort Type</b></td>
-		<td align="center" valign="Middle" width="7%" nowrap><b class=rtableheader>Re-order</b></td>
-		<td align="center" valign="Middle" width="14%" colspan=2>
-		<% if(numSortCols<reportCols.size()) { %>
-			<table border="0" cellspacing="0" cellpadding="0"><tr>
-				<td height="28"><input type="button" class=button value="Add One" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit();"></td>
-			</tr><tr><td height="28">
-		<% } %>
-				<input type="button" class=button value="Re-order All" border="0" width="104" height="28" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ORDER_ALL %>';document.forma.submit();">
-		<% if(numSortCols<reportCols.size()) { %>
-			</td></tr></table>
-		<% } %>
-		</td>
-	</tr>
-<%	int iCount = 0;
-        Collections.sort(reportCols,new OrderBySeqComparator());
-	for(Iterator iter=reportCols.iterator(); iter.hasNext(); ) { 
-		DataColumnType dct = (DataColumnType) iter.next();
-		if(dct.getOrderBySeq()>0) { %>
-         <tr class=<%=(iCount % 2 == 0)?"rowalt1":"rowalt2"%>>
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %><!--dct.getOrderBySeq(): <%= dct.getOrderBySeq() %>--></font></td>
-		<td><font class=rtabletext><%= dct.getDisplayName() %></font></td>
-		<td align="center"><font class=rtabletext><%= dct.getOrderByAscDesc().equals(AppConstants.SO_ASC)?"Ascending":"Descending" %></font></td>
-		<td align="center" nowrap>
-<% 			if(iCount==0) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankdown.gif" width="25" height="7">
-<% 			} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columnup.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_UP %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>';">
-<% 			} %>
-<% 			if(iCount==numSortCols-1) { %>
-				<img border="0" src="<%= AppUtils.getImgFolderURL() %>columnblankup.gif" width="25" height="7">
-<% 			} else { %>
-				<input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>columndown.gif" width="25" height="7" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_MOVE_DOWN %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>';">
-<% 			} %>
-		</td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_EDIT %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>';"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove sort on column <%= dct.getDisplayName() %>?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dct.getColId() %>'; }"></td>
-	</tr>
-<%
-			iCount++;
-		}   // if
-	}   // for
-	Collections.sort(reportCols, new OrderSeqComparator());
-%>
-<%	if(numSortCols==0) { %>
-	<tr class=rbg2>
-		<td colspan=6 align="center" height="30"><font class=rtabletext>No sorting defined</font></td>
-	</tr>
-<%	} %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp
deleted file mode 100644
index 9e04f2b8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sorting_order_all.jsp
+++ /dev/null
@@ -1,112 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-<%@ page import="java.util.Collections" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-<table class="mTAB" width="100%" class="tableBorder" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=4 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="65%"><b class=rtableheader>Column</b></td>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Sort Order</b></td>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Sort Type</b></td>
-	</tr>
-<%  int icnt = 0;
-	for(Iterator iter=rdef.getAllColumns().iterator(); iter.hasNext(); icnt++) { 
-		DataColumnType dct = (DataColumnType) iter.next(); %>
-	<tr<%= (icnt%2==0)?" class=rowalt1":" class=rowalt2" %>>
-		<td align="center" height="30"><font class=rtabletext><%= icnt+1 %></font></td>
-		<td><font class=rtabletext><%= dct.getDisplayName() %></font></td>
-		<td align="center" valign="middle">
-			<input type="hidden" name="colId" value="<%= dct.getColId() %>">
-			<input type="text" size="5" maxlength="5" name="sortOrder" value="<%= (dct.getOrderBySeq()>0)?(""+dct.getOrderBySeq()):"" %>">
-		</td>
-		<td align="left" valign="middle">
-			<select name="sortAscDesc">
-				<option value="<%= AppConstants.SO_ASC %>" <%= nvl(dct.getOrderByAscDesc(), AppConstants.SO_ASC).equals(AppConstants.SO_DESC)?"":" selected" %>>Ascending
-				<option value="<%= AppConstants.SO_DESC %>"<%= nvl(dct.getOrderByAscDesc(), AppConstants.SO_ASC).equals(AppConstants.SO_DESC)?" selected":"" %>>Descending
-			</select>
-		</td>
-	</tr>
-<%	}   // for 
-%>
-</table>
-			<input type="hidden" name="sortOrder" value="">
-			<input type="hidden" name="sortOrder" value="">
-<br>
-
-<script language="JavaScript">
-<!--
-var colNames = new Array(<%= rdef.getAllColumns().size() %>);
-<%	for(int i=0; i<rdef.getAllColumns().size(); i++) { 
-		DataColumnType dct = (DataColumnType) rdef.getAllColumns().get(i); %>
-colNames[<%= i %>] = "<%= dct.getDisplayName() %>";
-<%	} %>
-
-function dataValidate() {
-	var val = "";
-	for(var i=0; i<document.forma.sortOrder.length; i++) {
-		val = document.forma.sortOrder[i].value;
-		if(val!="")
-			if(! checkPositiveInteger(val)) {
-				alert("Sort Order for column "+colNames[i]+" should be a positive integer.\nPlease enter valid Sort Order value.");
-				document.forma.sortOrder[i].focus();
-				document.forma.sortOrder[i].select();
-				
-				return false;
-			}	// if
-	}	// for
-	
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp
deleted file mode 100644
index d8152c05..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_sql_def.jsp
+++ /dev/null
@@ -1,226 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.Globals" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.ReportLoader" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.ReportWrapper" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.runtime.FormField" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.OrderBySeqComparator" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-   	String reportID   = rdef.getReportID();
-	boolean isCrossTab = rdef.getReportType().equals(AppConstants.RT_CROSSTAB);
-	boolean isSQLBased = rdef.getReportDefType().equals(AppConstants.RD_SQL_BASED); 
-   	
-%>
-<script language="JavaScript">
-<!--
-function addText(newText) {
-	document.forma.reportSQL.value   += (""+newText+" ");
-	document.forma.sqlValidated.value = "N";
-}   // addText
-
-function getSelectedTableName() {
-	var tableName = "";
-	tableName = document.forma.dbTables.options[document.forma.dbTables.selectedIndex].value;
-	return tableName;
-}   // getSelectedTableName
-
-function addTable() {
-	addText(getSelectedTableName());
-}   // addTable
-
-function showTableColsPopup() {
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.table.cols&<%= AppConstants.RI_TABLE_NAME %>="+getSelectedTableName(), "tableColsPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTableColsPopup
-
-function showTestRunSQLPopup() {
-	//var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.popup.testrun.sql&<%= AppConstants.RI_FORMATTED_SQL %>="+escape(""+document.forma.reportSQL.value), "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	var w = window.open("<%= AppUtils.getRaptorActionURL() %>report.test.jsp", "testRunSQLPopup", "width=450,height=330,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-}   // showTestRunSQLPopup
-
-function showFormFieldPopup() {
-	var w = window.open("", "fieldPopup", "width=400,height=400,location=no,menubar=no,toolbar=no,status=no,resizable=yes,scrollbars=yes");
-	w.focus();
-	w.opener = this;
-	
-	w.document.writeln("<html><head>");
-	w.document.writeln("<title>Form Fields</title>");
-	w.document.writeln("<link rel=stylesheet type=text/css href='<%= AppUtils.getBaseFolderURL() %>css/raptor.css'>");
-	w.document.writeln("<script language=JavaScript>");
-	w.document.writeln("function setValue(newValue) {");
-	w.document.writeln("    window.opener.addText(newValue);");
-	w.document.writeln("    window.close();");
-	w.document.writeln("}   // setValue");
-	w.document.writeln("</"+"script>");
-	w.document.writeln("</head><body>");
-	
-	w.document.writeln("<table width=94% border=0 cellspacing=1 align=center>");
-	w.document.writeln("	<tr class=rbg1>");
-	w.document.writeln("		<td height=30>&nbsp;</td>");
-	w.document.writeln("		<td><b class=rtableheader>Report Form Fields</b></td>");
-	w.document.writeln("	</tr>");
-<%	int iCnt = 0;
-	if(rdef.getFormFieldList()!=null)
-		for(Iterator iter=rdef.getFormFieldList().getFormField().iterator(); iter.hasNext(); iCnt++) { 
-			FormFieldType fft = (FormFieldType) iter.next(); %>
-	w.document.writeln("	<tr<%= (iCnt%2==0)?" class=rbg8":"" %>>");
-	w.document.writeln("		<td align=center valign=middle height=30><font class=rtabletext><%= (iCnt+1) %></font></td>");
-	w.document.writeln("		<td valign=middle>");
-	w.document.writeln("			<b class=rtabletext><a href=\"javascript:setValue('[<%= fft.getFieldName() %>]')\"><%= fft.getFieldName() %></a></b>");
-	w.document.writeln("		</td>");
-	w.document.writeln("	</tr>");
-<%			}	// for
-	if(iCnt==0) { %>
-	w.document.writeln("	<tr class=rbg8 height=30>");
-	w.document.writeln("		<td colspan=2 align=center valign=middle><b class=rtabletext>There are no form fields defined</b></td>");
-	w.document.writeln("	</tr>");
-	w.document.writeln("	<tr>");
-	w.document.writeln("		<td colspan=2 align=center><br><button type='submit' onClick=\"window.close();\"  att-button btn-type=\"primary\" size=\"small\" title='Save'>Close</button></td>");
-	w.document.writeln("	</tr>");
-<%	} else { %>
-	w.document.writeln("	<tr class=rbg1 height=30>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("		<td>&nbsp;</td>");
-	w.document.writeln("	</tr>");
-<%	}	// if 
-%>
-	w.document.writeln("</table>");
-	
-	w.document.writeln("</body></html>");
-	w.document.close();
-}   // showFormFieldPopup
-//-->
-</script>
-
-<table width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr>
-		<td class=rbg3 width="60%" align="left" valign="top">
-			&nbsp;<font class=rtabletext>Report SQL: </font><br>
-			<%	boolean sqlValidated = (nvl(AppUtils.getRequestValue(request, "sqlValidated"), nvl(rdef.getReportSQL())).length()>0); 
-				if(request.getAttribute(AppConstants.RI_ERROR_LIST)!=null)
-					sqlValidated = false;
-					
-				String  sql = nvl(rdef.getReportSQL(), "SELECT ");
-				if(! sqlValidated) 
-					sql = nvl(AppUtils.getRequestValue(request, "reportSQL"), sql);	%>
-			<input type="hidden" id="sqlValidated" name="sqlValidated" value="<%= sqlValidated?"Y":"N" %>">
-			&nbsp;<textarea name="reportSQL" cols="155" rows="32" onChange="document.getElementById('sqlValidated').value='N';" style="height: 400px;"><%= sql %></textarea>
-		</td>
-		<td class=rbg2 width="40%" align="left" valign="top" nowrap>
-			&nbsp;<font class=rtabletext>Keyword Assistance </font><br>
-			<b class=rtabletext>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('SELECT')">SELECT</a>&nbsp;&nbsp;<a href="javascript:addText('DISTINCT')">DISTINCT</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('FROM')">FROM</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('WHERE')">WHERE</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('GROUP BY')">GROUP BY</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('HAVING')">HAVING</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('ORDER BY')">ORDER BY</a>&nbsp;&nbsp;<a href="javascript:addText('ASC')">ASC</a>&nbsp;&nbsp;<a href="javascript:addText('DESC')">DESC</a>&nbsp;<br>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('UNION')">UNION</a>&nbsp;&nbsp;<a href="javascript:addText('ALL')">ALL</a>&nbsp;&nbsp;<a href="javascript:addText('INTERSECT')">INTERSECT</a>&nbsp;&nbsp;<a href="javascript:addText('MINUS')">MINUS</a>&nbsp;<br>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('AND')">AND</a>&nbsp;&nbsp;<a href="javascript:addText('OR')">OR</a>&nbsp;&nbsp;<a href="javascript:addText('NOT')">NOT</a>&nbsp;&nbsp;<a href="javascript:addText('EXISTS')">EXISTS</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('IS')">IS</a>&nbsp;&nbsp;<a href="javascript:addText('NULL')">NULL</a>&nbsp;&nbsp;<a href="javascript:addText('IN')">IN</a>&nbsp;&nbsp;<a href="javascript:addText('BETWEEN')">BETWEEN</a>&nbsp;<br>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('COUNT(')">COUNT(</a>&nbsp;&nbsp;<a href="javascript:addText('SUM(')">SUM(</a>&nbsp;&nbsp;<a href="javascript:addText('AVG(')">AVG(</a>&nbsp;&nbsp;<a href="javascript:addText('MAX(')">MAX(</a>&nbsp;&nbsp;<a href="javascript:addText('MIN(')">MIN(</a>&nbsp;<br>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('NVL(')">NVL(</a>&nbsp;&nbsp;<a href="javascript:addText('DECODE(')">DECODE(</a>&nbsp;&nbsp;<a href="javascript:addText('SYSDATE')">SYSDATE</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('TO_CHAR(')">TO_CHAR(</a>&nbsp;&nbsp;<a href="javascript:addText('TO_NUMBER(')">TO_NUMBER(</a>&nbsp;&nbsp;<a href="javascript:addText('TO_DATE(')">TO_DATE(</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('TRUNC(')">TRUNC(</a>&nbsp;&nbsp;<a href="javascript:addText('ROUND(')">ROUND(</a>&nbsp;&nbsp;<a href="javascript:addText('ABS(')">ABS(</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('SUBSTR(')">SUBSTR(</a>&nbsp;&nbsp;<a href="javascript:addText('REPLACE(')">REPLACE(</a>&nbsp;&nbsp;<a href="javascript:addText('LOWER(')">LOWER(</a>&nbsp;&nbsp;<a href="javascript:addText('UPPER(')">UPPER(</a>&nbsp;<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="javascript:addText('LTRIM(')">LTRIM(</a>&nbsp;&nbsp;<a href="javascript:addText('RTRIM(')">RTRIM(</a>&nbsp;&nbsp;<a href="javascript:addText('LPAD(')">LPAD(</a>&nbsp;&nbsp;<a href="javascript:addText('RPAD(')">RPAD(</a>&nbsp;<br>
-			</b>
-		</td> 
-	</tr>
-	<tr>
-		<td class=rbg2 height="40" align="left" valign="Middle" nowrap>
-			<font class=rtabletext style="display: none">
-				&nbsp;Tables:
-				<select name="dbTables" style="width: 200px">
-				<%	Vector reportTableSources = DataCache.getReportTableSources((String) session.getAttribute("remoteDB"));
-					for(int i=0; i<reportTableSources.size(); i++) { 
-						TableSource tableSource = (TableSource) reportTableSources.get(i); %>
-					<option value="<%= tableSource.getTableName() %>"><%= tableSource.getTableName() %>
-				<%	} %>
-				</select>
-				<button type="submit" onClick="addTable()" att-button btn-type="primary" size="small" title='Add Table'>Add Table</button>
-				<button type="submit" onClick="showTableColsPopup()" att-button btn-type="primary" size="small" title='Columns'>Columns</button>
-				<button type="submit" onClick="showFormFieldPopup()" att-button btn-type="primary" size="small" title='Form Fields'>Form Fields</button>
-				&nbsp;
-			</font>
-		</td>
-		<td class=rbg2 align="left" valign="Middle" nowrap>
-			<font class=rtabletext>&nbsp;
-				<button type="submit" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_VALIDATE %>';" att-button btn-type="primary" size="small" title='Validate SQL'>Validate SQL</button>
-				&nbsp;
-				<button type="Button" onClick="showTestRunSQLPopup()" att-button btn-type="primary" size="small" title='Test Run SQL'>Test Run SQL</button>
-				&nbsp;
-			</font>
-		</td>
-	</tr>
-	<tr>
-		<td class=rbg1 colspan=2 height="30" align="center" valign="Middle"><b class=rtableheader>You need to click the &quot;Validate SQL&quot; button in order to store the SQL before going forward</b></td>
-	</tr>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	if(document.getElementById("sqlValidated") && document.getElementById("sqlValidated").value!="Y") {
-	<% if(nvl(rdef.getReportSQL()).length()>0) { %>
-		return confirm("The changes made to the SQL have not been validated.\nYou need to click the \"Validate SQL\" button in order to do that.\nDo you want to continue now and lose the changes made to the SQL after the last validation?");
-	<% } else { %>
-		alert("The SQL has not been validated.\nPlease click the \"Validate SQL\" button in order to do that.\nYou cannot go forward without SQL validation.");
-		return false;
-	<% } %>
-	}   // if
-	
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp
deleted file mode 100644
index 88ecda31..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_edit.jsp
+++ /dev/null
@@ -1,369 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-<%@ page import="org.openecomp.portalsdk.analytics.error.UserDefinedException"%>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-	boolean isEdit = curSubStep.equals(AppConstants.WSS_EDIT);
-	DataSourceType currTable = null;
-	if(isEdit)
-		currTable = rdef.getTableById(AppUtils.getRequestNvlValue(request, AppConstants.RI_DETAIL_ID));
-	Vector reportTableSources = (isEdit)?DataCache.getReportTableSources((String) session.getAttribute("remoteDB")):DataCache.getReportTableSources(AppUtils.getUserRoles(request),((String) session.getAttribute("remoteDB")), AppUtils.getUserID(request), request);
-	if(reportTableSources.size()<=0) {
-        request.setAttribute(AppConstants.RI_EXCEPTION, new Exception("Please add table name to the raptor table for generating report"));
-		throw new UserDefinedException("Please add table name to the raptor table for generating report");
-	}
-	Vector reportTableJoins   = (isEdit)?DataCache.getReportTableJoins():DataCache.getReportTableJoins(AppUtils.getUserRoles(request)); %>
-
-<% if(! isEdit) { %>
-<script language="JavaScript">
-<!--
-	var tablesExist = false;
-	<% if(rdef.getDataSourceList().getDataSource().size()>0) { %>
-		tablesExist = true;
-	
-	function setJoinTableName(tableId) {
-		var selIndex = 0;
-		for(var i=1; i<document.forma.joinTableName.options.length; i++)
-			if(tableId==document.forma.joinTableName.options[i].value)
-				selIndex = i;
-	 
-		document.forma.joinTableName.selectedIndex = selIndex;
-	}   // setJoinTableName
-	<% } %>
-	
-	function tableNameChange() {
-		var newTableName = "";
-		newTableName = document.forma.tableName.options[document.forma.tableName.selectedIndex].value;
-		
-		document.forma.displayName.value=document.forma.tableName.options[document.forma.tableName.selectedIndex].text;
-		
-		// Setting the PK values
-		if(false) {}
-
-	<%	for(int i=0; i<reportTableSources.size(); i++) { 
-			TableSource tableSource = (TableSource) reportTableSources.get(i); %>
-		else if(newTableName=="<%= tableSource.getTableName() %>") 
-		    document.forma.tablePK.value = "<%= tableSource.getPkFields() %>";
-	<%	} %>
-		
-	<% if(rdef.getDataSourceList().getDataSource().size()>0) {
-			for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-				DataSourceType dst = (DataSourceType) iter.next();
-	
-				for(int i=0; i<reportTableJoins.size(); i++) {
-					TableJoin tableJoin = (TableJoin) reportTableJoins.get(i);
-					if(dst.getTableName().equals(tableJoin.getSrcTableName())) { %>
-		if(newTableName=="<%= tableJoin.getDestTableName() %>")
-			setJoinTableName("<%= dst.getTableId() %>");
-		else 
-	<%              } else if(dst.getTableName().equals(tableJoin.getDestTableName())) { %>
-		if(newTableName=="<%= tableJoin.getSrcTableName() %>")
-			setJoinTableName("<%= dst.getTableId() %>");
-		else 
-	<% 		        }   // if
-				}	// for
-			} %>
-			setJoinTableName("");
-	<% } %>
-		listJoinExpr(document.forma.tableName.options[document.forma.tableName.selectedIndex].value,
-		             document.forma.joinTableName.options[document.forma.joinTableName.selectedIndex].value);
-	}   // tableNameChange
-	
-
-//-->
-</script >
-<% } %>
-
-<script language="JavaScript">
-<!--
-	//load table join info to an array of objects
-	function table_join(src_table, dest_table, join_expr) {
-		this.src_table = src_table;
-		this.dest_table = dest_table;
-		this.join_expr = join_expr;
-	}
-	
-	var table_joins = new Array();
-	
-	<% for(int i=0; i<reportTableJoins.size(); i++) {
-			TableJoin tableJoin = (TableJoin) reportTableJoins.get(i); %>
-			table_joins[table_joins.length] = 
-				new table_join("<%=tableJoin.getSrcTableName()%>","<%=tableJoin.getDestTableName()%>","<%=tableJoin.getJoinExpr()%>");
-	<% } %>
-	
-	function table_id_name_mapping(table_id, table_name) {
-		this.table_id = table_id;
-		this.table_name = table_name;
-	}
-	
-	var table_id_name_mappings = new Array();
-
-	<% for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-			DataSourceType dst = (DataSourceType) iter.next(); %>
-			table_id_name_mappings["<%= dst.getTableId()%>"] = "<%= dst.getTableName()%>";
-			table_id_name_mappings["<%= dst.getTableName()%>"] = "<%= dst.getTableId()%>"; 
-	<% }	%>
-
-	function listJoinExpr(tableName, joinTableId) {
-
-		removeAllOptions(document.forma.joinExpr);
-		var isJoinExprFound = false;
-		
-		<%if(isEdit) {%>
-			addOption(document.forma.joinExpr, "" ,"No Change");
-		<%}%>
-		
-		for ( var i=0; i<table_joins.length; i++) {
-			if( (table_joins[i].src_table==tableName && table_joins[i].dest_table==table_id_name_mappings[joinTableId])
-		     ||
-			    (table_joins[i].dest_table==tableName && table_joins[i].src_table==table_id_name_mappings[joinTableId])
-				)
-			{
-				addOption(document.forma.joinExpr, table_joins[i].join_expr ,table_joins[i].join_expr );
-				isJoinExprFound = true;
-			}
-		}
-		
-		if(!isJoinExprFound)
-		{		
-			removeAllOptions(document.forma.joinExpr);
-			addOption(document.forma.joinExpr, "" ,"No Join Condition Defined");
-		}
-	}
-	
-	function removeAllOptions(selectbox)
-	{
-		var i;
-		for(i=selectbox.options.length-1;i>=0;i--)
-		{
-			selectbox.remove(i);
-		}
-	}
-	
-	function addOption(selectbox, value, text )
-	{
-		var optn = document.createElement("OPTION");
-		optn.text = text;
-		optn.value = value;
-	
-		selectbox.options.add(optn);
-	}
--->	
-</script>
-
-<table width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=2 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %> - <%= curSubStep %></b></td>
-	</tr>
-	<tr>
-		<td align="right" width="25%" class=rbg2 height="30" style="background-image:url(<%= AppUtils.getImgFolderURL() %>required.gif); background-position:top right; background-repeat:no-repeat;"><font class=rtabletext>Table Name </font></td> 
-		<td align="left" width="50%" class=rbg3><font class=rtabletext>
-		<% if(isEdit) { 
-				String tName = null;
-				for(int i=0; i<reportTableSources.size(); i++) {
-					TableSource tableSource = (TableSource) reportTableSources.get(i);
-					if(currTable.getTableName().equals(tableSource.getTableName())) {
-						tName = tableSource.getDisplayName();
-						break;
-					}	// if
-				} %>
-				<%= nvl(tName, currTable.getTableName()) %>
-				<input type="hidden" name="tableName" value="<%=currTable.getTableName()%>">
-		<% } else { %>
-			<select name="tableName" class="rtabletext" onChange="tableNameChange()">
-				<%	for(int i=0; i<reportTableSources.size(); i++) {
-						TableSource tableSource = (TableSource) reportTableSources.get(i); %>
-				    <option value="<%= tableSource.getTableName() %>"<%= (i==0)?" selected":"" %>><%= tableSource.getDisplayName() %>
-				<%	} %>
-			</select>
-		<% } %>
-			<input type="hidden" name="tablePK" value="<%= ((TableSource) reportTableSources.get(0)).getPkFields() %>">
-		</font></td>
-	</tr> 
-	<tr>
-		<td align="right" width="25%" class=rbg2 height="30"><font class=rtabletext>Display Name </font></td> 
-		<td align="left" width="50%" class=rbg3><font class=rtabletext>
-			<input type="text" class="rtabletext" size="30" maxlength="30" name="displayName" value="<%= isEdit?currTable.getDisplayName():((TableSource) reportTableSources.get(0)).getDisplayName() %>"></font></td>
-	</tr>
-<% if(rdef.getDataSourceList().getDataSource().size()>(isEdit?1:0)) { 
-		String outerJoinType = (isEdit?rdef.getOuterJoinType(currTable):""); %>
-	<tr>
-		<td align="right" width="25%" class=rbg2 height="30"><font class=rtabletext>Join To Table </font></td> 
-		<td align="left" width="50%" class=rbg3><font class=rtabletext>
-		<% if(isEdit) { %>
-			<% if(currTable.getRefTableId()==null){%>
-					--- Table Not Joined ---
-			<%} else { %>
-					<%=rdef.getTableById(currTable.getRefTableId()).getDisplayName() %>
-					</br>on :&nbsp;<%=currTable.getRefDefinition() %>
-			<%} %>
-			<input type="hidden" name="joinTableName" value="<%=currTable.getRefTableId()%>">
-			
-		<% } else { %>
-			<select name="joinTableName" onChange="listJoinExpr();">
-				<option value="" selected>--- Tables Not Joined ---
-				<% for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-						DataSourceType dst = (DataSourceType) iter.next(); %>
-						<option value="<%= dst.getTableId() %>"><%= dst.getDisplayName() %>
-				<% } %>
-			</select>
-		<% } %>
-		</font></td>
-	</tr> 
-	
-	<tr>
-		<td align="right" width="25%" class=rbg2 height="30"><font class=rtabletext>All availabe Join Options </font></td> 
-		<td align="left" width="50%" class=rbg3><font class=rtabletext>
-			<select name="joinExpr">
-				<option value="" selected>No Join Condition</option>
-			</select>
-		</font></td>
-	</tr>
-	<% if(isEdit) { %>
-	<script language="JavaScript">
-		listJoinExpr("<%=currTable.getTableName()%>","<%=currTable.getRefTableId()%>");
-	</script>
-	<%} %>
-	
-	<tr>
-		<td align="right" width="25%" class=rbg2 height="30"><font class=rtabletext>Join Type </font></td> 
-		<td align="left" width="50%" class=rbg3><font class=rtabletext>
-			<select name="outerJoin">
-				<option value=""<%= (outerJoinType.length()==0)?" selected":"" %>>Include only records present in both tables
-				<option value="<%= AppConstants.OJ_CURRENT %>"<%= outerJoinType.equals(AppConstants.OJ_CURRENT)?" selected":"" %>>Include join table records without match in this table
-				<option value="<%= AppConstants.OJ_JOINED %>"<%= outerJoinType.equals(AppConstants.OJ_JOINED)?" selected":"" %>>Include records from this table without match in the join table
-			</select>
-		</font></td>
-	</tr> 
-<% } %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function checkNotJoined() {
-<% if(rdef.getDataSourceList().getDataSource().size()>(isEdit?1:0)) { %>
-	if(document.forma.outerJoin.selectedIndex==0) {
-	<% if(isEdit) { %>
-		var selTable       = "<%= currTable.getTableName() %>";
-		var selDisplayName = "<%= currTable.getDisplayName() %>";
-	<% } else { %>
-		var selTable       = document.forma.tableName.options[document.forma.tableName.selectedIndex].value;
-		var selDisplayName = document.forma.tableName.options[document.forma.tableName.selectedIndex].text;
-	<% } %>
-		
-		if(false
-	<%	for(int i=0; i<reportTableSources.size(); i++) {
-			TableSource tableSource = (TableSource) reportTableSources.get(i); 
-			if(tableSource.getIsLargeData().equals("Y")) { %>
-			||selTable=="<%= tableSource.getTableName() %>"
-	<%		}	// if
-		}	// for 
-	%>
-			) {
-			alert("Table "+selDisplayName+" contains large amount of data\nand cannot be added unless it is joined to another table.\nPlease select a Join To Table from the list.");
-			document.forma.outerJoin.focus();
-			
-			return false;
-		}	// if
-	}
-<%	if(! isEdit) { %>
-	else {	//  if(document.forma.outerJoin.selectedIndex>0)
-		var selTable     = document.forma.tableName.options[document.forma.tableName.selectedIndex].value;
-		var selJoinTblId = document.forma.outerJoin.options[document.forma.outerJoin.selectedIndex].value;
-		var selJoinTable = "";
-	<%	for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) { 
-			DataSourceType dst = (DataSourceType) iter.next(); %>
-		if(selJoinTblId=="<%= dst.getTableId() %>") 
-			selJoinTable = "<%= dst.getTableName() %>";
-	<%	}	// for
-		for(Iterator iter=reportTableJoins.iterator(); iter.hasNext(); ) { 
-			TableJoin tableJoin = (TableJoin) iter.next(); %>
-		if((selTable=="<%= tableJoin.getSrcTableName() %>"&&selJoinTable=="<%= tableJoin.getDestTableName() %>")||
-		   (selTable=="<%= tableJoin.getDestTableName() %>"&&selJoinTable=="<%= tableJoin.getSrcTableName() %>"))
-			return true;
-	<%	} %>
-		
-		alert("Table "+document.forma.tableName.options[document.forma.tableName.selectedIndex].text+
-				" cannot be joined to table "+document.forma.outerJoin.options[document.forma.outerJoin.selectedIndex].text+
-				".\nPlease select a different join.");
-		return false;
-	}	// if
-<%	}	// if(! isEdit)
-   } %>
-	
-	return true;
-}	// checkNotJoined
-	
-function dataValidate() {
-	if(document.forma.displayName.value=="")
-	<% if(isEdit) { %>
-		document.forma.displayName.value = "<%= currTable.getDisplayName() %>";
-	<% } else { %>
-		document.forma.displayName.value = document.forma.tableName.options[selectedIndex].text;
-	<% } %>
-	
-	if(false
-	<% for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); ) {
-	    	DataSourceType dst = (DataSourceType) iter.next();
-			
-			if(! (isEdit&&dst.getTableId().equals(currTable.getTableId()))) { %>
-				||document.forma.displayName.value=="<%= dst.getDisplayName() %>"
-	<%      }
-		} %>
-	   ) {
-			alert("Table with display name "+document.forma.displayName.value+" already exists.\nPlease select another name.");
-			document.forma.displayName.focus();
-			document.forma.displayName.select();
-		
-			return false;
-		}
-	
-	if(! checkNotJoined())
-		return false;
-	
-	return true;
-}   // dataValidate
-//-->
-</script>
-
-<%!
-	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp
deleted file mode 100644
index 47fd435f..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_tables_list.jsp
+++ /dev/null
@@ -1,85 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-%>
-<table class="mTAB" width="100%" class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=4 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="79%"><b class=rtableheader>Table</b></td>
-		<td align="center" valign="Middle" width="14%" colspan=2><input type="button" class=button border="0"  value="Add" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD %>';document.forma.submit();"></td>
-	</tr>
-<% 	int iCount = 0;
-	for(Iterator iter=rdef.getDataSourceList().getDataSource().iterator(); iter.hasNext(); iCount++) { 
-		DataSourceType dst = (DataSourceType) iter.next(); %>
-	<tr class=<%=(iCount % 2 == 0)?"rowalt1":"rowalt2"%>>
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %></font></td>
-		<td><font class=rtabletext><%= nvl(dst.getDisplayName()).length()>0?dst.getDisplayName():dst.getTableName()%></font></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>pen_paper.gif" alt="Edit" width="12" height="12" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_EDIT %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dst.getTableId() %>';"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove the <%= dst.getDisplayName() %> table\nalong with all its columns from the report?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= dst.getTableId() %>'; }"></td>
-	</tr>
-<%	} %>
-<%	if(iCount==0) { %>
-	<tr class=rbg3>
-		<td colspan=4 align="center" height="30"><font class=rtabletext>No tables defined</font></td>
-	</tr>
-<%	} %>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-<% if(rdef.getDataSourceList().getDataSource().size()>0) { %>
-	return true;
-<% } else { %>
-	alert("You must have at least one table in the report.\nPlease add a table.");
-	return false;
-<% } %>
-}   // dataValidate
-//-->
-</script>
-
-<%!	private String nvl(String s)                  { return (s==null)?"":s; }
-	private String nvl(String s, String sDefault) {	return nvl(s).equals("")?sDefault:s; } 
-%>    
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp
deleted file mode 100644
index b5c68045..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/raptor/wizard_user_access.jsp
+++ /dev/null
@@ -1,184 +0,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.
-  ================================================================================
-  --%>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataColumnType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.AppConstants" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.ReportDefinition" %>
-<%@ page import="org.openecomp.portalsdk.analytics.system.AppUtils" %>
-<%@ page import="org.openecomp.portalsdk.analytics.controller.WizardSequence" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.List" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.DataCache" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.DataSourceType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.DBColumnInfo" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableSource" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.base.IdNameValue" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.SemaphoreType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.xmlobj.FormFieldType" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.TableJoin" %>
-<%@ page import="org.openecomp.portalsdk.analytics.model.definition.SecurityEntry" %>
-<%@ page import="org.openecomp.portalsdk.analytics.util.Utils" %>
-
-<%	
-    ReportDefinition rdef = (ReportDefinition) request.getAttribute(AppConstants.SI_REPORT_DEFINITION);
-    WizardSequence ws = rdef.getWizardSequence();
-    String curSubStep = ws.getCurrentSubStep();
-%>  
-<table width="100%"  class="tableBorder" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=4 valign="Middle"><b class=rtableheader>Step <%= ws.getCurrentStepIndex() %> of <%= ws.getStepCount() %> - Report <%= ws.getCurrentStep() %></b></td>
-	</tr>
-	<tr>
-		<td class=rbg2 align="right" width="16%" height="30"><font class=rtabletext>Created By: </font></td> 
-		<td class=rbg3 align="left" width="34%" valign="middle" nowrap><font class=rtabletext><%= AppUtils.getUserName(rdef.getCreateID()) %></font></td>
-		<td class=rbg2 align="right" width="16%"><font class=rtabletext>Created Date: </font></td> 
-		<td class=rbg3 align="left" width="34%" valign="middle" nowrap><font class=rtabletext><%= rdef.getCreateDate() %></font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Last Updated By: </font></td> 
-		<td class=rbg3 align="left" valign="middle" nowrap><font class=rtabletext><%= AppUtils.getUserName(rdef.getUpdateID()) %></font></td>
-		<td class=rbg2 align="right"><font class=rtabletext>Last Updated: </font></td> 
-		<td class=rbg3 align="left" valign="middle" nowrap><font class=rtabletext><%= rdef.getUpdateDate() %></font></td>
-	</tr> 
-	<tr>
-		<td class=rbg2 align="right" height="30"><font class=rtabletext>Report Owner: </font></td> 
-		<td class=rbg3 align="left"><font class=rtabletext>
-			<select name="reportOwner">
-<% 			Vector allUsers = Utils.getUsersNotInList(new java.util.ArrayList(),request);
-			for(int i=0; i<allUsers.size(); i++) {
-				IdNameValue user = (IdNameValue) allUsers.get(i); %>
-			    <option value="<%= user.getId() %>"<%= user.getId().equals(rdef.getOwnerID())?" selected":"" %>><%= user.getName() %>
-<% 			}	// for 
-%>
-			</select></font>
-		</td>
-		<td class=rbg2 align="right"><font class=rtabletext>Public? (All users can run the report)</font></td> 
-		<td class=rbg3 align="left">
-			<select name="public" >
-				<option value="Y"<%= rdef.isPublic()?" selected":"" %>>Yes
-				<option value="N"<%= rdef.isPublic()?"":" selected" %>>No
-			</select>
-		</td>
-	</tr>
-</table>
-<br>
-
-<table class="mTAB" width="100%" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=5 valign="Middle"><b class=rtableheader>Report Users</b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="59%"><b class=rtableheader>User Name</b></td>
-		<td align="center" valign="Middle" width="10%"><b class=rtableheader>Run Access</b></td>
-		<td align="center" valign="Middle" width="10%"><b class=rtableheader>Edit Access</b></td>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Remove</b></td>
-	</tr>
-<%	int iCount = 0;
-	Vector reportUsers = rdef.getReportUsers(request);
-	for(Iterator iter=reportUsers.iterator(); iter.hasNext(); iCount++) { 
-		SecurityEntry rUser = (SecurityEntry) iter.next(); %>
-	<tr class="<%=((iCount % 2 == 0)?"rowalt1":"rowalt2")%>">
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %></font></td>
-		<td><font class=rtabletext><%= rUser.getName() %></font></td>
-		<td align="center" valign="Middle"><img src="<%= AppUtils.getImgFolderURL() %>active.gif" width="16" height="16" border="0"></td>
-		<td align="center" valign="Middle"><input type="image" src="<%= AppUtils.getImgFolderURL() %><%= rUser.isReadOnly()?"inactive.gif":"active.gif" %>" alt="<%= rUser.isReadOnly()?"Grant":"Revoke" %> edit access" width="16" height="16" border="0" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= rUser.isReadOnly()?AppConstants.WA_GRANT_USER:AppConstants.WA_REVOKE_USER %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rUser.getId() %>';"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove user <%= rUser.getName() %>?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_USER %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rUser.getId() %>'; }"></td>
-	</tr>
-<%	}   // for
-//	if(iCount==0) { %>
-	<!--tr class=rbg2>
-		<td colspan=5 align="center" height="30"><font class=rtabletext>No user access defined</font></td>
-	</tr-->
-<%	//}
-	Vector remainingUsers = Utils.getUsersNotInList(reportUsers,request);
-	if(remainingUsers.size()>0) { %>
-	<tr>
-		<td class=rbg1 colspan=5 valign="Middle" nowrap><b class=rtableheader>Grant Access To&nbsp;
-			<select name="newUserId" onChange="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_USER %>'; document.forma.submit();">
-			    <option value="" selected>--- Select User ---
-<% 			for(int i=0; i<remainingUsers.size(); i++) {
-				IdNameValue user = (IdNameValue) remainingUsers.get(i); %>
-			    <option value="<%= user.getId() %>"><%= user.getName() %>
-<% 			}	// for 
-%>
-			</select></b>
-		</td>
-<%	}	// if 
-%>
-	</tr>
-</table>
-<br>
-
-<table class="mTAB" width="100%" border="0" cellspacing="1" cellpadding="3" align=center>
-	<tr>
-		<td class=rbg1 colspan=5 valign="Middle"><b class=rtableheader>Report Roles</b></td>
-	</tr>
-	<tr class=rbg1>
-		<td align="center" valign="Middle" width="7%" height="30"><b class=rtableheader>&nbsp;&nbsp;No&nbsp;&nbsp;</b></td>
-		<td align="center" valign="Middle" width="59%"><b class=rtableheader>Role Name</b></td>
-		<td align="center" valign="Middle" width="10%"><b class=rtableheader>Run Access</b></td>
-		<td align="center" valign="Middle" width="10%"><b class=rtableheader>Edit Access</b></td>
-		<td align="center" valign="Middle" width="14%"><b class=rtableheader>Remove</b></td>
-	</tr>
-<%	iCount = 0;
-	Vector reportRoles = rdef.getReportRoles(request);
-	for(Iterator iter=reportRoles.iterator(); iter.hasNext(); iCount++) { 
-		SecurityEntry rRole = (SecurityEntry) iter.next(); %>
-	<tr class="<%=((iCount % 2 == 0)?"rowalt1":"rowalt2")%>">
-		<td align="center" height="30"><font class=rtabletext><%= iCount+1 %></font></td>
-		<td><font class=rtabletext><%= rRole.getName() %></font></td>
-		<td align="center" valign="Middle"><img src="<%= AppUtils.getImgFolderURL() %>active.gif" width="16" height="16" border="0"></td>
-		<td align="center" valign="Middle"><input type="image" src="<%= AppUtils.getImgFolderURL() %><%= rRole.isReadOnly()?"inactive.gif":"active.gif" %>" alt="<%= rRole.isReadOnly()?"Grant":"Revoke" %> edit access" width="16" height="16" border="0" onClick="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= rRole.isReadOnly()?AppConstants.WA_GRANT_ROLE:AppConstants.WA_REVOKE_ROLE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rRole.getId() %>';"></td>
-		<td align="center"><input type=image border="0" src="<%= AppUtils.getImgFolderURL() %>deleteicon.gif" alt="Remove" width="12" height="12" onClick="if(! confirm('Are you sure you want to remove role <%= rRole.getName() %>?')) {return false;} else {document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_DELETE_ROLE %>'; document.forma.<%= AppConstants.RI_DETAIL_ID %>.value='<%= rRole.getId() %>'; }"></td>
-	</tr>
-<%	}   // for
-//	if(iCount==0) { %>
-	<!--tr class=rbg2>
-		<td colspan=5 align="center" height="30"><font class=rtabletext>No role access defined</font></td>
-	</tr-->
-<%	//}
-	Vector remainingRoles = Utils.getRolesNotInList(reportRoles,request); 
-	if(remainingRoles.size()>0) { %>
-	<tr>
-		<td class=rbg1 colspan=5 valign="Middle" nowrap><b class=rtableheader>Grant Access To&nbsp;
-			<select name="newRoleId" onChange="document.forma.<%= AppConstants.RI_WIZARD_ACTION %>.value='<%= AppConstants.WA_ADD_ROLE %>'; document.forma.submit();">
-			    <option value="" selected>--- Select Role ---
-<% 			for(int i=0; i<remainingRoles.size(); i++) {
-				IdNameValue role = (IdNameValue) remainingRoles.get(i); %>
-			    <option value="<%= role.getId() %>"><%= role.getName() %>
-<% 			}	// for 
-%>
-			</select></b>
-		</td>
-<%	}	// if 
-%>
-	</tr>
-</table>
-<br>
-
-<script language="JavaScript">
-<!--
-function dataValidate() {
-	return true;
-}   // dataValidate
-//-->
-</script>
-
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/busy_hour_traffic.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/busy_hour_traffic.html
deleted file mode 100644
index 54ff7849..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/busy_hour_traffic.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<!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>Busy hour traffic analysis by day of week</title>
-
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/scribble.css" />
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/flexslider.css" />
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/welcome.css" />
-<script src="../../../../../app/fusion/external/angular-1.4.8/angular.js"></script>
-<script src="../../../../../static/js/jquery-1.10.2.js"></script>
-<script src="../../../../fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script>
-<!--for line Chart and  Area Chart-->
-<script src="../../../../../static/fusion/d3/js/d3.v3.min.js"></script>
-<script src="../../../../../static/fusion/d3/js/nv.d3.min.js"></script>
-<script src="../../../../../static/fusion/d3/js/models/axis.min.js"></script>
-<!-- Style for line Chart and area chart  -->
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/d3/css/nv.d3.css">
-<script type="text/javascript" src="../../../../../static/fusion/sample/js/FusionCharts.js"></script>
-<script type="text/javascript" 	src="../../../../../static/fusion/sample/js/scribble.js"></script>
-<script>
-	var app = angular.module("myApp", []); 
-	app.controller('trafficController',function($scope) {
-		$scope.BusyHourTraffic = [ {
-			title : 'BH SNRC DLSTX - Incoming',
-			url : '#Incoming'
-		}, {
-			title : 'BH SNRC DLSTX - Outgoing',
-			url : '#Outgoing'
-		}, {
-			title : 'BH National - Default',
-			url : '#Default'
-		}, {
-			title : 'BH National - Priority',
-			url : '#Priority'
-		}, {
-			title : 'BH National',
-			url : '#BHNational'
-		}
-
-	];	
-    $scope.currentSelectedBusyHourTraffic = '#Incoming';
-    $scope.onClickTab2 = function (TrafficTab) {
-        $scope.currentSelectedBusyHourTraffic = TrafficTab.url;
-    }  
-    $scope.isActiveTab2 = function(tabUrl) {
-        return tabUrl == $scope.currentSelectedBusyHourTraffic;
-    }
-	$scope.activeTabId2 = 'Incoming';
-			//for generic tabs
-	$scope.gTabs2 = [ {
-		title : 'BH SNRC DLSTX - Incoming',
-		id : 'Incoming',
-		url : '#Incoming',
-		selected : true
-	}, {
-		title : 'BH SNRC DLSTX - Outgoing',
-		id : 'Outgoing',
-		url : '#Outgoing'
-	}, {
-		title : 'BH National - Default',
-		id : 'Default',
-		url : '#Default'
-	}, {
-		title : 'BH National - Priority',
-		id : 'Priority',
-		url : '#Priority'
-	}, {
-		title : 'BH National',
-		id : 'BHNational',
-		url : '#BHNational'
-	}];
-
-	$scope.activeTabId3 = 'Incoming';
-	//for generic tabs
-	$scope.gTabs3 = [ {
-		title : 'BH SNRC DLSTX - Incoming',
-		id: 'Incoming',
-		url : '#Incoming',
-		selected : true
-	}, {
-		title : 'BH SNRC DLSTX - Outgoing',
-		id : 'Outgoing',
-		url : '#Outgoing'
-	}, {
-		title : 'BH National - Default',
-		id : 'Default',
-		url : '#Default'
-	}, {
-		title : 'BH National - Priority',
-		id : 'Priority',
-		url : '#Priority'
-	}, {
-		title : 'BH National',
-		id : 'BHNational',
-		url : '#BHNational'
-	}];
-    $scope.currentSelectedBusyHourTraffic = '#Incoming';
-    $scope.onClickTab2 = function (TrafficTab) {
-        $scope.currentSelectedBusyHourTraffic = TrafficTab.url;
-    }   
-    $scope.isActiveTab2 = function(tabUrl) {
-        return tabUrl == $scope.currentSelectedBusyHourTraffic;
-    }
-	$scope.toggleEastToWest = function() {
-		$("#toggle").toggle('slide');
-		if ($("#leftIcon").is(":visible")) {
-			$("#rightIcon").show();
-			$("#leftIcon").hide();
-		} 
-		else if ($("#rightIcon").is(":visible")) {
-			$("#rightIcon").hide();
-			$("#leftIcon").show();
-		}
-	};
-
-	$scope.group1 = {
-		open : true
-	};
-	$scope.group2 = {
-		open : true
-	};
-	$scope.group3 = {
-		open : true
-	};
-	$scope.group4 = {
-		open : true
-	};
-	$scope.group5 = {
-		open : true
-	};
-	$scope.group6 = {
-		open : true
-	};
-	$scope.group7 = {
-		open : true
-	};
-	$scope.group71 = {
-		open : true
-	};
-	$scope.group8 = {
-		open : true
-	};
-	$scope.group9 = {
-		open : true
-	};
-	$scope.group10 = {
-		open : true
-	};
-	$scope.group11 = {
-		open : true
-	};
-	$scope.group12 = {
-		open : false
-	};
-});
-</script>
-
-</head>
-	<body ng-app="myApp">
-		<div ng-controller="trafficController">
-			<div id = "BusyHourTraffic">
-				<ul>
-					<li ng-repeat="TrafficTab in BusyHourTraffic" ng-class="{active2:isActiveTab2(TrafficTab.url)}" ng-click="onClickTab2(TrafficTab)">{{TrafficTab.title}}</li>
-				</ul>
-				<div id = "BusyHourTrafficView">
-					<div ng-include="currentSelectedBusyHourTraffic"></div>
-				</div>
-	 			<script type="text/ng-template" id="#Incoming">
-				<div id="Incoming" align="left"><img src="../../../../../static/fusion/sample/images/tunnels/BH_DLSTX_IN.png" width=100% height=100%></div>
-			</script>
-				<script type="text/ng-template" id="#Outgoing">
-				<div id="Outgoing" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/BH_DLSTX_OUT.png" width=100% height=100%></div>
-			</script>
-				<script type="text/ng-template" id="#Default">
-				<div id="Default" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/BH_Nat_Def.png" width=100% height=100%></div>
-			</script>
-				<script type="text/ng-template" id="#Priority">
-				<div id="Priority" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/BH_Nat_Priority.png" width=100% height=100%></div>
-			</script>
-				<script type="text/ng-template" id="#BHNational">
-				<div id="BHNational" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/BH_Nat.png" width=100% height=100%></div>
-			</script>
-			</div> 
-		</div>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/traffic_distribution.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/traffic_distribution.html
deleted file mode 100644
index 0b196bae..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/samples/html/traffic_distribution.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!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>Traffic distribution by day of week</title>
-
-<script src="../../d3/js/d3.v3.min.js" charset="utf-8"></script>
-
-
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/scribble.css" />
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/flexslider.css" />
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/sample/css/welcome.css" />
-
-<script src="../../../../../app/fusion/external/angular-1.4.8/angular.js"></script>
-
-<script src="../../../../../static/js/jquery-1.10.2.js"></script>
-<script src="../../../../fusion/external/angular-ui/ui-bootstrap-tpls-1.1.2.min.js"></script>
-
-
-<!--for line Chart and  Area Chart-->
-<script src="../../../../../static/fusion/d3/js/d3.v3.min.js"></script>
-<script src="../../../../../static/fusion/d3/js/nv.d3.min.js"></script>
-<script src="../../../../../static/fusion/d3/js/models/axis.min.js"></script>
-
-<!-- Style for line Chart and area chart  -->
-<link rel="stylesheet" type="text/css" href="../../../../../static/fusion/d3/css/nv.d3.css">
-<!--  Charts -->
-<script type="text/javascript" src="../../../../../static/fusion/sample/js/charts.js"></script>
-<!--  Charts -->
-<script type="text/javascript" src="../../../../../static/fusion/sample/js/scribble.js"></script>
-
-
-<script>
-	var app = angular.module("myApp", []); 
-	app.controller('trafficController',function($scope) {
-		$scope.activeTabId = 'Monday';					
-		$scope.selectedTrafficDay = [{
-			title : 'Mon',
-			url : '#Monday'
-		}, {
-			title : 'Tue',
-			url : '#Tuesday'						
-		}, {
-			title : 'Wed',
-			url : '#Wednesday'						
-		}, {
-			title : 'Thu',
-			url : '#Thursday'						
-		}, {
-			title : 'Fri',
-			url : '#Friday'				
-		}, {
-			title : 'Sat',
-			url : '#Saturday'				
-		}, {
-			title : 'Sun',
-			url : '#Sunday'				
-		}];
-		
-	    $scope.currentSelectedDayTab = '#Monday';
-
-	    $scope.onClickTab1 = function (Daytab) {
-	        $scope.currentSelectedDayTab = Daytab.url;
-	    }
-	    
-	    $scope.isActiveTab1 = function(tabUrl) {
-	        return tabUrl == $scope.currentSelectedDayTab;
-	    }
-		
-		
-		$scope.gTabs = [ {
-			title : 'Monday',
-			id : 'Monday',
-			url : '#Monday',
-			selected : true
-		}, {
-			title : 'Tuesday',
-			id : 'Tuesday',
-			url : '#Tuesday'							
-		}, {
-			title : 'Wednesday',
-			id : 'Wednesday',
-			url : '#Wednesday'
-		}, {
-			title : 'Thursday',
-			id : 'Thursday',
-			url : '#Thursday'
-		}, {
-			title : 'Friday',
-			id : 'Friday',
-			url : '#Friday'
-		}, {
-			title : 'Saturday',
-			id : 'Saturday',
-			url : '#Saturday'
-		}, {
-			title : 'Sunday',
-			id : 'Sunday',
-			url : '#Sunday'
-		}];
-
-
-					
-					
-				
-	    $scope.currentSelectedBusyHourTraffic = '#Incoming';
-	
-	    $scope.onClickTab2 = function (TrafficTab) {
-	        $scope.currentSelectedBusyHourTraffic = TrafficTab.url;
-	    }
-	    
-	    $scope.isActiveTab2 = function(tabUrl) {
-	        return tabUrl == $scope.currentSelectedBusyHourTraffic;
-	    }
-	
-		$scope.toggleEastToWest = function() {
-			$("#toggle").toggle('slide');
-			if ($("#leftIcon").is(":visible")) {
-				$("#rightIcon").show();
-				$("#leftIcon").hide();
-			} 
-			else if ($("#rightIcon").is(":visible")) {
-				$("#rightIcon").hide();
-				$("#leftIcon").show();
-			}
-		};
-	
-		$scope.group1 = {
-			open : true
-		};
-		$scope.group2 = {
-			open : true
-		};
-		$scope.group3 = {
-			open : true
-		};
-		$scope.group4 = {
-			open : true
-		};
-		$scope.group5 = {
-			open : true
-		};
-		$scope.group6 = {
-			open : true
-		};
-		$scope.group7 = {
-			open : true
-		};
-		$scope.group71 = {
-			open : true
-		};
-		$scope.group8 = {
-			open : true
-		};
-		$scope.group9 = {
-			open : true
-		};
-		$scope.group10 = {
-			open : true
-		};
-		$scope.group11 = {
-			open : true
-		};
-		$scope.group12 = {
-			open : false
-		};
-	});
-</script>
-
-</head>
-	<body ng-app="myApp">
-		<div ng-controller="trafficController">
-			<div id="selectedTrafficDay">
-				<ul>
-					<li ng-repeat="Daytab in selectedTrafficDay" ng-class="{active1:isActiveTab1(Daytab.url)}" ng-click="onClickTab1(Daytab)">{{Daytab.title}}</li>
-				</ul>
-				<div id="SelectedTrafficeDayView">
-					<div ng-include="currentSelectedDayTab"></div>
-				</div>
-				<script type="text/ng-template" id="#Monday">
-					<div id="Monday"  align="centers"><img src="../../../../../static/fusion/sample/images/tunnels/1_mon.png" width=100% height=100% alt="Monday"></div>
-				</script>
-				<script type="text/ng-template" id="#Tuesday">
-					<div id="Tuesday"  align="center"><img src="../../../../../static/fusion/sample/images/tunnels/2_tue.png" width=100% height=100% alt="Tuesday"></div>
-				</script>
-				<script type="text/ng-template" id="#Wednesday">
-					<div id="Wednesday" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/3_wed.png" width=100% height=100% alt="Wednesday"></div>
-				</script>
-				<script type="text/ng-template" id="#Thursday">
-					<div id="Thursday" align="center"><img src="../../../../../static/fusion/sample/images/tunnels/4_thu.png" width=100% height=100% alt="Thursday"></div>
-				</script>
-				<script type="text/ng-template" id="#Friday">
-					<div id="Friday"  align="center"><img src="../../../../../static/fusion/sample/images/tunnels/5_fri.png" width=100% height=100% alt="Friday"></div>
-				</script>
-				<script type="text/ng-template" id="#Saturday">
-					<div id="Saturday"  align="center"><img src="../../../../../static/fusion/sample/images/tunnels/6_sat.png" width=100% height=100% alt="Saturday"></div>
-				</script>
-				<script type="text/ng-template" id="#Sunday">
-					<div id="Sunday"  align="center"><img src="../../../../../static/fusion/sample/images/tunnels/7_sun.png" width=100% height=100% alt="Sunday"></div>
-				</script>
-			</div>
-		</div>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
index e2aa188a..6268cf6f 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html
@@ -9,7 +9,7 @@
 	<div>
 		<label>*Name: &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
 			<input type="text" ng-model="role.name"
-				maxlength="30" />
+				maxlength="300" />
 		</label>
 	</div>
 	
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/projected_overlay.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/projected_overlay.js
deleted file mode 100644
index 00ce65a1..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/projected_overlay.js
+++ /dev/null
@@ -1,129 +0,0 @@
-// Create an overlay on the map from a projected image...
-// Author. John D. Coryat 01/2008
-// USNaviguide LLC - http://www.usnaviguide.com
-// Thanks go to Mile Williams EInsert: http://econym.googlepages.com/einsert.js, Google's GOverlay Example and Bratliff's suggestion...
-// Opacity code from TPhoto: http://gmaps.tommangan.us/addtphoto.html
-// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-//
-// Parameters: 
-//    imageUrl: URL of the image
-//    bounds: Bounds object of image destination
-//    addZoom: Added Zoom factor as a parameter to the imageUrl (include complete parameter, including separater like '?zoom='
-//
-	
-function ProjectedOverlay(imageUrl, bounds, addZoom)
-{
- this.url_ = imageUrl ;
- this.bounds_ = bounds ;
- this.addZ_ = addZoom ;				// Add the zoom to the image as a parameter
-
- // Is this IE, if so we need to use AlphaImageLoader
-
- this.ie = false ;
- var agent = navigator.userAgent.toLowerCase();
- if ((agent.indexOf("msie") > -1) && (agent.indexOf("opera") < 1))
- {
-  this.ie = true ;
- }
-}
-
-ProjectedOverlay.prototype = new GOverlay();
-
-ProjectedOverlay.prototype.initialize = function(map)
-{
- var div = document.createElement("div") ;
- div.style.position = "absolute" ;
- div.setAttribute('id',this.id) ;
- map.getPane(G_MAP_MAP_PANE).appendChild(div) ;
- this.map_ = map ;
- this.div_ = div ;
- if( this.percentOpacity )
- {
-  this.setOpacity(this.percentOpacity) ;
- }
-}
-
-// Remove the main DIV from the map pane
-
-ProjectedOverlay.prototype.remove = function()
-{
- this.div_.parentNode.removeChild(this.div_);
- delete(this.map) ;
- delete(this.div) ;
-}
-
-// Copy our data to a new ProjectedOverlay...
-
-ProjectedOverlay.prototype.copy = function()
-{
- return new ProjectedOverlay(this.url_, this.bounds_, this.addZ_);
-}
-
-// Redraw based on the current projection and zoom level...
-
-ProjectedOverlay.prototype.redraw = function(force)
-{
- // We only need to redraw if the coordinate system has changed
- if (!force)
- {
-  return ;
- }
-
- var c1 = this.map_.fromLatLngToDivPixel(this.bounds_.getSouthWest());
- var c2 = this.map_.fromLatLngToDivPixel(this.bounds_.getNorthEast());
-
- // Now position our DIV based on the DIV coordinates of our bounds
-
- this.div_.style.width = Math.abs(c2.x - c1.x) + "px";
- this.div_.style.height = Math.abs(c2.y - c1.y) + "px";
- this.div_.style.left = Math.min(c2.x, c1.x) + "px";
- this.div_.style.top = Math.min(c2.y, c1.y) + "px";
- 
- var url = this.url_ ;
- var extn = url.substring(url.length - 4, 4) ;
-
- if ( this.addZ_ )
- {
-  url += this.addZ_ + this.map_.getZoom() ;
- }
-
- if (this.ie && extn.toLowerCase() == '.png')
- {
-  var loader = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + url + "', sizingMethod='scale');" ;
-  this.div_.innerHTML = '<div style="height:' + this.div_.style.height + 'px; width:' + this.div_.style.width + 'px; ' + loader + '" ></div>' ;
- } else
- {
-  this.div_.innerHTML = '<img src="' + url + '"  width=' + this.div_.style.width + ' height=' + this.div_.style.height + ' >' ;
- }
-}
-
-ProjectedOverlay.prototype.setOpacity=function(opacity)
-{
- if (opacity < 0)
- {
-  opacity = 0 ;
- }
- if(opacity > 100)
- {
-  opacity = 100 ;
- }
- var c = opacity/100 ;
- var d = document.getElementById( this.id ) ;
-
- if (typeof(d.style.filter) =='string')
- {
-  d.style.filter = 'alpha(opacity:' + opacity + ')' ;
- }
- if (typeof(d.style.KHTMLOpacity) == 'string' )
- {
-  d.style.KHTMLOpacity = c ;
- }
- if (typeof(d.style.MozOpacity) == 'string')
- {
-  d.style.MozOpacity = c ;
- }
- if (typeof(d.style.opacity) == 'string')
- {
-  d.style.opacity = c ;
- }
-}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/ajax.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/ajax.js
deleted file mode 100644
index a727447d..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/ajax.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Simple AJAX Code-Kit (SACK) v1.6.1 */
-/* �2005 Gregory Wild-Smith */
-/* www.twilightuniverse.com */
-/* Software licenced under a modified X11 licence,
-   see documentation or authors website for more details */
-
-function sack(file) {
-	this.xmlhttp = null;
-	this.resetData = function() {
-		this.method = "POST";
-  		this.queryStringSeparator = "?";
-		this.argumentSeparator = "&";
-		this.URLString = "";
-		this.encodeURIString = true;
-  		this.execute = false;
-  		this.element = null;
-		this.elementObj = null;
-		this.requestFile = file;
-		this.vars = new Object();
-		this.responseStatus = new Array(2);
-  	};
-
-	this.resetFunctions = function() {
-  		this.onLoading = function() { };
-  		this.onLoaded = function() { };
-  		this.onInteractive = function() { };
-  		this.onCompletion = function() { };
-  		this.onError = function() { };
-		this.onFail = function() { };
-	};
-
-	this.reset = function() {
-		this.resetFunctions();
-		this.resetData();
-	};
-
-	this.createAJAX = function() {
-		try {
-			this.xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
-		} catch (e1) {
-			try {
-				this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
-			} catch (e2) {
-				this.xmlhttp = null;
-			}
-		}
-
-		if (! this.xmlhttp) {
-			if (typeof XMLHttpRequest != "undefined") {
-				this.xmlhttp = new XMLHttpRequest();
-			} else {
-				this.failed = true;
-			}
-		}
-	};
-
-	this.setVar = function(name, value){
-		this.vars[name] = Array(value, false);
-	};
-
-	this.encVar = function(name, value, returnvars) {
-		if (true == returnvars) {
-			return Array(encodeURIComponent(name), encodeURIComponent(value));
-		} else {
-			this.vars[encodeURIComponent(name)] = Array(encodeURIComponent(value), true);
-		}
-	}
-
-	this.processURLString = function(string, encode) {
-		encoded = encodeURIComponent(this.argumentSeparator);
-		regexp = new RegExp(this.argumentSeparator + "|" + encoded);
-		varArray = string.split(regexp);
-		for (i = 0; i < varArray.length; i++){
-			urlVars = varArray[i].split("=");
-			if (true == encode){
-				this.encVar(urlVars[0], urlVars[1]);
-			} else {
-				this.setVar(urlVars[0], urlVars[1]);
-			}
-		}
-	}
-
-	this.createURLString = function(urlstring) {
-		if (this.encodeURIString && this.URLString.length) {
-			this.processURLString(this.URLString, true);
-		}
-		if (urlstring) {
-			if (this.URLString.length) {
-				this.URLString += this.argumentSeparator + urlstring;
-			} else {
-				this.URLString = urlstring;
-			}
-		}
-
-		// prevents caching of URLString
-		this.setVar("rndval", new Date().getTime());
-
-		urlstringtemp = new Array();
-		for (key in this.vars) {
-			if (false == this.vars[key][1] && true == this.encodeURIString) {
-				encoded = this.encVar(key, this.vars[key][0], true);
-				delete this.vars[key];
-				this.vars[encoded[0]] = Array(encoded[1], true);
-				key = encoded[0];
-			}
-
-			urlstringtemp[urlstringtemp.length] = key + "=" + this.vars[key][0];
-		}
-		if (urlstring){
-			this.URLString += this.argumentSeparator + urlstringtemp.join(this.argumentSeparator);
-		} else {
-			this.URLString += urlstringtemp.join(this.argumentSeparator);
-		}		
-	}
-
-	this.runResponse = function() {
-		eval(this.response);
-	}
-
-	this.runAJAX = function(urlstring) {
-		if (this.failed) {
-			this.onFail();
-		} else {
-			this.createURLString(urlstring);
-				
-			if (this.element) {
-				this.elementObj = document.getElementById(this.element);
-			}
-			
-			if (this.xmlhttp) {
-				var self = this;
-				if (this.method == "GET") {
-					totalurlstring = this.requestFile + this.queryStringSeparator + this.URLString;
-					this.xmlhttp.open(this.method, totalurlstring, true);
-				} else {
-					this.xmlhttp.open(this.method, this.requestFile, true);
-					try {
-						this.xmlhttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded")
-					} catch (e) { }
-				}
-				//document.myForm.action=urlstring;
-				//document.myForm.submit();
-				this.xmlhttp.onreadystatechange = function() {
-					switch (self.xmlhttp.readyState) {
-						case 1:
-							self.onLoading();
-							break;
-						case 2:
-							self.onLoaded();
-							break;
-						case 3:
-							self.onInteractive();
-							break;
-						case 4:
-							self.response = self.xmlhttp.responseText;
-							self.responseXML = self.xmlhttp.responseXML;
-							self.responseStatus[0] = self.xmlhttp.status;
-							self.responseStatus[1] = self.xmlhttp.statusText;
-
-							if (self.execute) {
-								self.runResponse();
-							}
-
-							if (self.elementObj) {
-								elemNodeName = self.elementObj.nodeName;
-								elemNodeName.toLowerCase();
-								if (elemNodeName == "input"
-								|| elemNodeName == "select"
-								|| elemNodeName == "option"
-								|| elemNodeName == "textarea") {
-									self.elementObj.value = self.response;
-								} else {
-									self.elementObj.innerHTML = self.response;
-								}
-							}
-							if (self.responseStatus[0] == "200") {
-								self.onCompletion();
-							} else {
-								self.onError();
-							}
-
-							self.URLString = "";
-							break;
-					}
-				};
-				this.xmlhttp.send(this.URLString);
-				
-			}
-		}
-	};
-
-	this.reset() ;
-	this.createAJAX();
-}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/context-menu.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/context-menu.js
deleted file mode 100644
index 70fb7096..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/context-menu.js
+++ /dev/null
@@ -1,444 +0,0 @@
-/************************************************************************************************************
-Context menu
-Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-written by Alf Magne Kalleland.
-
-Alf Magne Kalleland, 2006
-Owner of DHTMLgoodies.com
-
-
-************************************************************************************************************/	
-
-DHTMLGoodies_menuModel = function()
-{
-	var menuItems;
-	this.menuItems = new Array();
-	
-	
-}
-
-/************************************************************************************************************
-*	DHTML menu model class
-*
-*	Created:						October, 30th, 2006
-*	@class Purpose of class:		Saves menu item data
-*			
-*
-*	Demos of this class:			demo-menu-strip.html
-*
-* 	Update log:
-*
-************************************************************************************************************/
-
-
-/**
-* @constructor
-* @class Purpose of class:	Organize menu items for different menu widgets. demos of menus: (<a href="../../demos/demo-menu-strip.html" target="_blank">Demo</a>)
-* @version 1.0
-* @author	Alf Magne Kalleland(www.dhtmlgoodies.com)
-*/
-
-
-DHTMLGoodies_menuModel.prototype = {
-	// {{{ addItem()
-    /**
-     *	Add separator (special type of menu item)
-     *
-     *  @param int id of menu item
-     *  @param string itemText = text of menu item
-     *  @param string itemIcon = file name of menu icon(in front of menu text. Path will be imagePath for the DHTMLSuite + file name)
-     *  @param string url = Url of menu item
-     *  @param int parent id of menu item     
-     *  @param String jsFunction Name of javascript function to execute. It will replace the url param. The function with this name will be called and the element triggering the action will be 
-     *					sent as argument. Name of the element which triggered the menu action may also be sent as a second argument. That depends on the widget. The context menu is an example where
-     *					the element triggering the context menu is sent as second argument to this function.    
-     *
-     * @public	
-     */			
-	addItem : function(id,itemText,itemIcon,url,parentId,jsFunction)
-	{
-		this.menuItems[id] = new Array();
-		this.menuItems[id]['id'] = id;
-		this.menuItems[id]['itemText'] = itemText;
-		this.menuItems[id]['itemIcon'] = itemIcon;
-		this.menuItems[id]['url'] = url;
-		this.menuItems[id]['parentId'] = parentId;
-		this.menuItems[id]['separator'] = false;
-		this.menuItems[id]['jsFunction'] = jsFunction;
-		
-	}	
-	,
-	// {{{ addSeparator()
-    /**
-     *	Add separator (special type of menu item)
-     *
-     *  @param int id of menu item
-     *  @param int parent id of menu item
-     * @public	
-     */		
-	addSeparator : function(id,parentId)
-	{
-		this.menuItems[id] = new Array();
-		this.menuItems[id]['parentId'] = parentId;		
-		this.menuItems[id]['separator'] = true;
-	}	
-	,
-	// {{{ init()
-    /**
-     *	Initilizes the menu model. This method should be called when all items has been added to the model.
-     *
-     *
-     * @public	
-     */		
-	init : function()
-	{
-		this.__getDepths();	
-		
-	}
-	// }}}		
-	,
-	// {{{ __getDepths()
-    /**
-     *	Create variable for the depth of each menu item.
-     * 	
-     *
-     * @private	
-     */		
-	getItems : function()
-	{
-		return this.menuItems;
-	}
-		
-	,
-	// {{{ __getDepths()
-    /**
-     *	Create variable for the depth of each menu item.
-     * 	
-     *
-     * @private	
-     */	
-    __getDepths : function()
-    {    	
-    	for(var no in this.menuItems){
-    		this.menuItems[no]['depth'] = 1;
-    		if(this.menuItems[no]['parentId']){
-    			this.menuItems[no]['depth'] = this.menuItems[this.menuItems[no]['parentId']]['depth']+1;
-    		}    		
-    	}    	
-    }	
-    ,
-	// {{{ __hasSubs()
-    /**
-     *	Does a menu item have sub elements ?
-     * 	
-     *
-     * @private	
-     */	
-	// }}}	
-	__hasSubs : function(id)
-	{
-		for(var no in this.menuItems){	// Looping through menu items
-			if(this.menuItems[no]['parentId']==id)return true;		
-		}
-		return false;	
-	}
- 
-
-}
-
-
-
-var referenceToDHTMLSuiteContextMenu;
-
-
-DHTMLGoodies_contextMenu = function()
-{
-	var menuModels;
-	var menuItems;	
-	var menuObject;			// Reference to context menu div
-	var layoutCSS;
-	var menuUls;			// Array of <ul> elements
-	var width;				// Width of context menu
-	var srcElement;			// Reference to the element which triggered the context menu, i.e. the element which caused the context menu to be displayed.
-	var indexCurrentlyDisplayedMenuModel;	// Index of currently displayed menu model.
-	var imagePath;
-
-	this.menuModels = new Array();
-	this.menuObject = false;
-	this.menuUls = new Array();
-	this.width = 100;
-	this.srcElement = false;
-	this.indexCurrentlyDisplayedMenuModel = false;
-	this.imagePath = imgFolder+'tree/';
-	
-}
-
-DHTMLGoodies_contextMenu.prototype = 
-{
-	
-	setWidth : function(newWidth)
-	{
-		this.width = newWidth;
-	}
-	// }}}
-	,	
-	// {{{ setLayoutCss()
-    /**
-     *	Add menu items
-     *
-     *  @param String cssFileName Name of css file 	
-     *
-     * @public	
-     */		
-	setLayoutCss : function(cssFileName)
-	{
-		this.layoutCSS = cssFileName;	
-	}	
-	// }}}	
-	,	
-	// {{{ attachToElement()
-    /**
-     *	Add menu items
-     *
-     *  @param Object HTML Element = Reference to html element
-     *  @param String elementId = String id of element(optional). An alternative to HTML Element	
-     *
-     * @public	
-     */		
-	attachToElement : function(element,elementId,menuModel)
-	{
-		window.refToThisContextMenu = this;
-		if(!element && elementId)element = document.getElementById(elementId);
-		if(!element.id){
-			element.id = 'context_menu' + Math.random();
-			element.id = element.id.replace('.','');
-		}
-		this.menuModels[element.id] = menuModel;
-		element.oncontextmenu = this.__displayContextMenu;
-		//element.onmousedown = function() { window.refToThisContextMenu.__setReference(window.refToThisContextMenu); };
-		document.documentElement.onclick = this.__hideContextMenu;
-		
-	}	
-	// }}}
-	,
-	// {{{ __setReference()
-    /**
-     *	Creates a reference to current context menu object. (Note: This method should be deprecated as only one context menu object is needed)
-     *
-     *  @param Object context menu object = Reference to context menu object
-     *
-     * @private	
-     */		
-	__setReference : function(obj)
-	{	
-		referenceToDHTMLSuiteContextMenu = obj;	
-	}
-	,
-	// {{{ __displayContextMenu()
-    /**
-     *	Displays the context menu
-     *
-     *  @param Event e
-     *
-     * @private	
-     */		
-	__displayContextMenu : function(e)
-	{
-		if(document.all)e = event;		
-		var ref = referenceToDHTMLSuiteContextMenu;
-		ref.srcElement = ref.getSrcElement(e);
-			
-		if(!ref.indexCurrentlyDisplayedMenuModel || ref.indexCurrentlyDisplayedMenuModel!=this.id){		
-			if(ref.indexCurrentlyDisplayedMenuModel){
-				ref.menuObject.innerHTML = '';				
-			}else{
-				ref.__createDivs();
-			}
-			ref.menuItems = ref.menuModels[this.id].getItems();
-			ref.__createMenuItems();	
-		}
-		ref.indexCurrentlyDisplayedMenuModel=this.id;
-		
-		ref.menuObject.style.left = (e.clientX + Math.max(document.body.scrollLeft,document.documentElement.scrollLeft)) + 'px';
-		ref.menuObject.style.top = (e.clientY + Math.max(document.body.scrollTop,document.documentElement.scrollTop)) + 'px';
-		ref.menuObject.style.display='block';
-		return false;
-			
-	}
-	// }}}
-	,
-	// {{{ __displayContextMenu()
-    /**
-     *	Add menu items
-     *
-     *  @param Event e
-     *
-     * @private	
-     */		
-	__hideContextMenu : function()
-	{
-		var ref = referenceToDHTMLSuiteContextMenu;
-		if(ref.menuObject)ref.menuObject.style.display = 'none';
-		
-		
-	}
-	// }}}
-	,
-	// {{{ __createDivs()
-    /**
-     *	Creates general divs for the menu
-     *
-     *
-     * @private	
-     */		
-	__createDivs : function()
-	{
-		this.menuObject = document.createElement('DIV');
-		this.menuObject.className = 'DHTMLSuite_contextMenu';
-		this.menuObject.style.backgroundImage = 'url(\'' + this.imagePath + 'context-menu-gradient.gif' + '\')';
-		this.menuObject.style.backgroundRepeat = 'repeat-y';
-		if(this.width)this.menuObject.style.width = this.width + 'px';
-		document.body.appendChild(this.menuObject);
-	}
-	// }}}
-	,
-	
-	// {{{ __mouseOver()
-    /**
-     *	Display mouse over effect when moving the mouse over a menu item
-     *
-     *
-     * @private	
-     */		
-	__mouseOver : function()
-	{
-		this.className = 'DHTMLSuite_item_mouseover';	
-		if(!document.all){
-			this.style.backgroundPosition = 'left center';
-		}
-									
-	}
-	// }}}
-	,
-	// {{{ __mouseOut()
-    /**
-     *	Remove mouse over effect when moving the mouse away from a menu item
-     *
-     *
-     * @private	
-     */		
-	__mouseOut : function()
-	{
-		this.className = '';
-		if(!document.all){
-			this.style.backgroundPosition = '1px center';
-		}		
-	}
-	// }}}
-	,
-	// {{{ __createMenuItems()
-    /**
-     *	Create menu items
-     *
-     *
-     * @private	
-     */		
-	__evalUrl : function()
-	{
-		var js = this.getAttribute('jsFunction');
-		if(!js)js = this.jsFunction;
-		if(js)eval(js);
-		
-	}
-	// }}}
-	,
-	// {{{ __createMenuItems()
-    /**
-     *	Create menu items
-     *
-     *
-     * @private	
-     */		
-	__createMenuItems : function()
-	{
-		window.refToContextMenu = this;	// Reference to menu strip object
-		this.menuUls = new Array();
-		for(var no in this.menuItems){	// Looping through menu items		
-			if(!this.menuUls[0]){	// Create main ul element
-				this.menuUls[0] = document.createElement('UL');
-				this.menuObject.appendChild(this.menuUls[0]);
-			}
-			
-			if(this.menuItems[no]['depth']==1){
-
-				if(this.menuItems[no]['separator']){
-					var li = document.createElement('DIV');
-					li.className = 'DHTMLSuite_contextMenu_separator';
-				}else{				
-					var li = document.createElement('LI');
-					if(this.menuItems[no]['jsFunction']){
-						this.menuItems[no]['url'] = this.menuItems[no]['jsFunction'] + '(this,referenceToDHTMLSuiteContextMenu.srcElement)';
-					}
-					if(this.menuItems[no]['itemIcon']){
-						li.style.backgroundImage = 'url(\'' + this.menuItems[no]['itemIcon'] + '\')';
-						if(!document.all)li.style.backgroundPosition = '1px center';
-
-					}
-					
-					if(this.menuItems[no]['url']){
-						var url = this.menuItems[no]['url'] + '';
-						var tmpUrl = url + '';
-						li.setAttribute('jsFunction',url);
-						li.jsFunction = url;
-						li.onclick = this.__evalUrl;
-
-					}
-					
-					li.innerHTML = '<a href="#" onclick="return false">' + this.menuItems[no]['itemText'] + '</a>';
-					li.onmouseover = this.__mouseOver;
-					li.onmouseout = this.__mouseOut;
-				}				
-				this.menuUls[0].appendChild(li);			
-			}		
-		}		
-	}
-
-	,
-	
-	// {{{ getSrcElement()
-    /**
-     *
-     *  Returns a reference to the element which triggered an event.
-     *	@param Event e = Event object
-     *
-     * 
-     * @private
-     */	       
-    getSrcElement : function(e)
-    {
-    	var el;
-		// Dropped on which element
-		if (e.target) el = e.target;
-			else if (e.srcElement) el = e.srcElement;
-			if (el.nodeType == 3) // defeat Safari bug
-				el = el.parentNode;
-		return el;	
-    }
-    	
-}
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/drag-drop-folder-tree.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/drag-drop-folder-tree.js
deleted file mode 100644
index 165306f2..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/raptor/js/tree/drag-drop-folder-tree.js
+++ /dev/null
@@ -1,1059 +0,0 @@
- /************************************************************************************************************
-Drag and drop folder tree
-Copyright (C) 2006  DTHMLGoodies.com, Alf Magne Kalleland
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Dhtmlgoodies.com., hereby disclaims all copyright interest in this script
-written by Alf Magne Kalleland.
-
-Alf Magne Kalleland, 2006
-Owner of DHTMLgoodies.com
-
-
-************************************************************************************************************/	
-		
-	var JSTreeObj;
-	var treeUlCounter = 0;
-	var nodeId = 1;
-		
-	/* Constructor */
-	function JSDragDropTree()
-	{
-		var idOfTree;
-		var imageFolder;
-		var folderImage;
-		var plusImage;
-		var minusImage;
-		var maximumDepth;
-		var dragNode_source;
-		var dragNode_parent;
-		var dragNode_sourceNextSib;
-		var dragNode_noSiblings;
-		var ajaxObjects;
-		
-		var dragNode_destination;
-		var floatingContainer;
-		var dragDropTimer;
-		var dropTargetIndicator;
-		var insertAsSub;
-		var indicator_offsetX;
-		var indicator_offsetX_sub;
-		var indicator_offsetY;
-		
-		this.imageFolder = imgFolder+'tree/';
-		this.folderImage = 'dhtmlgoodies_folder.gif';
-		this.plusImage = 'dhtmlgoodies_plus.gif';
-		this.minusImage = 'dhtmlgoodies_minus.gif';
-		this.maximumDepth = 6;
-		var messageMaximumDepthReached;
-		var messageNoRightsOnFolder;
-		var filePathRenameItem;
-		var filePathDeleteItem;
-		var additionalRenameRequestParameters = {};
-		var additionalDeleteRequestParameters = {};
-
-		var renameAllowed;
-		var deleteAllowed;
-		var addAllowed;
-		var currentlyActiveItem;
-		var contextMenu;
-		var currentItemToEdit;		// Reference to item currently being edited(example: renamed)
-		var selectedItem;		// ADDED BY FARHAN
-		var helpObj;
-		
-		this.contextMenu = false;
-		this.floatingContainer = document.createElement('UL');
-		this.floatingContainer.style.position = 'absolute';
-		this.floatingContainer.style.display='none';
-		this.floatingContainer.id = 'floatingContainer';
-		this.insertAsSub = false;
-		document.body.appendChild(this.floatingContainer);
-		this.dragDropTimer = -1;
-		this.dragNode_noSiblings = false;
-		this.currentItemToEdit = false;
-		
-		if(document.all){
-			this.indicator_offsetX = 2;	// Offset position of small black lines indicating where nodes would be dropped.
-			this.indicator_offsetX_sub = 4;
-			this.indicator_offsetY = 2;
-		}else{
-			this.indicator_offsetX = 1;	// Offset position of small black lines indicating where nodes would be dropped.
-			this.indicator_offsetX_sub = 3;
-			this.indicator_offsetY = 2;			
-		}
-		if(navigator.userAgent.indexOf('Opera')>=0){
-			this.indicator_offsetX = 2;	// Offset position of small black lines indicating where nodes would be dropped.
-			this.indicator_offsetX_sub = 3;
-			this.indicator_offsetY = -7;				
-		}
-
-		this.messageMaximumDepthReached = ''; // Use '' if you don't want to display a message 
-		this.messageNoRightsOnFolder = 'You do not have access to this folder';
-		
-		this.renameAllowed = true;
-		this.deleteAllowed = true;
-		this.addAllowed = true;
-		this.currentlyActiveItem = false;
-		this.filePathRenameItem = 'folderTree_updateItem.php';
-		this.filePathDeleteItem = 'tree';
-		this.ajaxObjects = new Array();
-		this.helpObj = false;
-		
-		this.RENAME_STATE_BEGIN = 1;
-		this.RENAME_STATE_CANCELED = 2;
-		this.RENAME_STATE_REQUEST_SENDED = 3;
-		this.renameState = null;
-	}
-	
-	
-	/* JSDragDropTree class */
-	JSDragDropTree.prototype = {
-		// {{{ addEvent()
-	    /**
-	     *
-	     *  This function adds an event listener to an element on the page.
-	     *
-	     *	@param Object whichObject = Reference to HTML element(Which object to assigne the event)
-	     *	@param String eventType = Which type of event, example "mousemove" or "mouseup"
-	     *	@param functionName = Name of function to execute. 
-	     * 
-	     * @public
-	     */	
-		addEvent : function(whichObject,eventType,functionName)
-		{ 
-		  if(whichObject.attachEvent){ 
-		    whichObject['e'+eventType+functionName] = functionName; 
-		    whichObject[eventType+functionName] = function(){whichObject['e'+eventType+functionName]( window.event );} 
-		    whichObject.attachEvent( 'on'+eventType, whichObject[eventType+functionName] ); 
-		  } else 
-		    whichObject.addEventListener(eventType,functionName,false); 	    
-		} 
-		// }}}	
-		,	
-		// {{{ removeEvent()
-	    /**
-	     *
-	     *  This function removes an event listener from an element on the page.
-	     *
-	     *	@param Object whichObject = Reference to HTML element(Which object to assigne the event)
-	     *	@param String eventType = Which type of event, example "mousemove" or "mouseup"
-	     *	@param functionName = Name of function to execute. 
-	     * 
-	     * @public
-	     */		
-		removeEvent : function(whichObject,eventType,functionName)
-		{ 
-		  if(whichObject.detachEvent){ 
-		    whichObject.detachEvent('on'+eventType, whichObject[eventType+functionName]); 
-		    whichObject[eventType+functionName] = null; 
-		  } else 
-		    whichObject.removeEventListener(eventType,functionName,false); 
-		} 
-		,	
-		Get_Cookie : function(name) { 
-		   var start = document.cookie.indexOf(name+"="); 
-		   var len = start+name.length+1; 
-		   if ((!start) && (name != document.cookie.substring(0,name.length))) return null; 
-		   if (start == -1) return null; 
-		   var end = document.cookie.indexOf(";",len); 
-		   if (end == -1) end = document.cookie.length; 
-		   return unescape(document.cookie.substring(len,end)); 
-		} 
-		,
-		// This function has been slightly modified
-		Set_Cookie : function(name,value,expires,path,domain,secure) { 
-			expires = expires * 60*60*24*1000;
-			var today = new Date();
-			var expires_date = new Date( today.getTime() + (expires) );
-		    var cookieString = name + "=" +escape(value) + 
-		       ( (expires) ? ";expires=" + expires_date.toGMTString() : "") + 
-		       ( (path) ? ";path=" + path : "") + 
-		       ( (domain) ? ";domain=" + domain : "") + 
-		       ( (secure) ? ";secure" : ""); 
-		    document.cookie = cookieString; 
-		} 
-		,
-		setFileNameRename : function(newFileName)
-		{
-			this.filePathRenameItem = newFileName;
-		}
-		,
-		setFileNameDelete : function(newFileName)
-		{
-			this.filePathDeleteItem = newFileName;
-		}
-		,
-		setAdditionalRenameRequestParameters : function(requestParameters)
-		{
-			this.additionalRenameRequestParameters = requestParameters;
-		}
-		,
-		setAdditionalDeleteRequestParameters : function(requestParameters)
-		{
-			this.additionalDeleteRequestParameters = requestParameters;
-		}
-		,setRenameAllowed : function(renameAllowed)
-		{
-			this.renameAllowed = renameAllowed;			
-		}
-		,
-		setDeleteAllowed : function(deleteAllowed)
-		{
-			this.deleteAllowed = deleteAllowed;	
-		}
-		,
-		setAddAllowed : function(addAllowed)
-		{
-			this.addAllowed = addAllowed;	
-		}
-		,setMaximumDepth : function(maxDepth)
-		{
-			this.maximumDepth = maxDepth;	
-		}
-		,setMessageMaximumDepthReached : function(newMessage)
-		{
-			this.messageMaximumDepthReached = newMessage;
-		}
-		,	
-		setImageFolder : function(path)
-		{
-			this.imageFolder = path;	
-		}
-		,
-		setFolderImage : function(imagePath)
-		{
-			this.folderImage = imagePath;			
-		}
-		,
-		setPlusImage : function(imagePath)
-		{
-			this.plusImage = imagePath;				
-		}
-		,
-		setMinusImage : function(imagePath)
-		{
-			this.minusImage = imagePath;			
-		}
-		,		
-		setTreeId : function(idOfTree)
-		{
-			this.idOfTree = idOfTree;			
-		}	
-		,
-		expandAll : function()
-		{
-			var menuItems = document.getElementById(this.idOfTree).getElementsByTagName('LI');
-			for(var no=0;no<menuItems.length;no++){
-				var subItems = menuItems[no].getElementsByTagName('UL');
-				if(subItems.length>0 && subItems[0].style.display!='block'){
-					JSTreeObj.showHideNode(false,menuItems[no].id);
-				}			
-			}
-		}	
-		,
-		collapseAll : function()
-		{
-			var menuItems = document.getElementById(this.idOfTree).getElementsByTagName('LI');
-			for(var no=0;no<menuItems.length;no++){
-				var subItems = menuItems[no].getElementsByTagName('UL');
-				if(subItems.length>0 && subItems[0].style.display=='block'){
-					JSTreeObj.showHideNode(false,menuItems[no].id);
-				}			
-			}	
-			JSTreeObj.showHideNode(false,menuItems[0].id);				
-		}	
-		,
-		/*
-		Find top pos of a tree node
-		*/
-		getTopPos : function(obj){
-			var top = obj.offsetTop/1;
-			while((obj = obj.offsetParent) != null){
-				if(obj.tagName!='HTML')top += obj.offsetTop;
-			}			
-			if(document.all)top = top/1 + 13; else top = top/1 + 4;		
-			return top;
-		}
-		,	
-		/*
-		Find left pos of a tree node
-		*/
-		getLeftPos : function(obj){
-			var left = obj.offsetLeft/1 + 1;
-			while((obj = obj.offsetParent) != null){
-				if(obj.tagName!='HTML')left += obj.offsetLeft;
-			}
-	  			
-			if(document.all)left = left/1 - 2;
-			return left;
-		}	
-			
-		,
-		showHideNode : function(e,inputId)
-		{
-			if(inputId){
-				if(!document.getElementById(inputId))return;
-				thisNode = document.getElementById(inputId).getElementsByTagName('IMG')[0]; 
-			}else {
-				thisNode = this;
-				if(this.tagName=='A')thisNode = this.parentNode.getElementsByTagName('IMG')[0];	
-				
-			}
-			if(thisNode.style.visibility=='hidden')return;		
-			var parentNode = thisNode.parentNode;
-			inputId = parentNode.id.replace(/[^0-9]/g,'');
-			if(thisNode.src.indexOf(JSTreeObj.plusImage)>=0){
-				thisNode.src = thisNode.src.replace(JSTreeObj.plusImage,JSTreeObj.minusImage);
-				var ul = parentNode.getElementsByTagName('UL')[0];
-				ul.style.display='block';
-				if(!initExpandedNodes)initExpandedNodes = ',';
-				if(initExpandedNodes.indexOf(',' + inputId + ',')<0) initExpandedNodes = initExpandedNodes + inputId + ',';
-			}else{
-				thisNode.src = thisNode.src.replace(JSTreeObj.minusImage,JSTreeObj.plusImage);
-				parentNode.getElementsByTagName('UL')[0].style.display='none';
-				initExpandedNodes = initExpandedNodes.replace(',' + inputId,'');
-			}	
-			JSTreeObj.Set_Cookie('dhtmlgoodies_expandedNodes',initExpandedNodes,500);			
-			return false;						
-		}
-		,
-		/*expand only the selected node*/
-		showSelectedNode : function(selectedItemId)
-		{
-			var menuItems = document.getElementById(this.idOfTree).getElementsByTagName('LI');	// Get an array of all menu items
-			
-			var selectedNode ;
-			for(var no=0;no<menuItems.length;no++){
-				if (selectedItemId != null && selectedItemId == menuItems[no].id.replace(/[^0-9]/gi,'')){
-					selectedNode = menuItems[no];
-					break;
-				}
-			}
-			do{
-				if (selectedNode != null){
-					var subItems = selectedNode.getElementsByTagName('UL');
-					if(subItems && subItems.length>0 && subItems[0].style.display!='block'){
-						JSTreeObj.showHideNode(false,selectedNode.id);
-					}
-					selectedNode = selectedNode.parentNode;
-				}
-			}while (selectedNode && selectedNode.id.replace(/[^0-9]/gi,'') != '0');
-			return false;						
-		}
-		,
-		isDeleteAllowed : function(selectedItemId)
-		{
-			var menuItems = document.getElementById(this.idOfTree).getElementsByTagName('LI');	// Get an array of all menu items
-			
-			var selectedNode ;
-			for(var no=0;no<menuItems.length;no++){
-				if (selectedItemId != null && selectedItemId == menuItems[no].id.replace(/[^0-9]/gi,'')){
-					selectedNode = menuItems[no];
-					break;
-				}
-			}
-			if (selectedNode && selectedNode.getAttribute('noDelete') && selectedNode.getAttribute('noDelete') == 'true')
-				return false;
-			else
-				return true;
-			
-		}
-		,
-		isAddAllowed : function(selectedItemId)
-		{
-			var menuItems = document.getElementById(this.idOfTree).getElementsByTagName('LI');	// Get an array of all menu items
-			
-			var selectedNode ;
-			for(var no=0;no<menuItems.length;no++){
-				if (selectedItemId != null && selectedItemId == menuItems[no].id.replace(/[^0-9]/gi,'')){
-					selectedNode = menuItems[no];
-					break;
-				}
-			}
-			if (selectedNode && selectedNode.getAttribute('noChild') && selectedNode.getAttribute('noChild') == 'true')
-				return false;
-			else
-				return true;
-			
-		}
-		,
-		/* Initialize drag */
-		initDrag : function(e)
-		{
-			if(document.all)e = event;	
-			
-			var subs = JSTreeObj.floatingContainer.getElementsByTagName('LI');
-			if(subs.length>0){
-				if(JSTreeObj.dragNode_sourceNextSib){
-					JSTreeObj.dragNode_parent.insertBefore(JSTreeObj.dragNode_source,JSTreeObj.dragNode_sourceNextSib);
-				}else{
-					JSTreeObj.dragNode_parent.appendChild(JSTreeObj.dragNode_source);
-				}					
-			}
-			
-			JSTreeObj.dragNode_source = this.parentNode;
-			JSTreeObj.dragNode_parent = this.parentNode.parentNode;
-			JSTreeObj.dragNode_sourceNextSib = false;
-
-			
-			if(JSTreeObj.dragNode_source.nextSibling)JSTreeObj.dragNode_sourceNextSib = JSTreeObj.dragNode_source.nextSibling;
-			JSTreeObj.dragNode_destination = false;
-			JSTreeObj.dragDropTimer = 0;
-			JSTreeObj.timerDrag();
-			return false;
-		}
-		,
-		timerDrag : function()
-		{	
-			if(this.dragDropTimer>=0 && this.dragDropTimer<10){
-				this.dragDropTimer = this.dragDropTimer + 1;
-				setTimeout('JSTreeObj.timerDrag()',20);
-				return;
-			}
-			if(this.dragDropTimer==10)
-			{
-				JSTreeObj.floatingContainer.style.display='block';
-				JSTreeObj.floatingContainer.appendChild(JSTreeObj.dragNode_source);	
-			}
-		}
-		,
-		moveDragableNodes : function(e)
-		{
-			if(JSTreeObj.dragDropTimer<10)return;
-			if(document.all)e = event;
-			dragDrop_x = e.clientX/1 + 5 + document.body.scrollLeft;
-			dragDrop_y = e.clientY/1 + 5 + document.documentElement.scrollTop;	
-					
-			JSTreeObj.floatingContainer.style.left = dragDrop_x + 'px';
-			JSTreeObj.floatingContainer.style.top = dragDrop_y + 'px';
-			
-			var thisObj = this;
-			if(thisObj.tagName=='A' || thisObj.tagName=='IMG')thisObj = thisObj.parentNode;
-
-			JSTreeObj.dragNode_noSiblings = false;
-			var tmpVar = thisObj.getAttribute('noSiblings');
-			if(!tmpVar)tmpVar = thisObj.noSiblings;
-			if(tmpVar=='true')JSTreeObj.dragNode_noSiblings=true;
-					
-			if(thisObj && thisObj.id)
-			{
-				JSTreeObj.dragNode_destination = thisObj;
-				var img = thisObj.getElementsByTagName('IMG')[1];
-				var tmpObj= JSTreeObj.dropTargetIndicator;
-				tmpObj.style.display='block';
-				
-				var eventSourceObj = this;
-				if(JSTreeObj.dragNode_noSiblings && eventSourceObj.tagName=='IMG')eventSourceObj = eventSourceObj.nextSibling;
-				
-				var tmpImg = tmpObj.getElementsByTagName('IMG')[0];
-				if(this.tagName=='A' || JSTreeObj.dragNode_noSiblings){
-					tmpImg.src = tmpImg.src.replace('ind1','ind2');	
-					JSTreeObj.insertAsSub = true;
-					tmpObj.style.left = (JSTreeObj.getLeftPos(eventSourceObj) + JSTreeObj.indicator_offsetX_sub) + 'px';
-				}else{
-					tmpImg.src = tmpImg.src.replace('ind2','ind1');
-					JSTreeObj.insertAsSub = false;
-					tmpObj.style.left = (JSTreeObj.getLeftPos(eventSourceObj) + JSTreeObj.indicator_offsetX) + 'px';
-				}
-				
-				tmpObj.style.top = (JSTreeObj.getTopPos(thisObj) + JSTreeObj.indicator_offsetY) - document.getElementById("scrollableTable").scrollTop + 'px'  ;
-				
-				
-			}
-			var divHeight = document.getElementById("scrollableTable").style.height;
-			divHeight = divHeight.substring(0, divHeight.indexOf("px"));
-			if (dragDrop_y - JSTreeObj.getTopPos(document.getElementById("scrollableTable"))< 50)
-				document.getElementById("scrollableTable").scrollTop = document.getElementById("scrollableTable").scrollTop - 5;
-			else if (dragDrop_y - JSTreeObj.getTopPos(document.getElementById("scrollableTable")) > divHeight - 50)
-				document.getElementById("scrollableTable").scrollTop = document.getElementById("scrollableTable").scrollTop + 5;
-			
-			return false;
-			
-		}
-		,
-		dropDragableNodes:function()
-		{
-			if(JSTreeObj.dragDropTimer<10){				
-				JSTreeObj.dragDropTimer = -1;
-				return;
-			}
-			var showMessage = false;
-			var message = '';
-			if(JSTreeObj.dragNode_destination){	// Check depth
-				var countUp = JSTreeObj.dragDropCountLevels(JSTreeObj.dragNode_destination,'up');
-				var countDown = JSTreeObj.dragDropCountLevels(JSTreeObj.dragNode_source,'down');
-				var countLevels = countUp/1 + countDown/1 + (JSTreeObj.insertAsSub?1:0);		
-				
-				if(countLevels>JSTreeObj.maximumDepth){
-					JSTreeObj.dragNode_destination = false;
-					showMessage = true; 	// Used later down in this function
-					message = JSTreeObj.messageMaximumDepthReachedl
-				}
-			}
-			if (JSTreeObj.dragNode_destination && JSTreeObj.dragNode_destination.getAttribute('noDrop') == 'true'){
-				JSTreeObj.dragNode_destination = false;
-				showMessage = true; 	// Used later down in this function
-				message = JSTreeObj.messageNoRightsOnFolder;
-			}
-			
-			
-			if(JSTreeObj.dragNode_destination){			
-						
-				if(JSTreeObj.insertAsSub){
-					var uls = JSTreeObj.dragNode_destination.getElementsByTagName('UL');
-					if(uls.length>0){
-						ul = uls[0];
-						ul.style.display='block';
-						
-						var lis = ul.getElementsByTagName('LI');
-
-						if(lis.length>0){	// Sub elements exists - drop dragable node before the first one
-							ul.insertBefore(JSTreeObj.dragNode_source,lis[0]);	
-						}else {	// No sub exists - use the appendChild method - This line should not be executed unless there's something wrong in the HTML, i.e empty <ul>
-							ul.appendChild(JSTreeObj.dragNode_source);	
-						}
-					}else{
-						var ul = document.createElement('UL');
-						ul.style.display='block';
-						JSTreeObj.dragNode_destination.appendChild(ul);
-						ul.appendChild(JSTreeObj.dragNode_source);
-					}
-					var img = JSTreeObj.dragNode_destination.getElementsByTagName('IMG')[0];					
-					img.style.visibility='visible';
-					img.src = img.src.replace(JSTreeObj.plusImage,JSTreeObj.minusImage);					
-					
-					
-				}else{
-					if(JSTreeObj.dragNode_destination.nextSibling){
-						var nextSib = JSTreeObj.dragNode_destination.nextSibling;
-						nextSib.parentNode.insertBefore(JSTreeObj.dragNode_source,nextSib);
-					}else{
-						JSTreeObj.dragNode_destination.parentNode.appendChild(JSTreeObj.dragNode_source);
-					}
-				}	
-				/* Clear parent object */
-				var tmpObj = JSTreeObj.dragNode_parent;
-				var lis = tmpObj.getElementsByTagName('LI');
-				if(lis.length==0){
-					var img = tmpObj.parentNode.getElementsByTagName('IMG')[0];
-					img.style.visibility='hidden';	// Hide [+],[-] icon
-					tmpObj.parentNode.removeChild(tmpObj);						
-				}
-				
-			}else{
-				// Putting the item back to it's original location
-				
-				if(JSTreeObj.dragNode_sourceNextSib){
-					JSTreeObj.dragNode_parent.insertBefore(JSTreeObj.dragNode_source,JSTreeObj.dragNode_sourceNextSib);
-				}else{
-					JSTreeObj.dragNode_parent.appendChild(JSTreeObj.dragNode_source);
-				}			
-					
-			}
-			JSTreeObj.dropTargetIndicator.style.display='none';		
-			JSTreeObj.dragDropTimer = -1;	
-			if(showMessage && message){ alert(message); return;}
-			//save tree structure
-			saveMyTree_byForm();
-		}
-		,
-		createDropIndicator : function()
-		{
-			this.dropTargetIndicator = document.createElement('DIV');
-			this.dropTargetIndicator.style.position = 'absolute';
-			this.dropTargetIndicator.style.display='none';			
-			var img = document.createElement('IMG');
-			img.src = this.imageFolder + 'dragDrop_ind1.gif';
-			img.id = 'dragDropIndicatorImage';
-			this.dropTargetIndicator.appendChild(img);
-			document.body.appendChild(this.dropTargetIndicator);
-			
-		}
-		,
-		dragDropCountLevels : function(obj,direction,stopAtObject){
-			var countLevels = 0;
-			if(direction=='up'){
-				while(obj.parentNode && obj.parentNode!=stopAtObject){
-					obj = obj.parentNode;
-					if(obj.tagName=='UL')countLevels = countLevels/1 +1;
-				}		
-				return countLevels;
-			}	
-			
-			if(direction=='down'){ 
-				var subObjects = obj.getElementsByTagName('LI');
-				for(var no=0;no<subObjects.length;no++){
-					countLevels = Math.max(countLevels,JSTreeObj.dragDropCountLevels(subObjects[no],"up",obj));
-				}
-				return countLevels;
-			
-			}	
-		}		
-		,
-		cancelEvent : function()
-		{
-			return false;	
-		}
-		,
-		cancelSelectionEvent : function()
-		{
-			
-			if(JSTreeObj.dragDropTimer<10)return true;
-			return false;	
-		}
-		,getNodeOrders : function(initObj,saveString)
-		{
-			
-			if(!saveString)var saveString = '';
-			if(!initObj){
-				initObj = document.getElementById(this.idOfTree);
-
-			}
-			var lis = initObj.getElementsByTagName('LI');
-
-			if(lis.length>0){
-				var li = lis[0];
-				while(li){
-					if(li.id){
-						if(saveString.length>0)saveString = saveString + ',';
-						var numericID = li.id.replace(/[^0-9]/gi,'');
-						if(numericID.length==0)numericID='A';
-						var numericParentID = li.parentNode.parentNode.id.replace(/[^0-9]/gi,'');
-						if(numericID!='0'){
-							saveString = saveString + numericID;
-							saveString = saveString + '-';
-							
-							
-							if(li.parentNode.id!=this.idOfTree)saveString = saveString + numericParentID; else saveString = saveString + '0';
-						}
-						var ul = li.getElementsByTagName('UL');
-						if(ul.length>0){
-							saveString = this.getNodeOrders(ul[0],saveString);	
-						}	
-					}			
-					li = li.nextSibling;
-				}
-			}
-
-			if(initObj.id == this.idOfTree){
-				return saveString;
-							
-			}
-			return saveString;
-		}
-		,highlightItem : function(inputObj,e)
-		{
-			if(JSTreeObj.currentlyActiveItem)JSTreeObj.currentlyActiveItem.className = '';
-			this.className = 'highlightedNodeItem';
-			JSTreeObj.currentlyActiveItem = this;			
-		}
-		,clickItem : function(inputObj,e)
-		{
-			if(JSTreeObj.currentlyActiveItem) JSTreeObj.currentlyActiveItem.className = '';
-			this.className = 'highlightedNodeItem';
-			JSTreeObj.currentlyActiveItem = this;
-			JSTreeObj.selectedItem = this;			
-		},
-		removeHighlight : function()
-		{
-			//if(JSTreeObj.currentlyActiveItem)JSTreeObj.currentlyActiveItem.className = '';
-			//JSTreeObj.currentlyActiveItem = false;
-		}
-		,
-		hasSubNodes : function(obj)
-		{
-			var subs = obj.getElementsByTagName('LI');
-			if(subs.length>0)return true;
-			return false;	
-		}
-		,
-		deleteItem : function(obj1,obj2)
-		{
-			var message = 'Click OK to delete item ' + obj2.innerHTML;
-			if(this.hasSubNodes(obj2.parentNode)) message = message + ' and it\'s sub nodes';
-			if(confirm(message)){
-				this.__deleteItem_step2(obj2.parentNode);	// Sending <LI> tag to the __deleteItem_step2 method	
-				//deleteItem();
-			}else{
-				return false;
-			}
-			
-			
-		}
-		,
-		addItem : function(obj1,obj2)
-		{
-			var message = 'Click OK to Add item ' + obj2.innerHTML;
-			return this.__addItem_step2(obj2.parentNode);	// Sending <LI> tag to the __addItem_step2 method	
-		}
-		,
-		createMenuReport : function(obj1,obj2)
-		{
-			JSTreeObj.selectedItem = obj2;
-			createReport();
-		}
-		,		
-		runMenuReport : function(obj1,obj2)
-		{
-			JSTreeObj.selectedItem = obj2;
-			runReport();
-			
-		}
-		,
-		editMenuReport : function(obj1,obj2)
-		{
-			JSTreeObj.selectedItem = obj2;
-			editReport();
-		}
-		,
-		deleteMenuReport : function(obj1,obj2)
-		{
-			JSTreeObj.selectedItem = obj2;
-			if (confirm("Do you want to delete this report?")){
-				deleteReport();
-			}
-			
-		}
-		,
-		__refreshDisplay : function(obj)
-		{
-			if(this.hasSubNodes(obj))return;
-
-			var img = obj.getElementsByTagName('IMG')[0];
-			img.style.visibility = 'hidden';	
-		}
-		,
-		__deleteItem_step2 : function(obj)
-		{
-
-			var saveString = obj.id.replace(/[^0-9]/gi,'');
-			
-			var lis = obj.getElementsByTagName('LI');
-			for(var no=0;no<lis.length;no++){
-				saveString = saveString + ',' + lis[no].id.replace(/[^0-9]/gi,'');
-			}
-			
-			// Creating ajax object and send items
-			var ajaxIndex = JSTreeObj.ajaxObjects.length;
-			JSTreeObj.ajaxObjects[ajaxIndex] = new sack();
-			JSTreeObj.ajaxObjects[ajaxIndex].method = "GET";
-			JSTreeObj.ajaxObjects[ajaxIndex].setVar("deleteIds", saveString);
-			document.all.deleteIds.value=saveString;
-			JSTreeObj.__addAdditionalRequestParameters(JSTreeObj.ajaxObjects[ajaxIndex], JSTreeObj.additionalDeleteRequestParameters);
-			JSTreeObj.ajaxObjects[ajaxIndex].requestFile = JSTreeObj.filePathDeleteItem;	// Specifying which file to get
-			JSTreeObj.ajaxObjects[ajaxIndex].onCompletion = function() { JSTreeObj.__deleteComplete(ajaxIndex,obj); } ;	// Specify function that will be executed after file has been found
-			//JSTreeObj.ajaxObjects[ajaxIndex].runAJAX();		// Execute AJAX function				
-			deleteMyTree_byForm();
-			
-			
-		}
-		,
-		__addItem_step2 : function(obj)
-		{
-			var parentId = obj.id.replace(/[^0-9]/gi,'');
-			document.all.newName.value="";
-			document.all.saveString.value=parentId;
-			if (selectedFolderId)
-				selectedFolderId = parentId;
-			
-			addMyTree_byForm();
-			
-		}
-		,
-		__deleteComplete : function(ajaxIndex,obj)
-		{
-			if(this.ajaxObjects[ajaxIndex].response!='OK'){
-				alert('ERROR WHEN TRYING TO DELETE NODE: ' + this.ajaxObjects[ajaxIndex].response); 	// Rename failed
-			}else{
-				var parentRef = obj.parentNode.parentNode;
-				obj.parentNode.removeChild(obj);
-				this.__refreshDisplay(parentRef);
-				
-			}			
-			
-		}
-		,
-		__renameComplete : function(ajaxIndex)
-		{
-			if(this.ajaxObjects[ajaxIndex].response!='OK'){
-				alert('ERROR WHEN TRYING TO RENAME NODE: ' + this.ajaxObjects[ajaxIndex].response); 	// Rename failed
-			}
-		}
-		,
-		__saveTextBoxChanges : function(e,inputObj)
-		{
-			if(!inputObj && this)inputObj = this;
-			if(document.all)e = event;
-			if(e.keyCode && e.keyCode==27){
-				JSTreeObj.__cancelRename(e,inputObj);
-				return;
-			}
-			inputObj.style.display='none';
-			inputObj.nextSibling.style.visibility='visible';
-			if(inputObj.value.length>0){
-				inputObj.nextSibling.innerHTML = inputObj.value;	
-				// Send changes to the server.
-				if (JSTreeObj.renameState != JSTreeObj.RENAME_STATE_BEGIN) {
-					return;
-				}
-				JSTreeObj.renameState = JSTreeObj.RENAME_STATE_REQUEST_SENDED;
-				var ajaxIndex = JSTreeObj.ajaxObjects.length;
-				JSTreeObj.ajaxObjects[ajaxIndex] = new sack();
-				JSTreeObj.ajaxObjects[ajaxIndex].method = "GET";
-				JSTreeObj.ajaxObjects[ajaxIndex].setVar("renameId", inputObj.parentNode.id.replace(/[^0-9]/gi,''));
-				JSTreeObj.ajaxObjects[ajaxIndex].setVar("newName", inputObj.value);
-				JSTreeObj.__addAdditionalRequestParameters(JSTreeObj.ajaxObjects[ajaxIndex], JSTreeObj.additionalRenameRequestParameters);
-				JSTreeObj.ajaxObjects[ajaxIndex].requestFile = JSTreeObj.filePathRenameItem;	// Specifying which file to get
-				JSTreeObj.ajaxObjects[ajaxIndex].onCompletion = function() { JSTreeObj.__renameComplete(ajaxIndex); } ;	// Specify function that will be executed after file has been found
-				JSTreeObj.ajaxObjects[ajaxIndex].runAJAX();		// Execute AJAX function		
-				
-				document.all.renameId.value=inputObj.parentNode.id.replace(/[^0-9]/gi,'');
-				document.all.newName.value= inputObj.value;
-				renameMyTree_byForm();
-				
-			}
-		}
-		,
-		__cancelRename : function(e,inputObj)
-		{
-			JSTreeObj.renameState = JSTreeObj.RENAME_STATE_CANCELD;
-			if(!inputObj && this)inputObj = this;
-			inputObj.value = JSTreeObj.helpObj.innerHTML;
-			inputObj.nextSibling.innerHTML = JSTreeObj.helpObj.innerHTML;
-			inputObj.style.display = 'none';
-			inputObj.nextSibling.style.visibility = 'visible';
-		}
-		,
-		__renameCheckKeyCode : function(e)
-		{
-			if(document.all)e = event;
-			if(e.keyCode==13){	// Enter pressed
-				JSTreeObj.__saveTextBoxChanges(false,this);	
-			}	
-			if(e.keyCode==27){	// ESC pressed
-				JSTreeObj.__cancelRename(false,this);
-			}
-		}
-		,
-		__createTextBox : function(obj)
-		{
-			var textBox = document.createElement('INPUT');
-			textBox.className = 'folderTreeTextBox';
-			textBox.value = obj.innerHTML;
-			obj.parentNode.insertBefore(textBox,obj);	
-			textBox.id = 'textBox' + obj.parentNode.id.replace(/[^0-9]/gi,'');
-			textBox.onblur = this.__saveTextBoxChanges;	
-			textBox.onkeydown = this.__renameCheckKeyCode;
-			textBox.style.height="16px";
-			this.__renameEnableTextBox(obj);
-		}
-		,
-		__renameEnableTextBox : function(obj)
-		{
-			JSTreeObj.renameState = JSTreeObj.RENAME_STATE_BEGIN;
-			obj.style.visibility = 'hidden';
-			obj.previousSibling.value = obj.innerHTML;
-			obj.previousSibling.style.display = 'inline';
-			obj.previousSibling.select();
-		}
-		,
-		renameItem : function(obj1,obj2)
-		{
-			currentItemToEdit = obj2.parentNode;	// Reference to the <li> tag.
-			if(!obj2.previousSibling || obj2.previousSibling.tagName.toLowerCase()!='input'){
-				this.__createTextBox(obj2);
-			}else{
-				this.__renameEnableTextBox(obj2);
-			}
-			this.helpObj.innerHTML = obj2.innerHTML;
-
-		}
-		,
-		initTree : function(selectedItemId)
-		{
-			JSTreeObj = this;
-			JSTreeObj.createDropIndicator();
-			document.documentElement.onselectstart = JSTreeObj.cancelSelectionEvent;
-			document.documentElement.ondragstart = JSTreeObj.cancelEvent;
-			document.documentElement.onmousedown = JSTreeObj.removeHighlight;
-			
-			/* Creating help object for storage of values */
-			this.helpObj = document.createElement('DIV');
-			this.helpObj.style.display = 'none';
-			document.body.appendChild(this.helpObj);
-			/* Create context menu */
-			if(this.deleteAllowed || this.renameAllowed || this.addAllowed){
-				try{
-					/* Creating menu model for the context menu, i.e. the datasource */
-					var menuModel = new DHTMLGoodies_menuModel();
-					if(this.deleteAllowed)menuModel.addItem(1,'Delete Folder','','',false,'JSTreeObj.deleteItem');
-					if(this.deleteAllowed)menuModel.addItem(2,'Rename Folder','','',false,'JSTreeObj.renameItem');
-					if(this.addAllowed)menuModel.addItem(3,'New Folder','','',false,'JSTreeObj.addItem');
-					menuModel.addItem(4,'Create Report','','',false,'JSTreeObj.createMenuReport');
-					menuModel.init();	
-					
-					/*For Reports*/
-					var menuReportNoRights = new DHTMLGoodies_menuModel();
-					menuReportNoRights.addItem(3,'Run','','',false,'JSTreeObj.runItem');
-					menuReportNoRights.init();	
-					
-					var menuReportWithRights = new DHTMLGoodies_menuModel();
-					menuReportWithRights.addItem(1,'Run','','',false,'JSTreeObj.runMenuReport');
-					menuReportWithRights.addItem(2,'Edit','','',false,'JSTreeObj.editMenuReport');
-					menuReportWithRights.addItem(3,'Delete','','',false,'JSTreeObj.deleteMenuReport');
-					menuReportWithRights.init();	
-					
-					
-					var menuModelRenameOnly = new DHTMLGoodies_menuModel();
-					if(this.renameAllowed)menuModelRenameOnly.addItem(3,'Rename Folder','','',false,'JSTreeObj.renameItem');
-					menuModelRenameOnly.init();	
-					
-					var menuModelDeleteOnly = new DHTMLGoodies_menuModel();
-					if(this.deleteAllowed)menuModelDeleteOnly.addItem(4,'Delete Folder','','',false,'JSTreeObj.deleteItem');
-					menuModelDeleteOnly.init();	
-					
-					var menuModelAddOnly = new DHTMLGoodies_menuModel();
-					menuModelAddOnly.addItem(1,'New Folder','','',false,'JSTreeObj.addItem');
-					menuModelAddOnly.init();	
-					
-					window.refToDragDropTree = this;
-					
-					this.contextMenu = new DHTMLGoodies_contextMenu();
-					this.contextMenu.setWidth(120);
-					referenceToDHTMLSuiteContextMenu = this.contextMenu;
-				}catch(e){
-					
-				}
-			}
-
-					
-			var nodeId = 0;
-			var dhtmlgoodies_tree = document.getElementById(this.idOfTree);
-			var menuItems = dhtmlgoodies_tree.getElementsByTagName('LI');	// Get an array of all menu items
-			for(var no=0;no<menuItems.length;no++){
-				// No children var set ?
-				var noChildren = false;
-				var tmpVar = menuItems[no].getAttribute('noChildren');
-				if(!tmpVar)tmpVar = menuItems[no].noChildren;
-				if(tmpVar=='true')noChildren=true;
-				// No drag var set ?
-				var noDrag = false;
-				var tmpVar = menuItems[no].getAttribute('noDrag');
-				if(!tmpVar)tmpVar = menuItems[no].noDrag;
-				if(tmpVar=='true')noDrag=true;
-						 
-				nodeId++;
-				var subItems = menuItems[no].getElementsByTagName('UL');
-				var img = document.createElement('IMG');
-				img.src = this.imageFolder + this.plusImage;
-				img.onclick = JSTreeObj.showHideNode;
-				
-				if(subItems.length==0)img.style.visibility='hidden';else{
-					subItems[0].id = 'tree_ul_' + treeUlCounter;
-					treeUlCounter++;
-				}
-				var aTag = menuItems[no].getElementsByTagName('A')[0];
-				aTag.id = 'nodeATag' + menuItems[no].id.replace(/[^0-9]/gi,'');
-				//aTag.onclick = JSTreeObj.showHideNode;
-				if(!noDrag)aTag.onmousedown = JSTreeObj.initDrag;
-				if(!noChildren)aTag.onmousemove = JSTreeObj.moveDragableNodes;
-				menuItems[no].insertBefore(img,aTag);
-				//menuItems[no].id = 'dhtmlgoodies_treeNode' + nodeId;
-				var folderImg = document.createElement('IMG');
-				if(!noDrag)folderImg.onmousedown = JSTreeObj.initDrag;
-				folderImg.onmousemove = JSTreeObj.moveDragableNodes;
-				if(menuItems[no].className){
-					folderImg.src = this.imageFolder + menuItems[no].className;
-				} else if (menuItems[no].getAttribute('imgFile')){
-					folderImg.src = this.imageFolder + menuItems[no].getAttribute('imgFile');
-				} else{
-					folderImg.src = this.imageFolder + this.folderImage;
-				}
-				menuItems[no].insertBefore(folderImg,aTag);
-				
-				if(this.contextMenu){
-					var noDelete = menuItems[no].getAttribute('noDelete');
-					if(!noDelete)noDelete = menuItems[no].noDelete;
-					var noRename = menuItems[no].getAttribute('noRename');
-					if(!noRename)noRename = menuItems[no].noRename;
-					var noAdd = menuItems[no].getAttribute('noChild');
-					if(!noAdd)noAdd = menuItems[no].noChild;
-					
-					
-					if (menuItems[no].id.replace(/[^0-9]/gi,'').substr(0,3) != '000' ){//for folders
-						if(noRename=='true' && noDelete=='true'){
-							if (noAdd != 'true'){
-								this.contextMenu.attachToElement(aTag,false,menuModelAddOnly);
-							}
-						}else{
-							if(noDelete == 'true')this.contextMenu.attachToElement(aTag,false,menuModelRenameOnly);
-							else if(noRename == 'true')this.contextMenu.attachToElement(aTag,false,menuModelDeleteOnly);
-							else this.contextMenu.attachToElement(aTag,false,menuModel);
-					
-						}
-					}else{//for reports
-						var noRights = menuItems[no].getAttribute('noReportRights');
-						if(!noRights)noRights = menuItems[no].noRights;
-						if(noRights=='true'){
-							this.contextMenu.attachToElement(aTag,false,menuReportNoRights);
-						}else{
-							this.contextMenu.attachToElement(aTag,false,menuReportWithRights);
-						}
-							
-					
-					}
-				}
-				//highlighting the selected item
-				if (selectedItemId != null && selectedItemId == menuItems[no].id.replace(/[^0-9]/gi,'')){
-					if(JSTreeObj.currentlyActiveItem) JSTreeObj.currentlyActiveItem.className = '';
-					aTag.className = 'highlightedNodeItem';
-					JSTreeObj.currentlyActiveItem = aTag;
-					JSTreeObj.selectedItem = aTag;	
-					 folderImg.tabindex="1";
-					//alert(1);
-					//folderImg.focus();
-				}
-				this.addEvent(aTag,'contextmenu',this.highlightItem);
-				this.addEvent(aTag,'click',this.clickItem);
-				
-		
-				
-			}	
-			
-
-			
-			initExpandedNodes = this.Get_Cookie('dhtmlgoodies_expandedNodes');
-			if(initExpandedNodes){
-				var nodes = initExpandedNodes.split(',');
-				for(var no=0;no<nodes.length;no++){
-					if(nodes[no])this.showHideNode(false,nodes[no]);	
-				}			
-			}			
-			
-			
-			
-			
-			document.documentElement.onmousemove = JSTreeObj.moveDragableNodes;	
-			document.documentElement.onmouseup = JSTreeObj.dropDragableNodes;
-		}
-		,
-		__addAdditionalRequestParameters : function(ajax, parameters)
-		{
-			for (var parameter in parameters) {
-				ajax.setVar(parameter, parameters[parameter]);
-			}
-		}
-	}
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/flexslider.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/flexslider.css
deleted file mode 100644
index c459ef44..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/flexslider.css
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * jQuery FlexSlider v2.6.0
- * http://www.woothemes.com/flexslider/
- *
- * Copyright 2012 WooThemes
- * Free to use under the GPLv2 and later license.
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Contributing author: Tyler Smith (@mbmufffin)
- *
- */
-/* ====================================================================================================================
- * FONT-FACE
- * ====================================================================================================================*/
-@font-face {
-  font-family: 'flexslider-icon';
-  src: url('fonts/flexslider-icon.eot');
-  src: url('fonts/flexslider-icon.eot?#iefix') format('embedded-opentype'), url('fonts/flexslider-icon.woff') format('woff'), url('fonts/flexslider-icon.ttf') format('truetype'), url('fonts/flexslider-icon.svg#flexslider-icon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* ====================================================================================================================
- * RESETS
- * ====================================================================================================================*/
-.flex-container a:hover,
-.flex-slider a:hover {
-  outline: none;
-}
-.slides,
-.slides > li,
-.flex-control-nav,
-.flex-direction-nav {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-.flex-pauseplay span {
-  text-transform: capitalize;
-}
-/* ====================================================================================================================
- * BASE STYLES
- * ====================================================================================================================*/
-.flexslider {
-  margin: 0;
-  padding: 0;
-}
-.flexslider .slides > li {
-  display: none;
-  -webkit-backface-visibility: hidden;
-}
-.flexslider .slides img {
-  width: 100%;
-  display: block;
-}
-.flexslider .slides:after {
-  content: "\0020";
-  display: block;
-  clear: both;
-  visibility: hidden;
-  line-height: 0;
-  height: 0;
-}
-html[xmlns] .flexslider .slides {
-  display: block;
-}
-* html .flexslider .slides {
-  height: 1%;
-}
-.no-js .flexslider .slides > li:first-child {
-  display: block;
-}
-/* ====================================================================================================================
- * DEFAULT THEME
- * ====================================================================================================================*/
-.flexslider {
-  margin: 0 0 60px;
-  background: #ffffff;
-  border: 4px solid #ffffff;
-  position: relative;
-  zoom: 1;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  -o-box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-  box-shadow: '' 0 1px 4px rgba(0, 0, 0, 0.2);
-}
-.flexslider .slides {
-  zoom: 1;
-}
-.flexslider .slides img {
-  height: auto;
-  -moz-user-select: none;
-}
-.flex-viewport {
-  max-height: 2000px;
-  -webkit-transition: all 1s ease;
-  -moz-transition: all 1s ease;
-  -ms-transition: all 1s ease;
-  -o-transition: all 1s ease;
-  transition: all 1s ease;
-}
-.loading .flex-viewport {
-  max-height: 300px;
-}
-.carousel li {
-  margin-right: 5px;
-}
-.flex-direction-nav {
-  *height: 0;
-}
-.flex-direction-nav a {
-  text-decoration: none;
-  display: block;
-  width: 40px;
-  height: 40px;
-  margin: -20px 0 0;
-  position: absolute;
-  top: 50%;
-  z-index: 10;
-  overflow: hidden;
-  opacity: 0;
-  cursor: pointer;
-  color: rgba(0, 0, 0, 0.8);
-  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
-  -webkit-transition: all 0.3s ease-in-out;
-  -moz-transition: all 0.3s ease-in-out;
-  -ms-transition: all 0.3s ease-in-out;
-  -o-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.flex-direction-nav a:before {
-  font-family: "flexslider-icon";
-  font-size: 40px;
-  display: inline-block;
-  content: '\f001';
-  color: rgba(0, 0, 0, 0.8);
-  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
-}
-.flex-direction-nav a.flex-next:before {
-  content: '\f002';
-}
-.flex-direction-nav .flex-prev {
-  left: -50px;
-}
-.flex-direction-nav .flex-next {
-  right: -50px;
-  text-align: right;
-}
-.flexslider:hover .flex-direction-nav .flex-prev {
-  opacity: 0.7;
-  left: 10px;
-}
-.flexslider:hover .flex-direction-nav .flex-prev:hover {
-  opacity: 1;
-}
-.flexslider:hover .flex-direction-nav .flex-next {
-  opacity: 0.7;
-  right: 10px;
-}
-.flexslider:hover .flex-direction-nav .flex-next:hover {
-  opacity: 1;
-}
-.flex-direction-nav .flex-disabled {
-  opacity: 0!important;
-  filter: alpha(opacity=0);
-  cursor: default;
-  z-index: -1;
-}
-.flex-pauseplay a {
-  display: block;
-  width: 20px;
-  height: 20px;
-  position: absolute;
-  bottom: 5px;
-  left: 10px;
-  opacity: 0.8;
-  z-index: 10;
-  overflow: hidden;
-  cursor: pointer;
-  color: #000;
-}
-.flex-pauseplay a:before {
-  font-family: "flexslider-icon";
-  font-size: 20px;
-  display: inline-block;
-  content: '\f004';
-}
-.flex-pauseplay a:hover {
-  opacity: 1;
-}
-.flex-pauseplay a.flex-play:before {
-  content: '\f003';
-}
-.flex-control-nav {
-  width: 100%;
-  position: absolute;
-  bottom: -40px;
-  text-align: center;
-}
-.flex-control-nav li {
-  margin: 0 6px;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-}
-.flex-control-paging li a {
-  width: 11px;
-  height: 11px;
-  display: block;
-  background: #666;
-  background: rgba(0, 0, 0, 0.5);
-  cursor: pointer;
-  text-indent: -9999px;
-  -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -o-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.3);
-  -webkit-border-radius: 20px;
-  -moz-border-radius: 20px;
-  border-radius: 20px;
-}
-.flex-control-paging li a:hover {
-  background: #333;
-  background: rgba(0, 0, 0, 0.7);
-}
-.flex-control-paging li a.flex-active {
-  background: #000;
-  background: rgba(0, 0, 0, 0.9);
-  cursor: default;
-}
-.flex-control-thumbs {
-  margin: 5px 0 0;
-  position: static;
-  overflow: hidden;
-}
-.flex-control-thumbs li {
-  width: 25%;
-  float: left;
-  margin: 0;
-}
-.flex-control-thumbs img {
-  width: 100%;
-  height: auto;
-  display: block;
-  opacity: .7;
-  cursor: pointer;
-  -moz-user-select: none;
-  -webkit-transition: all 1s ease;
-  -moz-transition: all 1s ease;
-  -ms-transition: all 1s ease;
-  -o-transition: all 1s ease;
-  transition: all 1s ease;
-}
-.flex-control-thumbs img:hover {
-  opacity: 1;
-}
-.flex-control-thumbs .flex-active {
-  opacity: 1;
-  cursor: default;
-}
-/* ====================================================================================================================
- * RESPONSIVE
- * ====================================================================================================================*/
-@media screen and (max-width: 860px) {
-  .flex-direction-nav .flex-prev {
-    opacity: 1;
-    left: 10px;
-  }
-  .flex-direction-nav .flex-next {
-    opacity: 1;
-    right: 10px;
-  }
-}
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot
deleted file mode 100644
index 97c4196f..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.eot
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg
deleted file mode 100644
index 89fd1ab8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="14"></iconset>
-</metadata>
-<defs>
-<font id="flexslider-icon" horiz-adv-x="448" >
-<font-face units-per-em="448" ascent="384" descent="-64" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode="&#xf001;" d="M 185.50-9.25l-163.00,162.75q-9.25,9.25 -9.25,22.625t 9.25,22.625l 163.00,162.75q 9.25,9.25 22.625,9.25t 22.625-9.25l 18.75-18.75q 9.25-9.25 9.25-22.625t-9.25-22.625l-121.50-121.50l 121.50-121.25q 9.25-9.50 9.25-22.75t-9.25-22.50l-18.75-18.75q-9.25-9.25 -22.625-9.25t-22.625,9.25z" horiz-adv-x="288"  />
-<glyph unicode="&#xf002;" d="M 274.75,176.00q0.00-13.00 -9.25-22.75l-163.00-162.75q-9.25-9.25 -22.50-9.25t-22.50,9.25l-19.00,18.75q-9.25,9.75 -9.25,22.75q0.00,13.25 9.25,22.50l 121.50,121.50l-121.50,121.25q-9.25,9.75 -9.25,22.75q0.00,13.25 9.25,22.50l 19.00,18.75q 9.00,9.50 22.50,9.50t 22.50-9.50l 163.00-162.75q 9.25-9.25 9.25-22.50z" horiz-adv-x="288"  />
-<glyph unicode="&#xf003;" d="M 346.00,152.25l-332.00-184.50q-5.75-3.25 -9.875-0.75t-4.125,9.00l0.00,368.00 q0.00,6.50 4.125,9.00t 9.875-0.75l 332.00-184.50q 5.75-3.25 5.75-7.75t-5.75-7.75z" horiz-adv-x="352"  />
-<glyph unicode="&#xf004;" d="M 384.00,336.00l0.00-352.00 q0.00-6.50 -4.75-11.25t-11.25-4.75l-128.00,0.00 q-6.50,0.00 -11.25,4.75t-4.75,11.25l0.00,352.00 q0.00,6.50 4.75,11.25t 11.25,4.75l 128.00,0.00 q 6.50,0.00 11.25-4.75t 4.75-11.25zM 160.00,336.00l0.00-352.00 q0.00-6.50 -4.75-11.25t-11.25-4.75l-128.00,0.00 q-6.50,0.00 -11.25,4.75t-4.75,11.25l0.00,352.00 q0.00,6.50 4.75,11.25t 11.25,4.75l 128.00,0.00 q 6.50,0.00 11.25-4.75t 4.75-11.25z" horiz-adv-x="384"  />
-<glyph unicode="&#xf005;" d="M 402.75,208.00q0.00-13.25 -9.25-22.50l-162.75-162.75q-9.50-9.50 -22.75-9.50q-13.50,0.00 -22.50,9.50l-162.75,162.75q-9.50,9.00 -9.50,22.50q0.00,13.25 9.50,22.75l 18.50,18.75q 9.75,9.25 22.75,9.25q 13.25,0.00 22.50-9.25l 121.50-121.50l 121.50,121.50q 9.25,9.25 22.50,9.25q 13.00,0.00 22.75-9.25l 18.75-18.75q 9.25-9.75 9.25-22.75z" horiz-adv-x="416"  />
-<glyph unicode="&#x20;" horiz-adv-x="224" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,384L 448 -64L0 -64 z" horiz-adv-x="0" />
-</font></defs></svg>
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf
deleted file mode 100644
index 05432986..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.ttf
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff
deleted file mode 100644
index 10c4eeb8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/css/fonts/flexslider-icon.woff
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
deleted file mode 100644
index ac970bda..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/Calendar-16x16.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-next.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-next.png
deleted file mode 100644
index 1a4f72c6..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-next.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-prev.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-prev.png
deleted file mode 100644
index 8211eba1..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/arrow-prev.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/copyicon.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/copyicon.png
deleted file mode 100644
index 6c1c3c15..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/copyicon.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/deleteicon.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/deleteicon.gif
deleted file mode 100644
index 4b07af82..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/deleteicon.gif
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/example-frame.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/example-frame.png
deleted file mode 100644
index 31f2fe1c..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/example-frame.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/loading.gif b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/loading.gif
deleted file mode 100644
index cccb0fc9..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/images/loading.gif
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/eye.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/eye.js
deleted file mode 100644
index 8a281dc3..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/eye.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * Zoomimage
- * Author: Stefan Petre www.eyecon.ro
- * 
- */
-(function($){
-	var EYE = window.EYE = function() {
-		var _registered = {
-			init: []
-		};
-		return {
-			init: function() {
-				$.each(_registered.init, function(nr, fn){
-					fn.call();
-				});
-			},
-			extend: function(prop) {
-				for (var i in prop) {
-					if (prop[i] != undefined) {
-						this[i] = prop[i];
-					}
-				}
-			},
-			register: function(fn, type) {
-				if (!_registered[type]) {
-					_registered[type] = [];
-				}
-				_registered[type].push(fn);
-			}
-		};
-	}();
-	$(EYE.init);
-})(jQuery);
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
deleted file mode 100644
index 5ad6c377..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/jquery.flexslider-min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * jQuery FlexSlider v2.6.0
- * Copyright 2012 WooThemes
- * Contributing Author: Tyler Smith
- */!function($){var e=!0;$.flexslider=function(t,a){var n=$(t);n.vars=$.extend({},$.flexslider.defaults,a);var i=n.vars.namespace,s=window.navigator&&window.navigator.msPointerEnabled&&window.MSGesture,r=("ontouchstart"in window||s||window.DocumentTouch&&document instanceof DocumentTouch)&&n.vars.touch,o="click touchend MSPointerUp keyup",l="",c,d="vertical"===n.vars.direction,u=n.vars.reverse,v=n.vars.itemWidth>0,p="fade"===n.vars.animation,m=""!==n.vars.asNavFor,f={};$.data(t,"flexslider",n),f={init:function(){n.animating=!1,n.currentSlide=parseInt(n.vars.startAt?n.vars.startAt:0,10),isNaN(n.currentSlide)&&(n.currentSlide=0),n.animatingTo=n.currentSlide,n.atEnd=0===n.currentSlide||n.currentSlide===n.last,n.containerSelector=n.vars.selector.substr(0,n.vars.selector.search(" ")),n.slides=$(n.vars.selector,n),n.container=$(n.containerSelector,n),n.count=n.slides.length,n.syncExists=$(n.vars.sync).length>0,"slide"===n.vars.animation&&(n.vars.animation="swing"),n.prop=d?"top":"marginLeft",n.args={},n.manualPause=!1,n.stopped=!1,n.started=!1,n.startTimeout=null,n.transitions=!n.vars.video&&!p&&n.vars.useCSS&&function(){var e=document.createElement("div"),t=["perspectiveProperty","WebkitPerspective","MozPerspective","OPerspective","msPerspective"];for(var a in t)if(void 0!==e.style[t[a]])return n.pfx=t[a].replace("Perspective","").toLowerCase(),n.prop="-"+n.pfx+"-transform",!0;return!1}(),n.ensureAnimationEnd="",""!==n.vars.controlsContainer&&(n.controlsContainer=$(n.vars.controlsContainer).length>0&&$(n.vars.controlsContainer)),""!==n.vars.manualControls&&(n.manualControls=$(n.vars.manualControls).length>0&&$(n.vars.manualControls)),""!==n.vars.customDirectionNav&&(n.customDirectionNav=2===$(n.vars.customDirectionNav).length&&$(n.vars.customDirectionNav)),n.vars.randomize&&(n.slides.sort(function(){return Math.round(Math.random())-.5}),n.container.empty().append(n.slides)),n.doMath(),n.setup("init"),n.vars.controlNav&&f.controlNav.setup(),n.vars.directionNav&&f.directionNav.setup(),n.vars.keyboard&&(1===$(n.containerSelector).length||n.vars.multipleKeyboard)&&$(document).bind("keyup",function(e){var t=e.keyCode;if(!n.animating&&(39===t||37===t)){var a=39===t?n.getTarget("next"):37===t?n.getTarget("prev"):!1;n.flexAnimate(a,n.vars.pauseOnAction)}}),n.vars.mousewheel&&n.bind("mousewheel",function(e,t,a,i){e.preventDefault();var s=0>t?n.getTarget("next"):n.getTarget("prev");n.flexAnimate(s,n.vars.pauseOnAction)}),n.vars.pausePlay&&f.pausePlay.setup(),n.vars.slideshow&&n.vars.pauseInvisible&&f.pauseInvisible.init(),n.vars.slideshow&&(n.vars.pauseOnHover&&n.hover(function(){n.manualPlay||n.manualPause||n.pause()},function(){n.manualPause||n.manualPlay||n.stopped||n.play()}),n.vars.pauseInvisible&&f.pauseInvisible.isHidden()||(n.vars.initDelay>0?n.startTimeout=setTimeout(n.play,n.vars.initDelay):n.play())),m&&f.asNav.setup(),r&&n.vars.touch&&f.touch(),(!p||p&&n.vars.smoothHeight)&&$(window).bind("resize orientationchange focus",f.resize),n.find("img").attr("draggable","false"),setTimeout(function(){n.vars.start(n)},200)},asNav:{setup:function(){n.asNav=!0,n.animatingTo=Math.floor(n.currentSlide/n.move),n.currentItem=n.currentSlide,n.slides.removeClass(i+"active-slide").eq(n.currentItem).addClass(i+"active-slide"),s?(t._slider=n,n.slides.each(function(){var e=this;e._gesture=new MSGesture,e._gesture.target=e,e.addEventListener("MSPointerDown",function(e){e.preventDefault(),e.currentTarget._gesture&&e.currentTarget._gesture.addPointer(e.pointerId)},!1),e.addEventListener("MSGestureTap",function(e){e.preventDefault();var t=$(this),a=t.index();$(n.vars.asNavFor).data("flexslider").animating||t.hasClass("active")||(n.direction=n.currentItem<a?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction,!1,!0,!0))})})):n.slides.on(o,function(e){e.preventDefault();var t=$(this),a=t.index(),s=t.offset().left-$(n).scrollLeft();0>=s&&t.hasClass(i+"active-slide")?n.flexAnimate(n.getTarget("prev"),!0):$(n.vars.asNavFor).data("flexslider").animating||t.hasClass(i+"active-slide")||(n.direction=n.currentItem<a?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction,!1,!0,!0))})}},controlNav:{setup:function(){n.manualControls?f.controlNav.setupManual():f.controlNav.setupPaging()},setupPaging:function(){var e="thumbnails"===n.vars.controlNav?"control-thumbs":"control-paging",t=1,a,s;if(n.controlNavScaffold=$('<ol class="'+i+"control-nav "+i+e+'"></ol>'),n.pagingCount>1)for(var r=0;r<n.pagingCount;r++){if(s=n.slides.eq(r),void 0===s.attr("data-thumb-alt")&&s.attr("data-thumb-alt",""),altText=""!==s.attr("data-thumb-alt")?altText=' alt="'+s.attr("data-thumb-alt")+'"':"",a="thumbnails"===n.vars.controlNav?'<img src="'+s.attr("data-thumb")+'"'+altText+"/>":'<a href="#">'+t+"</a>","thumbnails"===n.vars.controlNav&&!0===n.vars.thumbCaptions){var c=s.attr("data-thumbcaption");""!==c&&void 0!==c&&(a+='<span class="'+i+'caption">'+c+"</span>")}n.controlNavScaffold.append("<li>"+a+"</li>"),t++}n.controlsContainer?$(n.controlsContainer).append(n.controlNavScaffold):n.append(n.controlNavScaffold),f.controlNav.set(),f.controlNav.active(),n.controlNavScaffold.delegate("a, img",o,function(e){if(e.preventDefault(),""===l||l===e.type){var t=$(this),a=n.controlNav.index(t);t.hasClass(i+"active")||(n.direction=a>n.currentSlide?"next":"prev",n.flexAnimate(a,n.vars.pauseOnAction))}""===l&&(l=e.type),f.setToClearWatchedEvent()})},setupManual:function(){n.controlNav=n.manualControls,f.controlNav.active(),n.controlNav.bind(o,function(e){if(e.preventDefault(),""===l||l===e.type){var t=$(this),a=n.controlNav.index(t);t.hasClass(i+"active")||(a>n.currentSlide?n.direction="next":n.direction="prev",n.flexAnimate(a,n.vars.pauseOnAction))}""===l&&(l=e.type),f.setToClearWatchedEvent()})},set:function(){var e="thumbnails"===n.vars.controlNav?"img":"a";n.controlNav=$("."+i+"control-nav li "+e,n.controlsContainer?n.controlsContainer:n)},active:function(){n.controlNav.removeClass(i+"active").eq(n.animatingTo).addClass(i+"active")},update:function(e,t){n.pagingCount>1&&"add"===e?n.controlNavScaffold.append($('<li><a href="#">'+n.count+"</a></li>")):1===n.pagingCount?n.controlNavScaffold.find("li").remove():n.controlNav.eq(t).closest("li").remove(),f.controlNav.set(),n.pagingCount>1&&n.pagingCount!==n.controlNav.length?n.update(t,e):f.controlNav.active()}},directionNav:{setup:function(){var e=$('<ul class="'+i+'direction-nav"><li class="'+i+'nav-prev"><a class="'+i+'prev" href="#">'+n.vars.prevText+'</a></li><li class="'+i+'nav-next"><a class="'+i+'next" href="#">'+n.vars.nextText+"</a></li></ul>");n.customDirectionNav?n.directionNav=n.customDirectionNav:n.controlsContainer?($(n.controlsContainer).append(e),n.directionNav=$("."+i+"direction-nav li a",n.controlsContainer)):(n.append(e),n.directionNav=$("."+i+"direction-nav li a",n)),f.directionNav.update(),n.directionNav.bind(o,function(e){e.preventDefault();var t;(""===l||l===e.type)&&(t=$(this).hasClass(i+"next")?n.getTarget("next"):n.getTarget("prev"),n.flexAnimate(t,n.vars.pauseOnAction)),""===l&&(l=e.type),f.setToClearWatchedEvent()})},update:function(){var e=i+"disabled";1===n.pagingCount?n.directionNav.addClass(e).attr("tabindex","-1"):n.vars.animationLoop?n.directionNav.removeClass(e).removeAttr("tabindex"):0===n.animatingTo?n.directionNav.removeClass(e).filter("."+i+"prev").addClass(e).attr("tabindex","-1"):n.animatingTo===n.last?n.directionNav.removeClass(e).filter("."+i+"next").addClass(e).attr("tabindex","-1"):n.directionNav.removeClass(e).removeAttr("tabindex")}},pausePlay:{setup:function(){var e=$('<div class="'+i+'pauseplay"><a href="#"></a></div>');n.controlsContainer?(n.controlsContainer.append(e),n.pausePlay=$("."+i+"pauseplay a",n.controlsContainer)):(n.append(e),n.pausePlay=$("."+i+"pauseplay a",n)),f.pausePlay.update(n.vars.slideshow?i+"pause":i+"play"),n.pausePlay.bind(o,function(e){e.preventDefault(),(""===l||l===e.type)&&($(this).hasClass(i+"pause")?(n.manualPause=!0,n.manualPlay=!1,n.pause()):(n.manualPause=!1,n.manualPlay=!0,n.play())),""===l&&(l=e.type),f.setToClearWatchedEvent()})},update:function(e){"play"===e?n.pausePlay.removeClass(i+"pause").addClass(i+"play").html(n.vars.playText):n.pausePlay.removeClass(i+"play").addClass(i+"pause").html(n.vars.pauseText)}},touch:function(){function e(e){e.stopPropagation(),n.animating?e.preventDefault():(n.pause(),t._gesture.addPointer(e.pointerId),T=0,c=d?n.h:n.w,f=Number(new Date),l=v&&u&&n.animatingTo===n.last?0:v&&u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:v&&n.currentSlide===n.last?n.limit:v?(n.itemW+n.vars.itemMargin)*n.move*n.currentSlide:u?(n.last-n.currentSlide+n.cloneOffset)*c:(n.currentSlide+n.cloneOffset)*c)}function a(e){e.stopPropagation();var a=e.target._slider;if(a){var n=-e.translationX,i=-e.translationY;return T+=d?i:n,m=T,x=d?Math.abs(T)<Math.abs(-n):Math.abs(T)<Math.abs(-i),e.detail===e.MSGESTURE_FLAG_INERTIA?void setImmediate(function(){t._gesture.stop()}):void((!x||Number(new Date)-f>500)&&(e.preventDefault(),!p&&a.transitions&&(a.vars.animationLoop||(m=T/(0===a.currentSlide&&0>T||a.currentSlide===a.last&&T>0?Math.abs(T)/c+2:1)),a.setProps(l+m,"setTouch"))))}}function i(e){e.stopPropagation();var t=e.target._slider;if(t){if(t.animatingTo===t.currentSlide&&!x&&null!==m){var a=u?-m:m,n=a>0?t.getTarget("next"):t.getTarget("prev");t.canAdvance(n)&&(Number(new Date)-f<550&&Math.abs(a)>50||Math.abs(a)>c/2)?t.flexAnimate(n,t.vars.pauseOnAction):p||t.flexAnimate(t.currentSlide,t.vars.pauseOnAction,!0)}r=null,o=null,m=null,l=null,T=0}}var r,o,l,c,m,f,g,h,S,x=!1,y=0,b=0,T=0;s?(t.style.msTouchAction="none",t._gesture=new MSGesture,t._gesture.target=t,t.addEventListener("MSPointerDown",e,!1),t._slider=n,t.addEventListener("MSGestureChange",a,!1),t.addEventListener("MSGestureEnd",i,!1)):(g=function(e){n.animating?e.preventDefault():(window.navigator.msPointerEnabled||1===e.touches.length)&&(n.pause(),c=d?n.h:n.w,f=Number(new Date),y=e.touches[0].pageX,b=e.touches[0].pageY,l=v&&u&&n.animatingTo===n.last?0:v&&u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:v&&n.currentSlide===n.last?n.limit:v?(n.itemW+n.vars.itemMargin)*n.move*n.currentSlide:u?(n.last-n.currentSlide+n.cloneOffset)*c:(n.currentSlide+n.cloneOffset)*c,r=d?b:y,o=d?y:b,t.addEventListener("touchmove",h,!1),t.addEventListener("touchend",S,!1))},h=function(e){y=e.touches[0].pageX,b=e.touches[0].pageY,m=d?r-b:r-y,x=d?Math.abs(m)<Math.abs(y-o):Math.abs(m)<Math.abs(b-o);var t=500;(!x||Number(new Date)-f>t)&&(e.preventDefault(),!p&&n.transitions&&(n.vars.animationLoop||(m/=0===n.currentSlide&&0>m||n.currentSlide===n.last&&m>0?Math.abs(m)/c+2:1),n.setProps(l+m,"setTouch")))},S=function(e){if(t.removeEventListener("touchmove",h,!1),n.animatingTo===n.currentSlide&&!x&&null!==m){var a=u?-m:m,i=a>0?n.getTarget("next"):n.getTarget("prev");n.canAdvance(i)&&(Number(new Date)-f<550&&Math.abs(a)>50||Math.abs(a)>c/2)?n.flexAnimate(i,n.vars.pauseOnAction):p||n.flexAnimate(n.currentSlide,n.vars.pauseOnAction,!0)}t.removeEventListener("touchend",S,!1),r=null,o=null,m=null,l=null},t.addEventListener("touchstart",g,!1))},resize:function(){!n.animating&&n.is(":visible")&&(v||n.doMath(),p?f.smoothHeight():v?(n.slides.width(n.computedW),n.update(n.pagingCount),n.setProps()):d?(n.viewport.height(n.h),n.setProps(n.h,"setTotal")):(n.vars.smoothHeight&&f.smoothHeight(),n.newSlides.width(n.computedW),n.setProps(n.computedW,"setTotal")))},smoothHeight:function(e){if(!d||p){var t=p?n:n.viewport;e?t.animate({height:n.slides.eq(n.animatingTo).height()},e):t.height(n.slides.eq(n.animatingTo).height())}},sync:function(e){var t=$(n.vars.sync).data("flexslider"),a=n.animatingTo;switch(e){case"animate":t.flexAnimate(a,n.vars.pauseOnAction,!1,!0);break;case"play":t.playing||t.asNav||t.play();break;case"pause":t.pause()}},uniqueID:function(e){return e.filter("[id]").add(e.find("[id]")).each(function(){var e=$(this);e.attr("id",e.attr("id")+"_clone")}),e},pauseInvisible:{visProp:null,init:function(){var e=f.pauseInvisible.getHiddenProp();if(e){var t=e.replace(/[H|h]idden/,"")+"visibilitychange";document.addEventListener(t,function(){f.pauseInvisible.isHidden()?n.startTimeout?clearTimeout(n.startTimeout):n.pause():n.started?n.play():n.vars.initDelay>0?setTimeout(n.play,n.vars.initDelay):n.play()})}},isHidden:function(){var e=f.pauseInvisible.getHiddenProp();return e?document[e]:!1},getHiddenProp:function(){var e=["webkit","moz","ms","o"];if("hidden"in document)return"hidden";for(var t=0;t<e.length;t++)if(e[t]+"Hidden"in document)return e[t]+"Hidden";return null}},setToClearWatchedEvent:function(){clearTimeout(c),c=setTimeout(function(){l=""},3e3)}},n.flexAnimate=function(e,t,a,s,o){if(n.vars.animationLoop||e===n.currentSlide||(n.direction=e>n.currentSlide?"next":"prev"),m&&1===n.pagingCount&&(n.direction=n.currentItem<e?"next":"prev"),!n.animating&&(n.canAdvance(e,o)||a)&&n.is(":visible")){if(m&&s){var l=$(n.vars.asNavFor).data("flexslider");if(n.atEnd=0===e||e===n.count-1,l.flexAnimate(e,!0,!1,!0,o),n.direction=n.currentItem<e?"next":"prev",l.direction=n.direction,Math.ceil((e+1)/n.visible)-1===n.currentSlide||0===e)return n.currentItem=e,n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),!1;n.currentItem=e,n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),e=Math.floor(e/n.visible)}if(n.animating=!0,n.animatingTo=e,t&&n.pause(),n.vars.before(n),n.syncExists&&!o&&f.sync("animate"),n.vars.controlNav&&f.controlNav.active(),v||n.slides.removeClass(i+"active-slide").eq(e).addClass(i+"active-slide"),n.atEnd=0===e||e===n.last,n.vars.directionNav&&f.directionNav.update(),e===n.last&&(n.vars.end(n),n.vars.animationLoop||n.pause()),p)r?(n.slides.eq(n.currentSlide).css({opacity:0,zIndex:1}),n.slides.eq(e).css({opacity:1,zIndex:2}),n.wrapup(c)):(n.slides.eq(n.currentSlide).css({zIndex:1}).animate({opacity:0},n.vars.animationSpeed,n.vars.easing),n.slides.eq(e).css({zIndex:2}).animate({opacity:1},n.vars.animationSpeed,n.vars.easing,n.wrapup));else{var c=d?n.slides.filter(":first").height():n.computedW,g,h,S;v?(g=n.vars.itemMargin,S=(n.itemW+g)*n.move*n.animatingTo,h=S>n.limit&&1!==n.visible?n.limit:S):h=0===n.currentSlide&&e===n.count-1&&n.vars.animationLoop&&"next"!==n.direction?u?(n.count+n.cloneOffset)*c:0:n.currentSlide===n.last&&0===e&&n.vars.animationLoop&&"prev"!==n.direction?u?0:(n.count+1)*c:u?(n.count-1-e+n.cloneOffset)*c:(e+n.cloneOffset)*c,n.setProps(h,"",n.vars.animationSpeed),n.transitions?(n.vars.animationLoop&&n.atEnd||(n.animating=!1,n.currentSlide=n.animatingTo),n.container.unbind("webkitTransitionEnd transitionend"),n.container.bind("webkitTransitionEnd transitionend",function(){clearTimeout(n.ensureAnimationEnd),n.wrapup(c)}),clearTimeout(n.ensureAnimationEnd),n.ensureAnimationEnd=setTimeout(function(){n.wrapup(c)},n.vars.animationSpeed+100)):n.container.animate(n.args,n.vars.animationSpeed,n.vars.easing,function(){n.wrapup(c)})}n.vars.smoothHeight&&f.smoothHeight(n.vars.animationSpeed)}},n.wrapup=function(e){p||v||(0===n.currentSlide&&n.animatingTo===n.last&&n.vars.animationLoop?n.setProps(e,"jumpEnd"):n.currentSlide===n.last&&0===n.animatingTo&&n.vars.animationLoop&&n.setProps(e,"jumpStart")),n.animating=!1,n.currentSlide=n.animatingTo,n.vars.after(n)},n.animateSlides=function(){!n.animating&&e&&n.flexAnimate(n.getTarget("next"))},n.pause=function(){clearInterval(n.animatedSlides),n.animatedSlides=null,n.playing=!1,n.vars.pausePlay&&f.pausePlay.update("play"),n.syncExists&&f.sync("pause")},n.play=function(){n.playing&&clearInterval(n.animatedSlides),n.animatedSlides=n.animatedSlides||setInterval(n.animateSlides,n.vars.slideshowSpeed),n.started=n.playing=!0,n.vars.pausePlay&&f.pausePlay.update("pause"),n.syncExists&&f.sync("play")},n.stop=function(){n.pause(),n.stopped=!0},n.canAdvance=function(e,t){var a=m?n.pagingCount-1:n.last;return t?!0:m&&n.currentItem===n.count-1&&0===e&&"prev"===n.direction?!0:m&&0===n.currentItem&&e===n.pagingCount-1&&"next"!==n.direction?!1:e!==n.currentSlide||m?n.vars.animationLoop?!0:n.atEnd&&0===n.currentSlide&&e===a&&"next"!==n.direction?!1:n.atEnd&&n.currentSlide===a&&0===e&&"next"===n.direction?!1:!0:!1},n.getTarget=function(e){return n.direction=e,"next"===e?n.currentSlide===n.last?0:n.currentSlide+1:0===n.currentSlide?n.last:n.currentSlide-1},n.setProps=function(e,t,a){var i=function(){var a=e?e:(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo,i=function(){if(v)return"setTouch"===t?e:u&&n.animatingTo===n.last?0:u?n.limit-(n.itemW+n.vars.itemMargin)*n.move*n.animatingTo:n.animatingTo===n.last?n.limit:a;switch(t){case"setTotal":return u?(n.count-1-n.currentSlide+n.cloneOffset)*e:(n.currentSlide+n.cloneOffset)*e;case"setTouch":return u?e:e;case"jumpEnd":return u?e:n.count*e;case"jumpStart":return u?n.count*e:e;default:return e}}();return-1*i+"px"}();n.transitions&&(i=d?"translate3d(0,"+i+",0)":"translate3d("+i+",0,0)",a=void 0!==a?a/1e3+"s":"0s",n.container.css("-"+n.pfx+"-transition-duration",a),n.container.css("transition-duration",a)),n.args[n.prop]=i,(n.transitions||void 0===a)&&n.container.css(n.args),n.container.css("transform",i)},n.setup=function(e){if(p)n.slides.css({width:"100%","float":"left",marginRight:"-100%",position:"relative"}),"init"===e&&(r?n.slides.css({opacity:0,display:"block",webkitTransition:"opacity "+n.vars.animationSpeed/1e3+"s ease",zIndex:1}).eq(n.currentSlide).css({opacity:1,zIndex:2}):0==n.vars.fadeFirstSlide?n.slides.css({opacity:0,display:"block",zIndex:1}).eq(n.currentSlide).css({zIndex:2}).css({opacity:1}):n.slides.css({opacity:0,display:"block",zIndex:1}).eq(n.currentSlide).css({zIndex:2}).animate({opacity:1},n.vars.animationSpeed,n.vars.easing)),n.vars.smoothHeight&&f.smoothHeight();else{var t,a;"init"===e&&(n.viewport=$('<div class="'+i+'viewport"></div>').css({overflow:"hidden",position:"relative"}).appendTo(n).append(n.container),n.cloneCount=0,n.cloneOffset=0,u&&(a=$.makeArray(n.slides).reverse(),n.slides=$(a),n.container.empty().append(n.slides))),n.vars.animationLoop&&!v&&(n.cloneCount=2,n.cloneOffset=1,"init"!==e&&n.container.find(".clone").remove(),n.container.append(f.uniqueID(n.slides.first().clone().addClass("clone")).attr("aria-hidden","true")).prepend(f.uniqueID(n.slides.last().clone().addClass("clone")).attr("aria-hidden","true"))),n.newSlides=$(n.vars.selector,n),t=u?n.count-1-n.currentSlide+n.cloneOffset:n.currentSlide+n.cloneOffset,d&&!v?(n.container.height(200*(n.count+n.cloneCount)+"%").css("position","absolute").width("100%"),setTimeout(function(){n.newSlides.css({display:"block"}),n.doMath(),n.viewport.height(n.h),n.setProps(t*n.h,"init")},"init"===e?100:0)):(n.container.width(200*(n.count+n.cloneCount)+"%"),n.setProps(t*n.computedW,"init"),setTimeout(function(){n.doMath(),n.newSlides.css({width:n.computedW,marginRight:n.computedM,"float":"left",display:"block"}),n.vars.smoothHeight&&f.smoothHeight()},"init"===e?100:0))}v||n.slides.removeClass(i+"active-slide").eq(n.currentSlide).addClass(i+"active-slide"),n.vars.init(n)},n.doMath=function(){var e=n.slides.first(),t=n.vars.itemMargin,a=n.vars.minItems,i=n.vars.maxItems;n.w=void 0===n.viewport?n.width():n.viewport.width(),n.h=e.height(),n.boxPadding=e.outerWidth()-e.width(),v?(n.itemT=n.vars.itemWidth+t,n.itemM=t,n.minW=a?a*n.itemT:n.w,n.maxW=i?i*n.itemT-t:n.w,n.itemW=n.minW>n.w?(n.w-t*(a-1))/a:n.maxW<n.w?(n.w-t*(i-1))/i:n.vars.itemWidth>n.w?n.w:n.vars.itemWidth,n.visible=Math.floor(n.w/n.itemW),n.move=n.vars.move>0&&n.vars.move<n.visible?n.vars.move:n.visible,n.pagingCount=Math.ceil((n.count-n.visible)/n.move+1),n.last=n.pagingCount-1,n.limit=1===n.pagingCount?0:n.vars.itemWidth>n.w?n.itemW*(n.count-1)+t*(n.count-1):(n.itemW+t)*n.count-n.w-t):(n.itemW=n.w,n.itemM=t,n.pagingCount=n.count,n.last=n.count-1),n.computedW=n.itemW-n.boxPadding,n.computedM=n.itemM},n.update=function(e,t){n.doMath(),v||(e<n.currentSlide?n.currentSlide+=1:e<=n.currentSlide&&0!==e&&(n.currentSlide-=1),n.animatingTo=n.currentSlide),n.vars.controlNav&&!n.manualControls&&("add"===t&&!v||n.pagingCount>n.controlNav.length?f.controlNav.update("add"):("remove"===t&&!v||n.pagingCount<n.controlNav.length)&&(v&&n.currentSlide>n.last&&(n.currentSlide-=1,n.animatingTo-=1),f.controlNav.update("remove",n.last))),n.vars.directionNav&&f.directionNav.update()},n.addSlide=function(e,t){var a=$(e);n.count+=1,n.last=n.count-1,d&&u?void 0!==t?n.slides.eq(n.count-t).after(a):n.container.prepend(a):void 0!==t?n.slides.eq(t).before(a):n.container.append(a),n.update(t,"add"),n.slides=$(n.vars.selector+":not(.clone)",n),n.setup(),n.vars.added(n)},n.removeSlide=function(e){var t=isNaN(e)?n.slides.index($(e)):e;n.count-=1,n.last=n.count-1,isNaN(e)?$(e,n.slides).remove():d&&u?n.slides.eq(n.last).remove():n.slides.eq(e).remove(),n.doMath(),n.update(t,"remove"),n.slides=$(n.vars.selector+":not(.clone)",n),n.setup(),n.vars.removed(n)},f.init()},$(window).blur(function(t){e=!1}).focus(function(t){e=!0}),$.flexslider.defaults={namespace:"flex-",selector:".slides > li",animation:"fade",easing:"swing",direction:"horizontal",reverse:!1,animationLoop:!0,smoothHeight:!1,startAt:0,slideshow:!0,slideshowSpeed:7e3,animationSpeed:600,initDelay:0,randomize:!1,fadeFirstSlide:!0,thumbCaptions:!1,pauseOnAction:!0,pauseOnHover:!1,pauseInvisible:!0,useCSS:!0,touch:!0,video:!1,controlNav:!0,directionNav:!0,prevText:"Previous",nextText:"Next",keyboard:!0,multipleKeyboard:!1,mousewheel:!1,pausePlay:!1,pauseText:"Pause",playText:"Play",controlsContainer:"",manualControls:"",customDirectionNav:"",sync:"",asNavFor:"",itemWidth:0,itemMargin:0,minItems:1,maxItems:0,move:0,allowOneSlide:!0,start:function(){},before:function(){},after:function(){},end:function(){},added:function(){},removed:function(){},init:function(){}},$.fn.flexslider=function(e){if(void 0===e&&(e={}),"object"==typeof e)return this.each(function(){var t=$(this),a=e.selector?e.selector:".slides > li",n=t.find(a);1===n.length&&e.allowOneSlide===!0||0===n.length?(n.fadeIn(400),e.start&&e.start(t)):void 0===t.data("flexslider")&&new $.flexslider(this,e)});var t=$(this).data("flexslider");switch(e){case"play":t.play();break;case"pause":t.pause();break;case"stop":t.stop();break;case"next":t.flexAnimate(t.getTarget("next"),!0);break;case"prev":case"previous":t.flexAnimate(t.getTarget("prev"),!0);break;default:"number"==typeof e&&t.flexAnimate(e,!0)}}}(jQuery);
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
deleted file mode 100644
index 1a1fcdd8..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/slides.min.jquery.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-* Slides, A Slideshow Plugin for jQuery
-* Intructions: http://slidesjs.com
-* By: Nathan Searles, http://nathansearles.com
-* Version: 1.1.9
-* Updated: September 5th, 2011
-*
-* 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.
-*/
-(function(a){a.fn.slides=function(b){return b=a.extend({},a.fn.slides.option,b),this.each(function(){function w(g,h,i){if(!p&&o){p=!0,b.animationStart(n+1);switch(g){case"next":l=n,k=n+1,k=e===k?0:k,r=f*2,g=-f*2,n=k;break;case"prev":l=n,k=n-1,k=k===-1?e-1:k,r=0,g=0,n=k;break;case"pagination":k=parseInt(i,10),l=a("."+b.paginationClass+" li."+b.currentClass+" a",c).attr("href").match("[^#/]+$"),k>l?(r=f*2,g=-f*2):(r=0,g=0),n=k}h==="fade"?b.crossfade?d.children(":eq("+k+")",c).css({zIndex:10}).fadeIn(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+l+")",c).css({display:"none",zIndex:0}),d.children(":eq("+k+")",c).css({zIndex:0}),b.animationComplete(k+1),p=!1)}):d.children(":eq("+l+")",c).fadeOut(b.fadeSpeed,b.fadeEasing,function(){b.autoHeight?d.animate({height:d.children(":eq("+k+")",c).outerHeight()},b.autoHeightSpeed,function(){d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing)}):d.children(":eq("+k+")",c).fadeIn(b.fadeSpeed,b.fadeEasing,function(){a.browser.msie&&a(this).get(0).style.removeAttribute("filter")}),b.animationComplete(k+1),p=!1}):(d.children(":eq("+k+")").css({left:r,display:"block"}),b.autoHeight?d.animate({left:g,height:d.children(":eq("+k+")").outerHeight()},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1}):d.animate({left:g},b.slideSpeed,b.slideEasing,function(){d.css({left:-f}),d.children(":eq("+k+")").css({left:f,zIndex:5}),d.children(":eq("+l+")").css({left:f,display:"none",zIndex:0}),b.animationComplete(k+1),p=!1})),b.pagination&&(a("."+b.paginationClass+" li."+b.currentClass,c).removeClass(b.currentClass),a("."+b.paginationClass+" li:eq("+k+")",c).addClass(b.currentClass))}}function x(){clearInterval(c.data("interval"))}function y(){b.pause?(clearTimeout(c.data("pause")),clearInterval(c.data("interval")),u=setTimeout(function(){clearTimeout(c.data("pause")),v=setInterval(function(){w("next",i)},b.play),c.data("interval",v)},b.pause),c.data("pause",u)):x()}a("."+b.container,a(this)).children().wrapAll('<div class="slides_control"/>');var c=a(this),d=a(".slides_control",c),e=d.children().size(),f=d.children().outerWidth(),g=d.children().outerHeight(),h=b.start-1,i=b.effect.indexOf(",")<0?b.effect:b.effect.replace(" ","").split(",")[0],j=b.effect.indexOf(",")<0?i:b.effect.replace(" ","").split(",")[1],k=0,l=0,m=0,n=0,o,p,q,r,s,t,u,v;if(e<2)return a("."+b.container,a(this)).fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()}),a("."+b.next+", ."+b.prev).fadeOut(0),!1;if(e<2)return;h<0&&(h=0),h>e&&(h=e-1),b.start&&(n=h),b.randomize&&d.randomize(),a("."+b.container,c).css({overflow:"hidden",position:"relative"}),d.children().css({position:"absolute",top:0,left:d.children().outerWidth(),zIndex:0,display:"none"}),d.css({position:"relative",width:f*3,height:g,left:-f}),a("."+b.container,c).css({display:"block"}),b.autoHeight&&(d.children().css({height:"auto"}),d.animate({height:d.children(":eq("+h+")").outerHeight()},b.autoHeightSpeed));if(b.preload&&d.find("img:eq("+h+")").length){a("."+b.container,c).css({background:"url("+b.preloadImage+") no-repeat 50% 50%"});var z=d.find("img:eq("+h+")").attr("src")+"?"+(new Date).getTime();a("img",c).parent().attr("class")!="slides_control"?t=d.children(":eq(0)")[0].tagName.toLowerCase():t=d.find("img:eq("+h+")"),d.find("img:eq("+h+")").attr("src",z).load(function(){d.find(t+":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){a(this).css({zIndex:5}),a("."+b.container,c).css({background:""}),o=!0,b.slidesLoaded()})})}else d.children(":eq("+h+")").fadeIn(b.fadeSpeed,b.fadeEasing,function(){o=!0,b.slidesLoaded()});b.bigTarget&&(d.children().css({cursor:"pointer"}),d.children().click(function(){return w("next",i),!1})),b.hoverPause&&b.play&&(d.bind("mouseover",function(){x()}),d.bind("mouseleave",function(){y()})),b.generateNextPrev&&(a("."+b.container,c).after('<a href="#" class="'+b.prev+'">Prev</a>'),a("."+b.prev,c).after('<a href="#" class="'+b.next+'">Next</a>')),a("."+b.next,c).click(function(a){a.preventDefault(),b.play&&y(),w("next",i)}),a("."+b.prev,c).click(function(a){a.preventDefault(),b.play&&y(),w("prev",i)}),b.generatePagination?(b.prependPagination?c.prepend("<ul class="+b.paginationClass+"></ul>"):c.append("<ul class="+b.paginationClass+"></ul>"),d.children().each(function(){a("."+b.paginationClass,c).append('<li><a href="#'+m+'">'+(m+1)+"</a></li>"),m++})):a("."+b.paginationClass+" li a",c).each(function(){a(this).attr("href","#"+m),m++}),a("."+b.paginationClass+" li:eq("+h+")",c).addClass(b.currentClass),a("."+b.paginationClass+" li a",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$"),n!=q&&w("pagination",j,q),!1}),a("a.link",c).click(function(){return b.play&&y(),q=a(this).attr("href").match("[^#/]+$")-1,n!=q&&w("pagination",j,q),!1}),b.play&&(v=setInterval(function(){w("next",i)},b.play),c.data("interval",v))})},a.fn.slides.option={preload:!1,preloadImage:"/img/loading.gif",container:"slides_container",generateNextPrev:!1,next:"next",prev:"prev",pagination:!0,generatePagination:!0,prependPagination:!1,paginationClass:"pagination",currentClass:"current",fadeSpeed:350,fadeEasing:"",slideSpeed:350,slideEasing:"",start:1,effect:"slide",crossfade:!1,randomize:!1,play:0,pause:0,hoverPause:!1,autoHeight:!1,autoHeightSpeed:350,bigTarget:!1,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}},a.fn.randomize=function(b){function c(){return Math.round(Math.random())-.5}return a(this).each(function(){var d=a(this),e=d.children(),f=e.length;if(f>1){e.hide();var g=[];for(i=0;i<f;i++)g[g.length]=i;g=g.sort(c),a.each(g,function(a,c){var f=e.eq(c),g=f.clone(!0);g.show().appendTo(d),b!==undefined&&b(f,g),f.remove()})}})}})(jQuery)
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/spacegallery.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/spacegallery.js
deleted file mode 100644
index 69ab2ccc..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/spacegallery.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/**
- *
- * Spacegallery
- * Author: Stefan Petre www.eyecon.ro
- * 
- */
-
-(function($){
-	EYE.extend({
-		
-		spacegallery: {
-			
-			//default options (many options are controled via CSS)
-			defaults: {
-				border: 6, // border arround the image
-				perspective: 140, // perpective height
-				minScale: 0.2, // minimum scale for the image in the back
-				duration: 800, // aimation duration
-				loadingClass: null, // CSS class applied to the element while looading images
-				before: function(){return false},
-				after: function(){return false}
-			},
-			
-			animated: false,
-			
-			//position images
-			positionImages: function(el) {
-				var top = 0;
-				EYE.spacegallery.animated = false;
-				$(el)
-					.find('a')
-						.removeClass(el.spacegalleryCfg.loadingClass)
-						.end()
-					.find('img')
-						.removeAttr('height')
-						.each(function(nr){
-							var newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * el.spacegalleryCfg.asins[nr];
-							$(this)
-								.css({
-									top: el.spacegalleryCfg.tops[nr] + 'px',
-									marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px',
-									opacity: 1 - el.spacegalleryCfg.asins[nr]
-								})
-								.attr('width', parseInt(newWidth));
-							this.spacegallery.next = el.spacegalleryCfg.asins[nr+1];
-							this.spacegallery.nextTop = el.spacegalleryCfg.tops[nr+1] - el.spacegalleryCfg.tops[nr];
-							this.spacegallery.origTop = el.spacegalleryCfg.tops[nr];
-							this.spacegallery.opacity = 1 - el.spacegalleryCfg.asins[nr];
-							this.spacegallery.increment = el.spacegalleryCfg.asins[nr] - this.spacegallery.next;
-							this.spacegallery.current = el.spacegalleryCfg.asins[nr];
-							this.spacegallery.width = newWidth;
-						})
-			},
-			
-			//animate to nex image
-			next: function(e) {
-				if (EYE.spacegallery.animated === false) {
-					EYE.spacegallery.animated = true;
-					var el = this.parentNode;
-					el.spacegalleryCfg.before.apply(el);
-					$(el)
-						.css('spacegallery', 0)
-						.animate({
-							spacegallery: 100
-						},{
-							easing: 'easeOut',
-							duration: el.spacegalleryCfg.duration,
-							complete: function() {
-								$(el)
-									.find('img:last')
-									.prependTo(el);
-								EYE.spacegallery.positionImages(el);
-								el.spacegalleryCfg.after.apply(el);
-							},
-							step: function(now) {
-								$('img', this)
-									.each(function(nr){
-										var newWidth, top, next;
-										if (nr + 1 == el.spacegalleryCfg.images) {
-											top = this.spacegallery.origTop + this.spacegallery.nextTop * 4 * now /100;
-											newWidth = this.spacegallery.width * top / this.spacegallery.origTop;
-											$(this)
-												.css({
-													top: top + 'px',
-													opacity: 0.7 - now/100,
-													marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-												})
-												.attr('width', newWidth);
-										} else {
-											next = this.spacegallery.current - this.spacegallery.increment * now /100;
-											newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * next;
-											$(this).css({
-												top: this.spacegallery.origTop + this.spacegallery.nextTop * now /100 + 'px',
-												opacity: 1 - next,
-												marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-											})
-											.attr('width', newWidth);
-										}
-									});
-							}
-						});
-				}
-					
-				this.blur();
-				return false;
-			},
-			
-			autoNext: function(el) {
-				
-				if (EYE.spacegallery.animated === false) {
-					EYE.spacegallery.animated = true;
-					el.spacegalleryCfg.before.apply(el); // run the "before" function
-					$(el)
-						.css('spacegallery', 0)
-						.animate({
-							spacegallery: 100
-						},{
-							easing: 'easeOut',
-							duration: el.spacegalleryCfg.duration,
-							complete: function() { // after animation is complete, move the front image to the back
-								$(el)
-									.find('img:last') // find the last image in this div
-									.prependTo(el); // and stick it at the beginning
-								EYE.spacegallery.positionImages(el); // run "position images"
-								el.spacegalleryCfg.after.apply(el); //run the "after" function
-							},
-							step: function(now) {
-								$('img', this)
-									.each(function(nr){
-										var newWidth, top, next;
-										if (nr + 1 == el.spacegalleryCfg.images) {
-											top = this.spacegallery.origTop + this.spacegallery.nextTop * 4 * now /100;
-											newWidth = this.spacegallery.width * top / this.spacegallery.origTop;
-											$(this)
-												.css({
-													top: top + 'px',
-													opacity: 0.7 - now/100,
-													marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-												})
-												.attr('width', newWidth);
-										} else {
-											next = this.spacegallery.current - this.spacegallery.increment * now /100;
-											newWidth = this.spacegallery.origWidth - (this.spacegallery.origWidth - this.spacegallery.origWidth * el.spacegalleryCfg.minScale) * next;
-											$(this).css({
-												top: this.spacegallery.origTop + this.spacegallery.nextTop * now /100 + 'px',
-												opacity: 1 - next,
-												marginLeft: - parseInt((newWidth + el.spacegalleryCfg.border)/2, 10) + 'px'
-											})
-											.attr('width', newWidth);
-										}
-									});
-							}
-						});
-				}
-					
-				return false;
-			},
-			
-			//constructor
-			init: function(opt) {
-				opt = $.extend({}, EYE.spacegallery.defaults, opt||{});
-				return this.each(function(){
-					var el = this;
-					if ($(el).is('.spacegallery')) {
-						$('<a href="#"></a>')
-							.appendTo(this)
-							.addClass(opt.loadingClass)
-							.bind('click', EYE.spacegallery.next);
-						el.spacegalleryCfg = opt;
-						el.spacegalleryCfg.images = el.getElementsByTagName('img').length;
-						el.spacegalleryCfg.loaded = 0;
-						el.spacegalleryCfg.asin = Math.asin(1);
-						el.spacegalleryCfg.asins = {};
-						el.spacegalleryCfg.tops = {};
-						el.spacegalleryCfg.increment = parseInt(el.spacegalleryCfg.perspective/el.spacegalleryCfg.images, 10);
-						var top = 0;
-						$('img', el)
-							.each(function(nr){
-								var imgEl = new Image();
-								var elImg = this;
-								el.spacegalleryCfg.asins[nr] = 1 - Math.asin((nr+1)/el.spacegalleryCfg.images)/el.spacegalleryCfg.asin;
-								top += el.spacegalleryCfg.increment - el.spacegalleryCfg.increment * el.spacegalleryCfg.asins[nr];
-								el.spacegalleryCfg.tops[nr] = top;
-								elImg.spacegallery = {};
-								imgEl.src = this.src;
-								if (imgEl.complete) {
-									el.spacegalleryCfg.loaded ++;
-									elImg.spacegallery.origWidth = imgEl.width;
-									elImg.spacegallery.origHeight = imgEl.height
-								} else {
-									imgEl.onload = function() {
-										el.spacegalleryCfg.loaded ++;
-										elImg.spacegallery.origWidth = imgEl.width;
-										elImg.spacegallery.origHeight = imgEl.height
-										if (el.spacegalleryCfg.loaded == el.spacegalleryCfg.images) {
-										
-											EYE.spacegallery.positionImages(el);
-										}
-									};
-								}
-							});
-						el.spacegalleryCfg.asins[el.spacegalleryCfg.images] = el.spacegalleryCfg.asins[el.spacegalleryCfg.images - 1] * 1.3;
-						el.spacegalleryCfg.tops[el.spacegalleryCfg.images] = el.spacegalleryCfg.tops[el.spacegalleryCfg.images - 1] * 1.3;
-						if (el.spacegalleryCfg.loaded == el.spacegalleryCfg.images) {
-							EYE.spacegallery.positionImages(el);
-							setInterval(function() { EYE.spacegallery.autoNext(el); }, 4000);
-						}
-					}
-				});
-			}
-		}
-	});
-	
-	$.fn.extend({
-	
-		/**
-		 * Create a space gallery
-		 * @name spacegallery
-		 * @description create a space gallery
-		 * @option	int			border			Images' border. Default: 6
-		 * @option	int			perspective		Perpective height. Default: 140
-		 * @option	float		minScale		Minimum scale for the image in the back. Default: 0.2
-		 * @option	int			duration		Animation duration. Default: 800
-		 * @option	string		loadingClass	CSS class applied to the element while looading images. Default: null
-		 * @option	function	before			Callback function triggered before going to the next image
-		 * @option	function	after			Callback function triggered after going to the next image
-		 */
-		spacegallery: EYE.spacegallery.init
-	});
-	$.extend($.easing,{
-		easeOut:function (x, t, b, c, d) {
-			return -c *(t/=d)*(t-2) + b;
-		}
-	});
-})(jQuery);
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/utils.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/utils.js
deleted file mode 100644
index d9be8532..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/js/utils.js
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- *
- * Utilities
- * Author: Stefan Petre www.eyecon.ro
- * 
- */
-(function($) {
-EYE.extend({
-	getPosition : function(e, forceIt)
-	{
-		var x = 0;
-		var y = 0;
-		var es = e.style;
-		var restoreStyles = false;
-		if (forceIt && jQuery.curCSS(e,'display') == 'none') {
-			var oldVisibility = es.visibility;
-			var oldPosition = es.position;
-			restoreStyles = true;
-			es.visibility = 'hidden';
-			es.display = 'block';
-			es.position = 'absolute';
-		}
-		var el = e;
-		if (el.getBoundingClientRect) { // IE
-			var box = el.getBoundingClientRect();
-			x = box.left + Math.max(document.documentElement.scrollLeft, document.body.scrollLeft) - 2;
-			y = box.top + Math.max(document.documentElement.scrollTop, document.body.scrollTop) - 2;
-		} else {
-			x = el.offsetLeft;
-			y = el.offsetTop;
-			el = el.offsetParent;
-			if (e != el) {
-				while (el) {
-					x += el.offsetLeft;
-					y += el.offsetTop;
-					el = el.offsetParent;
-				}
-			}
-			if (jQuery.browser.safari && jQuery.curCSS(e, 'position') == 'absolute' ) {
-				x -= document.body.offsetLeft;
-				y -= document.body.offsetTop;
-			}
-			el = e.parentNode;
-			while (el && el.tagName.toUpperCase() != 'BODY' && el.tagName.toUpperCase() != 'HTML') 
-			{
-				if (jQuery.curCSS(el, 'display') != 'inline') {
-					x -= el.scrollLeft;
-					y -= el.scrollTop;
-				}
-				el = el.parentNode;
-			}
-		}
-		if (restoreStyles == true) {
-			es.display = 'none';
-			es.position = oldPosition;
-			es.visibility = oldVisibility;
-		}
-		return {x:x, y:y};
-	},
-	getSize : function(e)
-	{
-		var w = parseInt(jQuery.curCSS(e,'width'), 10);
-		var h = parseInt(jQuery.curCSS(e,'height'), 10);
-		var wb = 0;
-		var hb = 0;
-		if (jQuery.curCSS(e, 'display') != 'none') {
-			wb = e.offsetWidth;
-			hb = e.offsetHeight;
-		} else {
-			var es = e.style;
-			var oldVisibility = es.visibility;
-			var oldPosition = es.position;
-			es.visibility = 'hidden';
-			es.display = 'block';
-			es.position = 'absolute';
-			wb = e.offsetWidth;
-			hb = e.offsetHeight;
-			es.display = 'none';
-			es.position = oldPosition;
-			es.visibility = oldVisibility;
-		}
-		return {w:w, h:h, wb:wb, hb:hb};
-	},
-	getClient : function(e)
-	{
-		var h, w;
-		if (e) {
-			w = e.clientWidth;
-			h = e.clientHeight;
-		} else {
-			var de = document.documentElement;
-			w = window.innerWidth || self.innerWidth || (de&&de.clientWidth) || document.body.clientWidth;
-			h = window.innerHeight || self.innerHeight || (de&&de.clientHeight) || document.body.clientHeight;
-		}
-		return {w:w,h:h};
-	},
-	getScroll : function (e)
-	{
-		var t=0, l=0, w=0, h=0, iw=0, ih=0;
-		if (e && e.nodeName.toLowerCase() != 'body') {
-			t = e.scrollTop;
-			l = e.scrollLeft;
-			w = e.scrollWidth;
-			h = e.scrollHeight;
-		} else  {
-			if (document.documentElement) {
-				t = document.documentElement.scrollTop;
-				l = document.documentElement.scrollLeft;
-				w = document.documentElement.scrollWidth;
-				h = document.documentElement.scrollHeight;
-			} else if (document.body) {
-				t = document.body.scrollTop;
-				l = document.body.scrollLeft;
-				w = document.body.scrollWidth;
-				h = document.body.scrollHeight;
-			}
-			if (typeof pageYOffset != 'undefined') {
-				t = pageYOffset;
-				l = pageXOffset;
-			}
-			iw = self.innerWidth||document.documentElement.clientWidth||document.body.clientWidth||0;
-			ih = self.innerHeight||document.documentElement.clientHeight||document.body.clientHeight||0;
-		}
-		return { t: t, l: l, w: w, h: h, iw: iw, ih: ih };
-	},
-	getMargins : function(e, toInteger)
-	{
-		var t = jQuery.curCSS(e,'marginTop') || '';
-		var r = jQuery.curCSS(e,'marginRight') || '';
-		var b = jQuery.curCSS(e,'marginBottom') || '';
-		var l = jQuery.curCSS(e,'marginLeft') || '';
-		if (toInteger)
-			return {
-				t: parseInt(t, 10)||0,
-				r: parseInt(r, 10)||0,
-				b: parseInt(b, 10)||0,
-				l: parseInt(l, 10)
-			};
-		else
-			return {t: t, r: r,	b: b, l: l};
-	},
-	getPadding : function(e, toInteger)
-	{
-		var t = jQuery.curCSS(e,'paddingTop') || '';
-		var r = jQuery.curCSS(e,'paddingRight') || '';
-		var b = jQuery.curCSS(e,'paddingBottom') || '';
-		var l = jQuery.curCSS(e,'paddingLeft') || '';
-		if (toInteger)
-			return {
-				t: parseInt(t, 10)||0,
-				r: parseInt(r, 10)||0,
-				b: parseInt(b, 10)||0,
-				l: parseInt(l, 10)
-			};
-		else
-			return {t: t, r: r,	b: b, l: l};
-	},
-	getBorder : function(e, toInteger)
-	{
-		var t = jQuery.curCSS(e,'borderTopWidth') || '';
-		var r = jQuery.curCSS(e,'borderRightWidth') || '';
-		var b = jQuery.curCSS(e,'borderBottomWidth') || '';
-		var l = jQuery.curCSS(e,'borderLeftWidth') || '';
-		if (toInteger)
-			return {
-				t: parseInt(t, 10)||0,
-				r: parseInt(r, 10)||0,
-				b: parseInt(b, 10)||0,
-				l: parseInt(l, 10)||0
-			};
-		else
-			return {t: t, r: r,	b: b, l: l};
-	},
-	traverseDOM : function(nodeEl, func)
-	{
-		func(nodeEl);
-		nodeEl = nodeEl.firstChild;
-		while(nodeEl){
-			EYE.traverseDOM(nodeEl, func);
-			nodeEl = nodeEl.nextSibling;
-		}
-	},
-	getInnerWidth :  function(el, scroll) {
-		var offsetW = el.offsetWidth;
-		return scroll ? Math.max(el.scrollWidth,offsetW) - offsetW + el.clientWidth:el.clientWidth;
-	},
-	getInnerHeight : function(el, scroll) {
-		var offsetH = el.offsetHeight;
-		return scroll ? Math.max(el.scrollHeight,offsetH) - offsetH + el.clientHeight:el.clientHeight;
-	},
-	getExtraWidth : function(el) {
-		if($.boxModel)
-			return (parseInt($.curCSS(el, 'paddingLeft'))||0)
-				+ (parseInt($.curCSS(el, 'paddingRight'))||0)
-				+ (parseInt($.curCSS(el, 'borderLeftWidth'))||0)
-				+ (parseInt($.curCSS(el, 'borderRightWidth'))||0);
-		return 0;
-	},
-	getExtraHeight : function(el) {
-		if($.boxModel)
-			return (parseInt($.curCSS(el, 'paddingTop'))||0)
-				+ (parseInt($.curCSS(el, 'paddingBottom'))||0)
-				+ (parseInt($.curCSS(el, 'borderTopWidth'))||0)
-				+ (parseInt($.curCSS(el, 'borderBottomWidth'))||0);
-		return 0;
-	},
-	isChildOf: function(parentEl, el, container) {
-		if (parentEl == el) {
-			return true;
-		}
-		if (!el || !el.nodeType || el.nodeType != 1) {
-			return false;
-		}
-		if (parentEl.contains && !$.browser.safari) {
-			return parentEl.contains(el);
-		}
-		if ( parentEl.compareDocumentPosition ) {
-			return !!(parentEl.compareDocumentPosition(el) & 16);
-		}
-		var prEl = el.parentNode;
-		while(prEl && prEl != container) {
-			if (prEl == parentEl)
-				return true;
-			prEl = prEl.parentNode;
-		}
-		return false;
-	},
-	centerEl : function(el, axis)
-	{
-		var clientScroll = EYE.getScroll();
-		var size = EYE.getSize(el);
-		if (!axis || axis == 'vertically')
-			$(el).css(
-				{
-					top: clientScroll.t + ((Math.min(clientScroll.h,clientScroll.ih) - size.hb)/2) + 'px'
-				}
-			);
-		if (!axis || axis == 'horizontally')
-			$(el).css(
-				{
-					left: clientScroll.l + ((Math.min(clientScroll.w,clientScroll.iw) - size.wb)/2) + 'px'
-				}
-			);
-	}
-});
-if (!$.easing.easeout) {
-	$.easing.easeout = function(p, n, firstNum, delta, duration) {
-		return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
-	};
-}
-	
-})(jQuery);
-\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
deleted file mode 100644
index 3bbaf5ee..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/bkgd.png
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
deleted file mode 100644
index e79a0515..00000000
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/static/fusion/sample/org_chart/images/raspberry.jpg
+++ /dev/null
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
index 2face03a..913c9de1 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuService.java
@@ -42,7 +42,7 @@ public interface FnMenuService {
 	List<Long> getParentId(String label);
 	@SuppressWarnings("rawtypes")
 	List<List> getParentList();
-	List<RoleFunction> getFunctionCDList(HttpServletRequest request);
+	List<RoleFunction> getFunctionCDList(HttpServletRequest request) throws Exception;
 	void removeMenuItem(Menu domainFnMenu);
 	Map<String, List<MenuData>> setMenuDataStructure(List<List<MenuData>> childItemList, List<MenuData> parentList, Set<MenuData> menuResult) throws Exception;
 }
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
index 9b16aabb..22bc9675 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/FnMenuServiceImpl.java
@@ -31,12 +31,16 @@ import javax.servlet.http.HttpServletRequest;
 import org.openecomp.portalsdk.core.domain.Menu;
 import org.openecomp.portalsdk.core.domain.MenuData;
 import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
+
 /**
  * Description: this java class is an implementation of services for  Admin to add/edit/delete menu items from FN_MENU
  */
@@ -51,7 +55,7 @@ public class FnMenuServiceImpl implements FnMenuService{
 	private DataAccessService  dataAccessService;
 	
 	@Autowired
-	private RoleService roleService;
+	private RestApiRequestBuilder restApiRequestBuilder;
 	
 	@SuppressWarnings("unchecked")	
 	public List<MenuData> getFnMenuItems() {
@@ -104,10 +108,18 @@ public class FnMenuServiceImpl implements FnMenuService{
 	
 	@SuppressWarnings("unchecked")
 	@Override
-	public List<RoleFunction> getFunctionCDList(HttpServletRequest request) {
-		Set roleFunctionList = new HashSet<>();
-		roleFunctionList = UserUtils.getRoleFunctions(request);
-		List roleFunctionFinalList = new ArrayList<>(roleFunctionList);
+	public List<RoleFunction> getFunctionCDList(HttpServletRequest request) throws Exception {
+		User user = UserUtils.getUserSession(request);
+		ObjectMapper mapper = new ObjectMapper();
+		List roleFunctionFinalList = new ArrayList<>();
+		try {
+			String menuList = restApiRequestBuilder.getViaREST("/menuFunctions", true, user.getOrgUserId());
+			roleFunctionFinalList = mapper.readValue(menuList,
+					TypeFactory.defaultInstance().constructCollectionType(List.class, String.class));
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveRole Failed", e);
+			throw new Exception(e.getMessage());
+		}
 		return roleFunctionFinalList;
 	}
 
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/openecomp/portalsdk/core/onboarding/rest/RestWebServiceClient.java b/ecomp-sdk/epsdk-fw/src/main/java/org/openecomp/portalsdk/core/onboarding/rest/RestWebServiceClient.java
index fa7a1478..9a1ea9fb 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/openecomp/portalsdk/core/onboarding/rest/RestWebServiceClient.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/openecomp/portalsdk/core/onboarding/rest/RestWebServiceClient.java
@@ -361,7 +361,10 @@ public class RestWebServiceClient {
 
 		con.setDoInput(true);
 		con.setDoOutput(true);
+		if( content != null)
+		{
 		con.getOutputStream().write(content.getBytes());
+		}
 		con.getOutputStream().flush();
 		con.getOutputStream().close();
 
@@ -456,7 +459,10 @@ public class RestWebServiceClient {
 
 		con.setDoInput(true);
 		con.setDoOutput(true);
+		if( content != null)
+		{
 		con.getOutputStream().write(content.getBytes());
+		}
 		con.getOutputStream().flush();
 		con.getOutputStream().close();
author	st782s <statta@research.att.com>	2017-08-14 11:41:04 -0400
committer	st782s <statta@research.att.com>	2017-08-15 14:07:15 -0400
commit	a2f5a35c06a526b05e4efd9fe275d6639bf22cd3 (patch)
tree	75e423e367598929f54345359b3851e48ae9cd68
parent	3159458ff8563771a5460839fd75bdc25159ea87 (diff)