X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fwebapp%2FWEB-INF%2Ffusion%2Form%2FEP.hbm.xml;h=5b8fd99e0b8ecb875389a013ca4bb8863633e2f4;hb=951f1d217b3f1eea051bfd28f093c1c0db945e62;hp=eea9467aa0713b86c7057e2f51c38ed7df54dc03;hpb=99565bb6bd87cfc46591cea73985c58c3a3697dd;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
index eea9467a..5b8fd99e 100644
--- a/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
+++ b/ecomp-portal-BE-common/src/main/webapp/WEB-INF/fusion/orm/EP.hbm.xml
@@ -1,29 +1,70 @@
 <?xml version="1.0"?>
 <!--
-  ================================================================================
-  ECOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+ 
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the "License");
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
+ 
+              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.
-  ================================================================================
+ 
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+              https://creativecommons.org/licenses/by/4.0/
+ 
+  Unless required by applicable law or agreed to in writing, documentation
+  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.
+ 
+  ============LICENSE_END============================================
+ 
+  
   -->
 <!DOCTYPE hibernate-mapping PUBLIC
         "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!-- Publishes mappings and queries specific to the ECOMP Portal application. -->
-<hibernate-mapping package="org.openecomp.portalapp.portal.domain">
+<!-- Publishes mappings and queries specific to the ONAP Portal application. -->
+<hibernate-mapping package="org.onap.portalapp.portal.domain">
+
+	<!-- multilanguage -->
+	<class name="Language" table="fn_language">
+		<id name="languageId" column="language_id">
+			<generator class="native">
+				<param name="sequence"></param>
+			</generator>
+		</id>
+		<property name="languageName" column="language_name" />
+		<property name="languageAlias" column="language_alias" />
+	</class>
+	
+	<class name="DisplayText" table="fn_display_text">
+		<id name="id" column="id">
+			<generator class="native">
+				<param name="sequence"></param>
+			</generator>
+		</id>
+		
+		<property name="languageId" column="language_id" />
+		<property name="textId" column="text_id" />
+		<property name="label" column="text_label" />
+	</class>
 
 	<!-- Widget class mapping details -->
 	<class name="Widget" table="FN_WIDGET">
@@ -177,6 +218,7 @@
 		<property name="jobTitle" column="job_title" />
 		<property name="siloStatus" column="silo_status" />
 		<property name="financialLocCode" column="fin_loc_code" />
+		<property name="costCenter" column="cost_center" />
 
 		<property name="active" column="active_yn" type="yes_no" />
 		<property name="internal" column="is_internal_yn" type="yes_no" />
@@ -187,11 +229,13 @@
 		<property name="createdId" column="created_id" />
 		<property name="modifiedId" column="modified_id" />
 		<property name="timeZoneId" column="timezone" />
+		<property name="systemUser" column="is_system_user" type="yes_no"/>
+		<property name="languageId" column="language_id" />
 
 		<set name="EPUserApps" table="FN_USER_ROLE" lazy="false" sort="natural"
 			inverse="true">
 			<key column="user_id" />
-			<one-to-many class="org.openecomp.portalapp.portal.domain.EPUserApp" />
+			<one-to-many class="org.onap.portalapp.portal.domain.EPUserApp" />
 		</set>
 
 	</class>
@@ -264,12 +308,12 @@
 				<column name="user_id" precision="11" scale="0" />
 			</key-property>
 			<key-many-to-one name="app"
-				class="org.openecomp.portalapp.portal.domain.EPApp" column="app_id" />
+				class="org.onap.portalapp.portal.domain.EPApp" column="app_id" />
 			<key-many-to-one name="role"
-				class="org.openecomp.portalapp.portal.domain.EPRole" column="role_id" />
+				class="org.onap.portalapp.portal.domain.EPRole" column="role_id" />
 		</composite-id>
-		<property name="priority" type="java.lang.Short">
-			<column name="priority" precision="4" scale="0" />
+		<property name="priority">
+			<column name="priority" default="1" precision="4" scale="0" />
 		</property>
 	</class>
 
@@ -284,10 +328,10 @@
 			<column name="app_name" not-null="true" default="?"></column>
 		</property>
 		<property name="imageUrl" column="app_image_url" />
-		<property name="description" column="app_description" />
-		<property name="notes" column="app_notes" />
-		<property name="url" column="app_url" />
-		<property name="alternateUrl" column="app_alternate_url" />
+		<property name="appDescription" column="app_description" />
+		<property name="appNotes" column="app_notes" />
+		<property name="landingPage" column="app_url" />
+		<property name="alternateLandingPage" column="app_alternate_url" />
 		<property name="appRestEndpoint" column="app_rest_endpoint" />
 		<property name="mlAppName" type="string">
 			<column name="ml_app_name" not-null="true" default="?"></column>
@@ -296,11 +340,11 @@
 			<column name="ml_app_admin_id" not-null="true" default="?"></column>
 		</property>
 		<property name="motsId" column="mots_id" />
-		<property name="appPassword" type="string">
+		<property name="appBasicAuthPassword" type="string">
 			<column name="app_password" not-null="true" default="?"></column>
 		</property>
 		<property name="thumbnail" column="thumbnail" />
-		<property name="username" type="string">
+		<property name="appBasicAuthUsername" type="string">
 			<column name="app_username" not-null="true" default="?"></column>
 		</property>
 		<property name="open" type="yes_no">
@@ -321,6 +365,21 @@
 		<property name="appType" type="integer">
 			<column name="app_type"></column>
 		</property>
+		<property name="rolesInAAF" type="yes_no">
+			<column name="auth_central"></column>
+		</property>
+		<property name="nameSpace" type="string">
+			<column name="auth_namespace"></column>
+		</property>
+		<property name="modeOfIntegration" type="string">
+			<column name="mode_of_integration"></column>
+		</property>
+		<property name="appAck" type="yes_no">
+			<column name="ack_app"></column>
+		</property>
+		<property name="usesCadi" type="yes_no">
+			<column name="uses_cadi"></column>
+		</property>
 
 		<one-to-one name="contactUs" class="AppContactUs" cascade="save-update"></one-to-one>
 
@@ -366,7 +425,7 @@
 	</class>
 
 	<!-- User Role class mapping details -->
-	<class name="EPRole" table="FN_ROLE">
+	<class name="EPRole" table="FN_ROLE" >
 		<id name="id" column="role_id">
 			<generator class="native">
 				<param name="sequence">seq_fn_role</param>
@@ -385,21 +444,21 @@
 			sort="natural">
 			<key column="role_id" />
 			<many-to-many column="function_cd"
-				class="org.openecomp.portalsdk.core.domain.RoleFunction" />
+				class="org.onap.portalsdk.core.domain.RoleFunction" />
 		</set>
 
 		<set name="childRoles" table="FN_ROLE_COMPOSITE" lazy="false"
 			sort="natural">
 			<key column="parent_role_id" />
 			<many-to-many column="child_role_id"
-				class="org.openecomp.portalapp.portal.domain.EPRole" />
+				class="org.onap.portalapp.portal.domain.EPRole" />
 		</set>
 
 		<set name="parentRoles" table="FN_ROLE_COMPOSITE" lazy="false"
 			sort="natural">
 			<key column="child_role_id" />
 			<many-to-many column="parent_role_id"
-				class="org.openecomp.portalapp.portal.domain.EPRole" />
+				class="org.onap.portalapp.portal.domain.EPRole" />
 		</set>
 
 	</class>
@@ -433,6 +492,30 @@
 		<property name="statusCode" column="status_cd" />
 	</class>
 
+	<!-- EPAppRoleFunction class mapping details -->
+	<class name="EPAppRoleFunction" table="ep_app_role_function">
+		<id name="id" column="id">
+			<generator class="native">
+				<param name="property">seq_epp_app_role_func</param>
+			</generator>
+		</id>
+		<property name="roleId" column="role_id"></property>
+		<property name="appId" column="app_id"></property>
+		<property name="code" column="function_cd"></property>
+		<property name="roleAppId" column="role_app_id"></property>
+	</class>
+
+	<!-- CentralRoleFunction class mapping details -->
+	<class name="CentralV2RoleFunction" table="ep_app_function">
+		<composite-id>
+			<key-property name="appId" 
+				column="app_id" />
+			<key-property name="code" 
+				column="function_cd" />
+		</composite-id>
+		<property name="name" column="function_name" />
+	</class>
+
 	<class name="PersUserWidgetSelection" table="ep_pers_user_widget_sel">
 		<id name="id" column="id">
 			<generator class="native">
@@ -461,7 +544,7 @@
 			lazy="false" cascade="save-update, persist" inverse="true" fetch="select">
 			<key column="req_id" />
 			<one-to-many
-				class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequestDetail" />
+				class="org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail" />
 		</set>
 	</class>
 
@@ -475,11 +558,36 @@
 		<property name="reqRoleId" column="requested_role_id" />
 		<property name="reqType" column="request_type" />
 		<many-to-one name="epRequestIdData" fetch="select"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest">
+			class="org.onap.portalapp.portal.domain.EPUserAppRolesRequest">
 			<column name="req_id" not-null="true" />
 		</many-to-one>
 	</class>
 
+	<!-- multilanguage -->
+	<query name="queryLanguage">
+		<![CDATA[
+			from Language
+		]]>
+	</query>
+	
+	<query name="displayText">
+		<![CDATA[
+			from DisplayText where languageId = :language_id
+		]]>
+	</query>
+	
+	<query name="queryLanguageByLanguageId">
+		<![CDATA[
+			from Language where languageId = :language_id
+		]]>
+	</query>
+	
+	<query name="getActiveUsersForApp">
+		<![CDATA[
+			select distinct(u) from EPUser as u inner join fetch u.EPUserApps as apps inner join fetch apps.app as app inner join fetch apps.role as role where app.id = :id and u.active = :active and role.id is not null
+		]]>
+	</query>
+
 	<!-- show the current user plus related users -->
 	<sql-query name="relatedUsers">
 		<return-scalar column="org_user_id" type="java.lang.String" />
@@ -504,7 +612,7 @@
 	<!-- requires values for named parameters :searchQuery and :userId -->
 	<sql-query name="searchPortal">
 		<return alias="searchResult"
-			class="org.openecomp.portalapp.portal.ecomp.model.SearchResultItem" />
+			class="org.onap.portalapp.portal.ecomp.model.SearchResultItem" />
 		<![CDATA[
 			select @rn /*'*/:=/*'*/ @rn+1 AS rowId, CATEGORY, NAME, UUID, TARGET from
 				( (
@@ -513,7 +621,15 @@
 				upper( :searchQuery ) != ''
 				and (upper(first_name) like upper(CONCAT('%', :searchQuery, '%'))
 				or upper(last_name) like upper(CONCAT('%', :searchQuery, '%'))
-				or upper(org_user_id) like upper(CONCAT('%', :searchQuery, '%')))
+				or upper(org_user_id) like upper(CONCAT('%', :searchQuery, '%'))
+				or 
+		        ((first_name LIKE (SELECT concat('%',trim(SUBSTRING(:searchQuery, 1, INSTR(:searchQuery,' '))),'%'))
+		        AND
+		       last_name LIKE (concat('%',(SELECT(SUBSTRING(:searchQuery, INSTR(:searchQuery,' ')+1, LENGTH(:searchQuery)))),'%')))
+		        OR
+		       (last_name LIKE (SELECT concat('%',trim(SUBSTRING(:searchQuery, 1, INSTR(:searchQuery,' '))),'%'))
+		         AND
+		       first_name LIKE (concat('%',(SELECT(SUBSTRING(:searchQuery, INSTR(:searchQuery,' ')+1, LENGTH(:searchQuery)))),'%')))))
 				and  upper(active_yn) = 'Y'
 				)
 				union
@@ -610,19 +726,19 @@
 	<!-- requires values for named parameters :searchQuery and :userId -->
 	<sql-query name="getNotifications">
 		<return alias="notificationResult"
-			class="org.openecomp.portalapp.portal.transport.EpNotificationItem" />
+			class="org.onap.portalapp.portal.transport.EpNotificationItem" />
 		<![CDATA[
-			select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID, active_YN from
+			select @rn /*'*/:=/*'*/ @rn+1 AS rowId, notification_ID, is_for_online_users,is_for_all_roles, msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, creator_ID,notification_hyperlink, active_YN from
 			( 
 			
-			select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,active_YN
+			select notification_ID, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority,created_date, creator_ID,notification_hyperlink,active_YN
 			from
 				(
-				select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+				select user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
 				from
 				(
 				select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
-					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,b.role_id,b.recv_user_id 
+					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date,b.role_id,b.recv_user_id 
 				from ep_notification a, ep_role_notification b
 				where a.notification_id = b.notification_id
 				and (end_time is null ||  SYSDATE() <= end_time )
@@ -643,11 +759,11 @@
 				a.role_id = b.role_id
 				)
 				union
-				select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+				select :user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description,msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
 				from
 				(
 				select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
-					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, b.role_id,b.recv_user_id 
+					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, a.notification_hyperlink,b.role_id,b.recv_user_id 
 				from ep_notification a, ep_role_notification b
 				where a.notification_id = b.notification_id
 				and (end_time is null ||  SYSDATE() <= end_time )
@@ -660,7 +776,7 @@
 				)
 				union
 				(
-				select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date, creator_ID,active_YN
+				select :user_id user_id, notification_id, is_for_online_users, is_for_all_roles, msg_header, msg_description, msg_source,start_Time, end_time, priority, created_date,notification_hyperlink, creator_ID,active_YN
 				from ep_notification a
 				where a.notification_id
 				and (end_time is null ||  SYSDATE() <= end_time )
@@ -684,9 +800,8 @@
 		]]>
 
 	</sql-query>
-	
 		<sql-query name="getUsersByOrgIdsNotifications">
-		<return alias="getUsersByOrgIdsNotificationsResult" class="org.openecomp.portalapp.portal.domain.EPUser"/>
+		<return alias="getUsersByOrgIdsNotificationsResult" class="org.onap.portalapp.portal.domain.EPUser"/>
 		<![CDATA[
 			SELECT * from fn_user where org_user_id in (:OrgIds)
 		]]>
@@ -697,7 +812,7 @@
 	<!-- Gets all Admin notification history; accepts no parameters -->
 	<sql-query name="getAdminNotificationHistoryVO">
 		<return alias="adminNotificationHistoryVOResult"
-			class="org.openecomp.portalapp.portal.transport.EpNotificationItemVO" /> 
+			class="org.onap.portalapp.portal.transport.EpNotificationItemVO" /> 
 		<![CDATA[
 		SELECT * from (
 SELECT 
@@ -713,6 +828,7 @@ SELECT
 			n.priority,
 			n.creator_ID AS creatorId,
 			n.created_date AS createdDate, 
+			n.notification_hyperlink AS notificationHyperlink,
 			u.org_user_id AS loginId
 		FROM 
 			ep_notification n 
@@ -736,6 +852,7 @@ SELECT
 			n.priority,
 			n.creator_ID AS creatorId,
 			n.created_date AS createdDate, 
+			n.notification_hyperlink AS notificationHyperlink,
 			u.org_user_id AS loginId
 		FROM 
 			ep_notification n 
@@ -751,7 +868,7 @@ SELECT
 
 	<sql-query name="getEpNotificationAppRoles">
 		<return alias="notificationAppRoles"
-			class="org.openecomp.portalapp.portal.domain.EcompAppRole" />
+			class="org.onap.portalapp.portal.domain.EcompAppRole" />
 		<!-- This query requires no parameters. -->
 		<![CDATA[
 
@@ -761,7 +878,7 @@ select  a.app_id, a.app_name, b.role_id, b.role_name from
 union
 select fn_role.app_id,fn_app.app_name, fn_role.role_id ,fn_role.role_name
 from fn_app, fn_role
-where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
+where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' and fn_role.active_yn='Y' order by app_name
 
 
 
@@ -771,11 +888,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets all notification history -->
 	<sql-query name="getNotificationHistoryVO">
 		<return alias="notificationHistoryVOResult"
-			class="org.openecomp.portalapp.portal.transport.EpNotificationItemVO" />
+			class="org.onap.portalapp.portal.transport.EpNotificationItemVO" />
 		<![CDATA[
 		SELECT
 			notificationId, isForOnlineUsers, isForAllRoles, msgHeader,	msgDescription,msgSource,
-			startTime, endTime, priority, createdDate,	creatorId, loginId,	activeYn 
+			startTime, endTime, priority, createdDate,notificationHyperlink,creatorId, loginId,	activeYn 
 		FROM
 			(
 					select distinct 
@@ -790,6 +907,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 					priority,
 					created_date AS createdDate, 
 					creator_ID AS creatorId,
+					notification_hyperlink AS notificationHyperlink,
 					login_id AS loginId,
 					active_YN AS activeYn, 
 					if (is_viewed is null, 'N', is_viewed)
@@ -798,11 +916,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				select 
 					user_id, login_id,notification_id, is_for_online_users, is_for_all_roles, 
 					msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, 
-					creator_ID,active_YN
+					creator_ID,notification_hyperlink,active_YN
 				from
 				(
 					select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
-					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, 
+					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.notification_hyperlink,a.created_date, 
 					 b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id
                    
                    ELSE NULL
@@ -837,11 +955,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
         		select 
 					:user_id, login_id,notification_id, is_for_online_users, is_for_all_roles, 
 					msg_header, msg_description,msg_source, start_Time, end_time, priority, created_date, 
-					creator_ID,active_YN
+					creator_ID,notification_hyperlink,active_YN
 				from
 				(
 					select a.notification_ID,a.is_for_online_users,a.is_for_all_roles,a.active_YN,
-					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date, 
+					a.msg_header,a.msg_description,a.msg_source,a.start_time,a.end_time,a.priority,a.creator_ID,a.created_date,a.notification_hyperlink, 
 					 b.role_id,CASE WHEN a.creator_ID IS NOT NULL THEN u.org_user_id
                    
                    ELSE NULL
@@ -868,7 +986,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				select 
 					:user_id user_id, b.login_id,notification_id, is_for_online_users, is_for_all_roles,
 					msg_header, msg_description,msg_source, start_Time, end_time, priority, a.created_date, 
-					creator_ID, a.active_YN
+					creator_ID, a.notification_hyperlink,a.active_YN
 				from ep_notification a  JOIN fn_user b on b.user_id=a.creator_ID
 				where a.notification_id
 				and a.is_for_all_roles = 'Y'
@@ -908,7 +1026,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets role details for a specified notification -->
 	<sql-query name="getNotificationRoles">
 		<return alias="notificationRolesResult"
-			class="org.openecomp.portalapp.portal.transport.EpRoleNotificationItem" />
+			class="org.onap.portalapp.portal.transport.EpRoleNotificationItem" />
 		<![CDATA[
 			SELECT * 
  			FROM
@@ -921,7 +1039,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets all applications, possibly with contact information -->
 	<sql-query name="getAppsAndContacts">
 		<return alias="appContactUs"
-			class="org.openecomp.portalapp.portal.ecomp.model.AppContactUsItem" />
+			class="org.onap.portalapp.portal.ecomp.model.AppContactUsItem" />
 		<!-- This query requires no parameters. -->
 		<![CDATA[
 			select 
@@ -943,7 +1061,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets all rows from the app-contact-us table, extended with app information -->
 	<sql-query name="getAppContactUsItems">
 		<return alias="appContactUs"
-			class="org.openecomp.portalapp.portal.ecomp.model.AppContactUsItem" />
+			class="org.onap.portalapp.portal.ecomp.model.AppContactUsItem" />
 		<!-- This query requires no parameters. -->
 		<![CDATA[
 			select 
@@ -964,7 +1082,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets one row for each app with the category and catenated functions. -->
 	<sql-query name="getAppCategoryFunctions">
 		<return alias="appCategoryFunctions"
-			class="org.openecomp.portalapp.portal.ecomp.model.AppCategoryFunctionsItem" />
+			class="org.onap.portalapp.portal.ecomp.model.AppCategoryFunctionsItem" />
 		<!-- This query requires no parameters. -->
 		<![CDATA[
 			SELECT @rn /*'*/:=/*'*/ @rn+1 AS rowId,
@@ -1002,7 +1120,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets one row for each function-application-role combination. -->
 	<sql-query name="getAppAccessFunctionRole">
 		<return alias="appAccessFunctionRole"
-			class="org.openecomp.portalapp.portal.domain.GetAccessResult" />
+			class="org.onap.portalapp.portal.domain.GetAccessResult" />
 		<!-- This query requires one parameters. -->
 		<![CDATA[
 			select @rn /*'*/:=/*'*/ @rn+1 AS row_id, t.role_id, t.ECOMP_FUNCTION, t.APP_NAME, t.APP_MOTS_ID, t.ROLE_NAME,
@@ -1048,16 +1166,23 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 			select audit_date from fn_audit_log where affected_record_id =:userId order by audit_date desc limit 2;
 		]]>
 	</sql-query>
+	
+	<sql-query name="getActiveUsers">
+		<return alias="EPUser" class="org.onap.portalapp.portal.domain.EPUser" />   
+		<![CDATA[
+    		SELECT * FROM FN_USER WHERE active_yn='Y' 
+		]]>
+	</sql-query>
 
 	<sql-query name="getAppsAdmins">
-		<return alias="adminUserApp" class="org.openecomp.portalapp.portal.domain.AdminUserApp" />   
+		<return alias="adminUserApp" class="org.onap.portalapp.portal.domain.AdminUserApp" />   
 	<![CDATA[
-    	SELECT apps.APP_NAME, apps.APP_ID, user.USER_ID, user.FIRST_NAME, user.LAST_NAME, user.org_user_id FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_app apps ON apps.APP_ID = userrole.APP_ID  WHERE user.active_yn='Y' AND userrole.ROLE_ID = :accountAdminRoleId AND (apps.ENABLED = 'Y' OR apps.APP_ID=1)      
+    	SELECT apps.APP_NAME, apps.APP_ID, user.USER_ID, user.FIRST_NAME, user.LAST_NAME, user.org_user_id FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_app apps ON apps.APP_ID = userrole.APP_ID  WHERE user.active_yn='Y' AND userrole.ROLE_ID = :accountAdminRoleId       
 	]]>
 	</sql-query>
 	
 	<sql-query name="getPortalAdmins">
-		<return alias="portalAdmin" class="org.openecomp.portalapp.portal.transport.PortalAdmin" />   
+		<return alias="portalAdmin" class="org.onap.portalapp.portal.transport.PortalAdmin" />   
 	<![CDATA[
 		SELECT u.user_id, u.first_name, u.last_name, u.login_id FROM fn_user u, fn_user_role ur WHERE u.active_yn = 'Y' AND u.user_id = ur.user_id AND ur.role_id= :adminRoleId
 	]]>
@@ -1065,7 +1190,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	
 	<!-- Gets personalized list of enabled and accessible apps for regular user -->
 	<sql-query name="getPersUserApps">
-		<return alias="persUserApps" class="org.openecomp.portalapp.portal.domain.EPApp" />
+		<return alias="persUserApps" class="org.onap.portalapp.portal.domain.EPApp" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[
 		    select
@@ -1074,7 +1199,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE        , a.AUTH_CENTRAL
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1093,7 +1218,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets personalized list of enabled and accessible apps for Portal (super) 
 		admin -->
 	<sql-query name="getPersAdminApps">
-		<return alias="persAdminApps" class="org.openecomp.portalapp.portal.domain.EPApp" />
+		<return alias="persAdminApps" class="org.onap.portalapp.portal.domain.EPApp" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[
 		    select
@@ -1102,7 +1227,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE      , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1122,7 +1248,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<!-- Gets personalized list of enabled and accessible Admin apps by name -->
 	<sql-query name="getPersAdminAppsOrderByName">
-		<return alias="AdminAppsOrderByName" class="org.openecomp.portalapp.portal.domain.EPApp" />
+		<return alias="AdminAppsOrderByName" class="org.onap.portalapp.portal.domain.EPApp" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[ 
 		 select
@@ -1131,7 +1257,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE          , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1144,15 +1271,25 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				or
 				(a.OPEN = 'N' and r.ROLE_ID is null and p.STATUS_CD = 'S')
 			)
-			order by app_name
-		    ;
+			union
+		select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION		, b.ACK_APP		, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d , ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+		  order by app_name
+		  ;
 		
 		]]>
 	</sql-query>
 
 	<!--Gets personalized list of enabled and accessible User apps by name -->
 	<sql-query name="getPersUserAppsOrderByName">
-		<return alias="UserAppsOrderByName" class="org.openecomp.portalapp.portal.domain.EPApp" />
+		<return alias="UserAppsOrderByName" class="org.onap.portalapp.portal.domain.EPApp" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[ 
 		select
@@ -1161,7 +1298,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE         , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1172,8 +1310,18 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 		        or
 				(a.OPEN = 'N' and r.USER_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
 			)
-			order by app_name
-		    ;
+			union
+		select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d , ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+		order by app_name
+		 ;
 		
 		]]>
 	</sql-query>
@@ -1182,8 +1330,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!--Gets personalized list of enabled and accessible Super Admin apps by 
 		LastUsed -->
 	<sql-query name="getAdminAppsOrderByLastUsed">
-		<return alias="AdminAppsOrderByLastUsed" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="AdminAppsOrderByLastUsed" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[
 		    select 
 			*
@@ -1193,7 +1340,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE          , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1206,11 +1354,24 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				or
 				(a.OPEN = 'N' and r.ROLE_ID is null and p.STATUS_CD = 'S')
 			)
+			union
+		  select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d , ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
 			) A 
     		left outer join
-			(select  distinct
-			c.AFFECTED_RECORD_ID, c.AUDIT_DATE 
-			from FN_AUDIT_LOG c
+			(select  FN_AUDIT_LOG.AFFECTED_RECORD_ID, max(FN_AUDIT_LOG.AUDIT_DATE) AS AUDIT_DATE 
+			from FN_APP LEFT JOIN FN_AUDIT_LOG 
+			on FN_APP.APP_ID = FN_AUDIT_LOG.AFFECTED_RECORD_ID  
+			where FN_APP.ENABLED = 'Y' and FN_AUDIT_LOG.user_id=:userId
+			and (audit_date) BETWEEN (CURDATE() - INTERVAL 90 DAY) and CURDATE() 
+			group by  FN_AUDIT_LOG.AFFECTED_RECORD_ID
 			 )B
 			on A.app_id = B.Affected_record_id
 			order by AUDIT_DATE DESC;
@@ -1219,8 +1380,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<!--Gets personalized list of enabled and accessible User apps by LastUsed -->
 	<sql-query name="getUserAppsOrderByLastUsed">
-		<return alias="UserAppsOrderByLastUsed" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="UserAppsOrderByLastUsed" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 
 			select * from (select
 				distinct  -- multiple roles yield multiple rows
@@ -1228,7 +1388,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE         , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1238,11 +1399,25 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				(a.OPEN = 'Y' and p.STATUS_CD = 'S')
 		        or
 				(a.OPEN = 'N' and r.USER_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
-			)) A 
+			)union
+		select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d , ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+			
+			) A 
     		left outer join
-			(select  distinct
-			c.AFFECTED_RECORD_ID, c.AUDIT_DATE 
-			from FN_AUDIT_LOG c
+			(select  FN_AUDIT_LOG.AFFECTED_RECORD_ID, max(FN_AUDIT_LOG.AUDIT_DATE) AS AUDIT_DATE 
+			from FN_APP LEFT JOIN FN_AUDIT_LOG 
+			on FN_APP.APP_ID = FN_AUDIT_LOG.AFFECTED_RECORD_ID  
+			where FN_APP.ENABLED = 'Y' and FN_AUDIT_LOG.user_id=:userId
+			and (audit_date) BETWEEN (CURDATE() - INTERVAL 90 DAY) and CURDATE() 
+			group by  FN_AUDIT_LOG.AFFECTED_RECORD_ID 
 			 )B
 			on A.app_id = B.Affected_record_id
 			order by AUDIT_DATE DESC;
@@ -1255,8 +1430,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!--Gets personalized list of enabled and accessible Super Admin apps by 
 		Most Used -->
 	<sql-query name="getAdminAppsOrderByMostUsed">
-		<return alias="AdminAppsOrderByMostUsed" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="AdminAppsOrderByMostUsed" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 		
 			select 
 			*
@@ -1266,7 +1440,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE         , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1278,7 +1453,16 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				(a.OPEN = 'N' and r.ROLE_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
 				or
 				(a.OPEN = 'N' and r.ROLE_ID is null and p.STATUS_CD = 'S')
-			)
+			)union
+		   select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d , ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
 			) A 
 			left outer join
 			(select  FN_AUDIT_LOG.AFFECTED_RECORD_ID, COUNT(*) AS total_visits 
@@ -1297,8 +1481,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!--Gets personalized list of enabled and accessible NON Super Admin User 
 		apps by Most Used -->
 	<sql-query name="getUserAppsOrderByMostUsed">
-		<return alias="UserAppsOrderByMostUsed" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="UserAppsOrderByMostUsed" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 
 			select * from 
 			(select
@@ -1307,7 +1490,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     	 , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1317,7 +1501,17 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				(a.OPEN = 'Y' and p.STATUS_CD = 'S')
 		        or
 				(a.OPEN = 'N' and r.USER_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
-			))A 
+			)union
+		  select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d, ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+			)A 
 			left outer join
 			(select  FN_AUDIT_LOG.AFFECTED_RECORD_ID, COUNT(*) AS total_visits 
 			from FN_APP LEFT JOIN FN_AUDIT_LOG 
@@ -1334,8 +1528,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!--Gets personalized list of enabled and accessible Super Admin apps by 
 		Manual -->
 	<sql-query name="getAdminAppsOrderByManual">
-		<return alias="AdminAppsOrderByManual" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="AdminAppsOrderByManual" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 
 			select * from 			
 			(select
@@ -1344,7 +1537,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE        , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1356,7 +1550,17 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				(a.OPEN = 'N' and r.ROLE_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
 				or
 				(a.OPEN = 'N' and r.ROLE_ID is null and p.STATUS_CD = 'S')
-			)) A
+			)union
+		select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d, ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+			) A
 			left outer join
 			 (select m.app_id, m.sort_order 
 			from ep_pers_user_app_man_sort m
@@ -1372,8 +1576,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!--Gets personalized list of enabled and accessible NON Super admin User 
 		apps by Manual -->
 	<sql-query name="getUserAppsOrderByManual">
-		<return alias="UserAppsOrderByManual" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="UserAppsOrderByManual" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 
 							select * from	(select
 				distinct  -- multiple roles yield multiple rows
@@ -1381,7 +1584,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	    		a.APP_NOTES 		, a.APP_URL 		, a.APP_ALTERNATE_URL 	, a.APP_REST_ENDPOINT ,
 				a.ML_APP_NAME 		, a.ML_APP_ADMIN_ID , a.MOTS_ID 			, a.APP_PASSWORD ,
     			a.THUMBNAIL 		, a.APP_USERNAME	, a.OPEN 				, a.ENABLED , 
-				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE     
+				a.UEB_TOPIC_NAME 	, a.UEB_KEY 		, a.UEB_SECRET 			, a.APP_TYPE        , a.AUTH_CENTRAL ,
+				a.AUTH_NAMESPACE	, a.MODE_OF_INTEGRATION, a.ACK_APP			, a.USES_CADI
 		    from FN_APP a
 		    -- Portal assigns role 999 to app administrator		    
 			left outer join	FN_USER_ROLE         r ON a.APP_ID = r.APP_ID and r.USER_ID = :userId and r.ROLE_ID != 999
@@ -1391,7 +1595,17 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 				(a.OPEN = 'Y' and p.STATUS_CD = 'S')
 		        or
 				(a.OPEN = 'N' and r.USER_ID is not null and (p.STATUS_CD is null or p.STATUS_CD != 'H'))
-			)) A
+			)union
+		select distinct  -- multiple roles yield multiple rows
+			    b.APP_ID			, b.APP_NAME 		, b.APP_IMAGE_URL  		,b.APP_DESCRIPTION , 
+	    		b.APP_NOTES 		, b.APP_URL 		, b.APP_ALTERNATE_URL 	, b.APP_REST_ENDPOINT ,
+			   	b.ML_APP_NAME 		, b.ML_APP_ADMIN_ID , b.MOTS_ID 			, b.APP_PASSWORD ,
+    			b.THUMBNAIL 		, b.APP_USERNAME	, b.OPEN 				, b.ENABLED , 
+          b.UEB_TOPIC_NAME 	, b.UEB_KEY 		, b.UEB_SECRET 			, b.APP_TYPE         , b.AUTH_CENTRAL ,
+          b.AUTH_NAMESPACE	, b.MODE_OF_INTEGRATION, b.ACK_APP			, b.USES_CADI
+          from fn_user_role a, fn_app b, ep_app_role_function c   , fn_role d, ep_app_function e
+          where a.user_id =:userId  and b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and a.role_id = d.role_id and e.app_id = c.app_id
+			) A
 			left outer join
 			 (select m.app_id, m.sort_order 
 			from ep_pers_user_app_man_sort m
@@ -1407,7 +1621,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 		statuses -->
 	<sql-query name="getUserAppCatalog">
 		<return alias="userAppCatalog"
-			class="org.openecomp.portalapp.portal.ecomp.model.AppCatalogItem" />
+			class="org.onap.portalapp.portal.ecomp.model.AppCatalogItem" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[
 						select 
@@ -1415,7 +1629,11 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 			    a.APP_ID as id, a.APP_NAME as name, a.ML_APP_NAME as mlAppName, a.APP_IMAGE_URL as imageUrl,
 			    a.APP_DESCRIPTION as description, a.APP_NOTES as notes,
 			    a.APP_URL as url, a.APP_ALTERNATE_URL as alternateUrl,
-				IF(a.app_type = '2', TRUE, FALSE) as restricted,
+				-- IF(a.app_type = '2', TRUE, FALSE) as restricted,
+				case
+					when a.app_type = '2' and a.app_type = '3' then TRUE
+					else FALSE
+				end as restricted,
 			    IF(a.open = 'Y', TRUE, FALSE) as open,
                 -- ACCESS(-ible) means user has a defined role OR the application is open 
 				case
@@ -1452,14 +1670,29 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	</sql-query>
 
 	<sql-query name="getMyloginAppDetails">
-		<return alias="myloginAppDetails" class="org.openecomp.portalapp.portal.domain.EPApp" />
-		
+		<return alias="myloginAppDetails" class="org.onap.portalapp.portal.domain.EPApp" />
 		<![CDATA[ 
 		SELECT * FROM fn_app  where ml_app_name =:appName
 		;		
 		]]>
 	</sql-query>
 	
+	<sql-query name="getAppDetailsByAppName">
+		<return alias="appDetailsByAppName" class="org.onap.portalapp.portal.domain.EPApp" />
+		<![CDATA[ 
+		SELECT * FROM fn_app  where app_name =:appName
+		;		
+		]]>
+	</sql-query>
+	
+		<sql-query name="getMyAppDetailsByUebKey">
+		<return alias="myAppDetailsByUebKey" class="org.onap.portalapp.portal.domain.EPApp" />
+		<![CDATA[ 
+		SELECT * FROM fn_app  where ueb_key =:appKey
+		;		
+		]]>
+	</sql-query>
+	
 	
 	<sql-query name="deleteAccountEndpoint">
 		<![CDATA[ 
@@ -1490,19 +1723,56 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	</sql-query>
 
 	<sql-query name="getAppRoles">
-		<return alias="appRoles" class="org.openecomp.portalapp.portal.domain.EPRole" />
-		
+		<return alias="appRoles" class="org.onap.portalapp.portal.domain.EPRole" />
 		<![CDATA[ 
 		SELECT * FROM fn_role where role_name =:roleName and app_id =:appId
 		;		
 		]]>
 	</sql-query>
 	
+	<sql-query name="getPartnerAppRolesList">
+		<return alias="partnerAppRolesList" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		SELECT * FROM fn_role where app_id =:appId
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getPortalAppRolesList">
+		<return alias="portalAppRolesList" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		SELECT * FROM fn_role where app_id is null
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getPortalAppRoleByRoleId">
+		<return alias="portalAppByRoleId" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		SELECT * FROM fn_role where role_id =:roleId and app_id is null
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getPartnerAppRoleByRoleId">
+		<return alias="portalAppByRoleId" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		SELECT * FROM fn_role where app_role_id =:appRoleId and app_id =:appId
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getPartnerAppRoleById">
+		<return alias="portalAppByRoleId" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		SELECT * FROM fn_role where role_id =:appRoleId and app_id =:appId
+		;		
+		]]>
+	</sql-query>
+	
 	<sql-query name="getPortalAppRoles">
-		<return alias="appRoles" class="org.openecomp.portalapp.portal.domain.EPRole" />
-		
+		<return alias="appRoles" class="org.onap.portalapp.portal.domain.EPRole" />
 		<![CDATA[ 
-				
 		SELECT * FROM fn_role where role_name =:appRoleName and app_id is null
 		;		
 		]]>
@@ -1510,7 +1780,6 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="deleteMicroserviceParameter">
 		<![CDATA[ 
-				
 		DELETE FROM ep_microservice_parameter WHERE service_id =:serviceId
 		;		
 		]]>
@@ -1518,7 +1787,6 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	
 	<sql-query name="deleteMicroserviceParameterById">
 		<![CDATA[ 
-				
 		DELETE FROM ep_microservice_parameter WHERE id =:paramId
 		;		
 		]]>
@@ -1526,7 +1794,6 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	
 	<sql-query name="deleteWidgetCatalogParameter">
 		<![CDATA[ 
-				
 		DELETE FROM ep_widget_catalog_parameter WHERE param_id =:paramId
 		;		
 		]]>
@@ -1534,17 +1801,14 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="deleteMicroservice">
 		<![CDATA[ 
-				
 		DELETE FROM ep_microservice WHERE id =:serviceId
 		;		
 		]]>
 	</sql-query>
 
 	<sql-query name="epUserAppId">
-		<return alias="userAppId" class="org.openecomp.portalapp.portal.domain.EPUser" />
-		
+		<return alias="userAppId" class="org.onap.portalapp.portal.domain.EPUser" />
 		<![CDATA[ 
-				
 		SELECT * FROM  FN_USER  where ORG_USER_ID = :orgUserIdValue
 		;		
 		]]>
@@ -1552,10 +1816,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="userAppsSortPreferenceQuery">
 		<return alias="appsSortPreferenceQuery"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppsSortPreference" />
-		
+			class="org.onap.portalapp.portal.domain.EPUserAppsSortPreference" />
 		<![CDATA[ 
-				
 		SELECT * from  EP_PERS_USER_APP_SORT e where e.USER_ID = :userId
 				
 		]]>
@@ -1563,10 +1825,8 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="userAppsManualSortPrfQuery">
 		<return alias="AppsManualSortPrfQuery"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppsManualSortPreference" />
-		
+			class="org.onap.portalapp.portal.domain.EPUserAppsManualSortPreference" />
 		<![CDATA[ 
-				
 		SELECT * from  EP_PERS_USER_APP_MAN_SORT where USER_ID =:userId
 				
 		]]>
@@ -1574,7 +1834,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="userWidgetManualSortPrfQuery">
 		<return alias="widgetManualSortPrfQuery"
-			class="org.openecomp.portalapp.portal.domain.EPWidgetsManualSortPreference" />
+			class="org.onap.portalapp.portal.domain.EPWidgetsManualSortPreference" />
 		<![CDATA[ 
 		SELECT * from  EP_PERS_USER_WIDGET_PLACEMENT where USER_ID =:userId
 		]]>
@@ -1582,16 +1842,16 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="appRoles">
 		<return alias="rolesForApp"
-			class="org.openecomp.portalapp.portal.domain.EpUserAppRoles" />
+			class="org.onap.portalapp.portal.domain.EPUserAppRoles" />
 		<![CDATA[ 
-			SELECT ROLE_ID, APP_ID from  FN_ROLE where APP_ROLE_ID =:appRoleId and app_id =:appId
+			SELECT ROLE_ID, APP_ID from FN_ROLE where APP_ROLE_ID = :appRoleId and app_id = :appId
 			;
 		]]>
 	</sql-query>
 
 	<sql-query name="userAppRolesRequestList">
 		<return alias="appRolesRequestList"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequest" />
+			class="org.onap.portalapp.portal.domain.EPUserAppRolesRequest" />
 		<![CDATA[ 
 			SELECT req_id, user_id, app_id, created_date, updated_date, request_status from  EP_USER_ROLES_REQUEST where user_id =:userId and app_id=:appId and request_status = 'P'
 			;
@@ -1600,7 +1860,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="userAppRolesRequestDetailList">
 		<return alias="appRolesRequestDetailList"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppRolesRequestDetail" />
+			class="org.onap.portalapp.portal.domain.EPUserAppRolesRequestDetail" />
 		<![CDATA[ 
 		
 			SELECT  id, req_id, requested_role_id, request_type from  EP_USER_ROLES_REQUEST_DET where req_id =:reqId
@@ -1611,7 +1871,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	<!-- Gets list of enabled apps including accessible and select statuses -->
 	<sql-query name="getAdminAppCatalog">
 		<return alias="adminAppCatalog"
-			class="org.openecomp.portalapp.portal.ecomp.model.AppCatalogItem" />
+			class="org.onap.portalapp.portal.ecomp.model.AppCatalogItem" />
 		<!-- This query requires one parameter: userId (number) -->
 		<![CDATA[
 			select 
@@ -1660,7 +1920,7 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="userAppCatalogRoles">
 		<return alias="epUserAppCatalogRoles"
-			class="org.openecomp.portalapp.portal.domain.EPUserAppCatalogRoles" />
+			class="org.onap.portalapp.portal.domain.EPUserAppCatalogRoles" />
 		<![CDATA[ 
         select  a.req_id, B.requested_role_id ,  A.request_status  , A.app_id , (select role_name from fn_role where role_id = B.requested_role_id) as role_name
        from ep_user_roles_request A left join ep_user_roles_request_det B
@@ -1674,14 +1934,13 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	<sql-query name="getUserApproles">
 		<return alias="businessCardUserApplicationRoles"
-			class="org.openecomp.portalapp.portal.transport.BusinessCardApplicationRole" />
-		
+			class="org.onap.portalapp.portal.transport.BusinessCardApplicationRole" />
 		<![CDATA[
 		
  		select   fr.role_name, fa.app_name 
           from   
         fn_role fr, fn_user_role fur, fn_app fa, fn_user fu  
-          Where  fu.user_id =  fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId 
+          Where  fu.user_id =  fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id and fu.org_user_id = :userId and fr.active_yn='Y' and (fa.enabled = 'Y' or fa.app_id=1)
           ;
  
  		]]>
@@ -1689,7 +1948,6 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
      
     <!--delete the records from ep_notification table when the endtime is more than 3 months-->
 	<sql-query name="deleteNotificationsFromEpNotificationTable">
-		
 		<![CDATA[
 		delete from ep_notification where  curdate() >= DATE_ADD(end_time,INTERVAL 3 MONTH)
 		]]>
@@ -1698,7 +1956,6 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 
 	 	<!-- delete the records from ep_role_notification table when the endtime is more than 3 months -->
 	<sql-query name="deleteNotificationsFromEpRoleNotificationTable">
-		
 		<![CDATA[
 	delete from ep_role_notification where  notification_id in (select notification_id from ep_notification where  curdate() >= DATE_ADD(end_time,INTERVAL 3 MONTH))
 		]]>
@@ -1706,10 +1963,642 @@ where fn_role.app_id = fn_app.app_id and fn_app.enabled='Y' order by app_name
 	
 	<!-- delete the records from ep_user_notification table when the endtime is more than 3 months-->
 	<sql-query name="deleteNotificationsFromEpUserNotificationTable">
-		
 		<![CDATA[
 	delete from ep_user_notification where  notification_id in (select notification_id from ep_notification where  curdate() >= DATE_ADD(end_time,INTERVAL 3 MONTH))
 		]]>
 	</sql-query>
+	
+	<!-- Gets list of role functions and it requires two parameters appId and roleId-->
+	<sql-query name="getAppRoleFunctionList">
+		<return alias="appRoleFunctionList"
+			class="org.onap.portalapp.portal.domain.CentralV2RoleFunction" />
+		<![CDATA[ 
+			
+			SELECT DISTINCT f.app_id , f.function_cd, f.function_name from ep_app_role_function rf, ep_app_function f  
+			where rf.role_id =:roleId and rf.app_id =:appId and rf.app_id = f.app_id and rf.function_cd = f.function_cd
+			;
+				
+		]]>
+	</sql-query> 
+	
+	<!-- Gets list of all role functions -->
+	<sql-query name="getAllRoleFunctions">
+		<return alias="allRoleFunctions"
+			class="org.onap.portalapp.portal.domain.CentralV2RoleFunction" />
+		<![CDATA[ 
+			
+			SELECT * from ep_app_function where app_id =:appId
+			;
+				
+		]]>
+	</sql-query>
+	
+	<!-- Get ep_app_function records provided by single parameter -->
+	<sql-query name="getRoleFunction">
+		<return alias="RoleFunction"
+			class="org.onap.portalapp.portal.domain.CentralV2RoleFunction" />
+			<![CDATA[
+			
+			SELECT * from ep_app_function where function_cd like CONCAT('%', :functionCode,'%') and app_id =:appId
+			;
+			
+			]]>
+	</sql-query>
+		
+	<!-- Gets the current user app roles records and requires two parameters  -->
+	<sql-query name="getUserAppCurrentRoles">
+		<return alias="userAppCurrentRoles"
+			class="org.onap.portalapp.portal.transport.EPUserAppCurrentRoles" />
+			<![CDATA[
+			
+			select distinct fu.role_id, fr.user_id, fu.role_name, fu.priority from fn_role fu left outer join fn_user_role fr ON fu.role_id = fr.role_id and fu.app_id = fr.app_id and fr.role_id != 999 where fu.app_id =:appId and fr.user_id =:userId and fu.active_yn='Y' 
+			;		
+			]]>
+	</sql-query>
+	
+	<!-- Gets the current user app roles along with account administrator and requires two parameters  -->
+	<sql-query name="getUserAppExistingRoles">
+		<return alias="userAppExistingRoles"
+			class="org.onap.portalapp.portal.transport.EcompUserAppRoles" />
+			<![CDATA[
+			select fr.role_name, fu.app_id, fu.user_id, fu.priority, fu.role_id from fn_user_role fu 
+			left outer join fn_role fr on fu.role_id = fr.role_id 
+			where fu.user_id =:userId and fu.app_id =:appId
+			;			
+			]]>
+	</sql-query>
+	
+	<!-- Gets all functions of portal app -->
+	<sql-query name="getAllFunctions">
+		<return alias="allFunctions"
+			class="org.onap.portalsdk.core.domain.RoleFunction" />
+			<![CDATA[	
+			select * from fn_function
+			;		
+			]]>
+	</sql-query>
+	
+	<!-- Gets the current user app roles records and requires two parameters  -->
+	<sql-query name="getPartnerAppFunctions">
+		<return alias="partnerAppFunctions"
+			class="org.onap.portalapp.portal.domain.CentralV2RoleFunction" />
+			<![CDATA[	
+			select * from ep_app_function where app_id =:appId
+			;		
+			]]>
+	</sql-query>
+	
+	<!-- Gets the  all role functions and requires one parameters -->
+	<sql-query name="uploadAllRoleFunctions">
+		<return alias="allRoleFunctions"
+			class="org.onap.portalapp.portal.transport.BulkUploadRoleFunction" />
+			<![CDATA[	
+				select fr.function_cd, fn.function_name from fn_role_function fr left outer join fn_function fn on fr.function_cd = fn.function_cd where role_id =:roleId
+				;		
+			]]>
+	</sql-query>
+	
+		<!-- Gets the  all application role functions from ep_app_function table and requires one parameters -->
+	<sql-query name="uploadPartnerRoleFunctions">
+		<return alias="partnerRoleFunctions"
+			class="org.onap.portalapp.portal.transport.BulkUploadRoleFunction" />
+			<![CDATA[	
+				select distinct eprf.function_cd, epfn.function_name from ep_app_role_function eprf left outer join ep_app_function epfn on eprf.function_cd = epfn.function_cd where eprf.role_id =:roleId
+				;	
+			]]>
+	</sql-query>
+
+	<sql-query name="getRoletoUpdateInExternalAuthSystem">
+		<return alias="roletoUpdateInExternalAuthSystem" class="org.onap.portalapp.portal.domain.EPRole" />
+			<![CDATA[
+					SELECT * FROM fn_role where role_name =:appRoleName and app_id =:appId
+			;		
+			]]>
+	</sql-query>
+	
+		<!-- Gets all active records from fn_role that is associated with this app-->
+	<sql-query name="getActiveRolesOfApplication">
+		<return alias="activeRolesOfApplication" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[
+		select * from fn_role where active_yn = 'Y' and app_id=:appId
+		;
+ 		]]>
+	</sql-query>
 
+	<sql-query name="getBulkUserRoles">
+		<return alias="bulkUserRoles" class="org.onap.portalapp.portal.transport.BulkUploadUserRoles" />
+			<![CDATA[
+			select fr.role_name, fu.org_user_id, fa.auth_namespace from fn_user_role fur 
+			left outer join fn_role fr on fr.role_id = fur.role_id 
+			left outer join fn_app fa on fa.app_id = fur.app_id
+			left outer join fn_user fu on fu.user_id = fur.user_id where fa.ueb_key =:uebKey
+			;	
+			]]>
+	</sql-query>
+	
+	<sql-query name="getBulkUsersForSingleRole">
+		<return alias="bulkUsersForSingleRole" class="org.onap.portalapp.portal.transport.BulkUploadUserRoles" />
+			<![CDATA[
+			select fr.role_name, fu.org_user_id, fa.auth_namespace from fn_user_role fur 
+			left outer join fn_role fr on fr.role_id = fur.role_id 
+			left outer join fn_app fa on fa.app_id = fur.app_id
+			left outer join fn_user fu on fu.user_id = fur.user_id where fa.ueb_key =:uebKey and fr.role_id =:roleId
+			;	
+			]]>
+	</sql-query>
+	
+	<sql-query name="getCentralizedApps">
+		<return alias="centralizedApps" class="org.onap.portalapp.portal.domain.EPApp" />
+			<![CDATA[
+			select * from fn_app where auth_central = 'Y' and open = 'N' and auth_namespace is not null
+			;	
+			]]>
+	</sql-query>
+	
+	<sql-query name="getUserRoles">
+			<return alias="getUserRolesList" class="org.onap.portalapp.portal.domain.UserRole" />
+		<![CDATA[ 
+				
+        SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME  FROM fn_user_role userrole INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID WHERE user.org_user_id =:org_user_id and userrole.app_id = 1 
+         ;
+		]]>
+	</sql-query>
+		<sql-query name="getRoleFunctionsOfUser">
+			<![CDATA[
+			select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea
+			where fu.role_id = ep.role_id 
+			and fu.app_id = ep.app_id
+			and fu.user_id =:userId and ep.app_id = 1
+			and ea.function_cd = ep.function_cd
+		    union
+            select distinct app_r_f.function_cd from ep_app_role_function app_r_f, ep_app_function a_f
+			where role_id = 999
+			and app_r_f.function_cd = a_f.function_cd
+			and exists
+			(
+			select fa.app_id from fn_user fu, fn_user_role ur, fn_app fa where fu.user_id =:userId and fu.user_id = ur.user_id
+			and ur.role_id = 999 and ur.app_id = fa.app_id and fa.enabled = 'Y'
+			);
+			]]>
+	</sql-query>
+	
+	<sql-query name="getRoleFunctionsOfUserforAlltheApplications">
+			<![CDATA[
+			select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea
+			where fu.role_id = ep.role_id 
+			and fu.app_id = ep.app_id
+			and fu.user_id =:userId 
+			and ea.function_cd = ep.function_cd
+		   	and exists
+			(
+			select fa.app_id from fn_user fu, fn_user_role ur, fn_app fa where fu.user_id =:userId and fu.user_id = ur.user_id
+			and ur.app_id = fa.app_id and fa.enabled = 'Y'
+			);
+			]]>
+	</sql-query>
+	
+	<sql-query name="getApplicationsofTheUserwithAdminAndRoleAdmin">
+	<return alias="getApplicationsofTheUserwithAdminAndRoleAdmin" class="org.onap.portalapp.portal.domain.AppIdAndNameTransportModel" />
+			<![CDATA[
+			SELECT app.APP_ID, app.APP_NAME, app.APP_TYPE FROM FN_APP app 
+			inner join FN_USER_ROLE userrole ON userrole.APP_ID=app.APP_ID 
+			where userrole.USER_ID = :userId AND userrole.ROLE_ID=999 AND (app.ENABLED = 'Y' OR app.APP_ID=1)
+			UNION
+			SELECT DISTINCT app.APP_ID, app.app_name, app.APP_TYPE FROM fn_user user 
+					INNER JOIN fn_user_role user_role ON user.USER_ID = user_role.USER_ID 
+					 INNER JOIN fn_role role ON role.ROLE_ID = user_role.ROLE_ID  
+		        INNER JOIN fn_app app ON app.app_id= user_role.app_id and (app.enabled='Y'  or app.app_id=1) 
+		        INNER JOIN ep_app_role_function appfunction ON  appfunction.app_id = app.app_id and appfunction.role_id=role.ROLE_ID and (appfunction.function_cd like '%APPROVER%')
+		        WHERE user.user_id = :userId ;
+			]]>
+	</sql-query>
+	
+	<sql-query name="getApplicationsofTheUserContainsApprover">
+	<return alias="getApplicationsofTheUserContainsApprover" class="org.onap.portalapp.portal.domain.AppIdAndNameTransportModel" />
+			<![CDATA[
+			SELECT DISTINCT app.APP_ID, app.APP_TYPE, app.app_name FROM fn_user user 
+					INNER JOIN fn_user_role user_role ON user.USER_ID = user_role.USER_ID 
+					 INNER JOIN fn_role role ON role.ROLE_ID = user_role.ROLE_ID  
+		        INNER JOIN fn_app app ON app.app_id= user_role.app_id and (app.enabled='Y'  or app.app_id=1) 
+		        INNER JOIN ep_app_role_function appfunction ON  appfunction.app_id = app.app_id and appfunction.role_id=role.ROLE_ID and (appfunction.function_cd like '%APPROVER%')
+		        WHERE user.user_id = :userId ;
+			]]>
+	</sql-query>
+	
+	
+	
+	<sql-query name="getUserRolesForLeftMenu">
+			<return alias="getUserRolesListForLeftMenu" class="org.onap.portalapp.portal.domain.UserRole" />
+	
+		<![CDATA[ 
+  		SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME  FROM fn_user_role userrole 
+        INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID 
+        INNER JOIN fn_app app ON app.app_id= userrole.app_id
+        INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID 
+        WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id =   999) and (app.enabled='Y'  or app.app_id=1)
+        ;
+		]]>
+	</sql-query>
+	
+	<sql-query name="getRolesForLeftMenu">
+			<return alias="getUserRolesListForLeftMenu" class="org.onap.portalapp.portal.domain.UserRole" />
+	
+		<![CDATA[ 
+  		SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME  FROM fn_user_role userrole 
+        INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID 
+        INNER JOIN fn_app app ON app.app_id= userrole.app_id
+        INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID 
+        WHERE user.org_user_id =:org_user_id and (userrole.app_id = 1 or role.role_id =   999) and ((app.enabled='Y' and auth_central='Y' ) or app.app_id=1)
+        ;
+		]]>
+	</sql-query>
+	
+	<!-- Gets all functions for an application along with global functions and requires single parameter -->
+	<sql-query name="getMenuFunctions">
+		<![CDATA[ 
+			select f.function_cd from ep_app_function f
+			where f.app_id =:appId
+			UNION
+			select epa.function_cd from fn_role fnr, ep_app_role_function epr, ep_app_function epa where epr.role_id = fnr.role_id
+			and epa.function_cd = epr.function_cd and fnr.role_name like 'global%' and fnr.app_id is null and epr.app_id = 1
+		 ;
+		]]>
+	</sql-query>
+	
+	<sql-query name="getRequestIdsForApp">
+	<return alias="getRequestIdsForApp" class="org.onap.portalapp.portal.domain.EPUserAppRolesRequest" />
+		<![CDATA[ 
+		select * from ep_user_roles_request where app_id =:app_id
+		;
+		]]>
+	</sql-query>
+
+	<sql-query name="ApplicationUserRoles">
+		<return alias="ApplicationUserRoles" class="org.onap.portalapp.portal.transport.EcompUserRoles" />
+		<![CDATA[ 
+		   select distinct fu.org_id, fu.manager_id, fu.first_name, fu.middle_name, fu.last_name, fu.phone, fu.email, fu.hrid, fu.org_user_id, fu.org_code, fu.org_manager_userid, fu.job_title, fu.login_id, 
+           fu.active_yn , fr.app_role_id, fr.role_name, epr.function_cd , epf.function_name
+           from fn_user fu, fn_role fr, fn_user_role fur, ep_app_role_function epr , ep_app_function epf
+           where fu.user_id = fur.user_id and fu.active_yn='Y' and fur.role_id = fr.role_id and fr.app_id =:appId and fr.active_yn='Y' and epr.function_cd= epf.function_cd and epf.app_id=epr.app_id and fur.role_id=epr.role_id
+           union
+           select distinct fu.org_id, fu.manager_id, fu.first_name, fu.middle_name, fu.last_name, fu.phone, fu.email, fu.hrid, fu.org_user_id, fu.org_code, fu.org_manager_userid, fu.job_title, 
+           fu.login_id, fu.active_yn , fr.role_id, fr.role_name, earf.function_cd , eaf.function_name
+           from fn_user_role a, fn_role fr, fn_user fu , ep_app_role_function earf, ep_app_function eaf
+           where a.role_id in (select b.role_id from ep_app_role_function b where b.role_app_id = 1 and b.app_id =:appId) and a.user_id =fu.user_id and a.role_id = fr.role_id and fr.active_yn='Y' and fu.active_yn='Y'
+           and earf.role_id = a.role_id and earf.function_cd = eaf.function_cd and earf.app_id = eaf.app_id  and earf.role_app_id = 1 and fr.active_yn='Y' and fu.active_yn='Y';
+		]]>
+	</sql-query>
+	
+	<sql-query name="getCurrentAppRoleFunctions">
+		<return alias="ApplicationUserRoles" class="org.onap.portalapp.portal.transport.LocalRole" />
+		<![CDATA[ 
+		select distinct fr.role_id, fr.role_name  from fn_role fr, ep_app_function ef, ep_app_role_function epr where fr.role_id = epr.role_id and epr.function_cd = ef.function_cd
+ 		and ef.function_cd =:functionCd and epr.app_id =:appId
+ 		;
+		]]>
+	</sql-query>
+	
+	<sql-query name="deleteUserWidgetPlacement">
+		<![CDATA[ 
+		DELETE FROM ep_pers_user_widget_placement WHERE user_id =:userId AND widget_id =:widgetId
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getCentralizedAppsOfUser">	
+		<return alias="CentralizedAppsForRoles" class="org.onap.portalapp.portal.domain.CentralizedApp" />   	
+		<![CDATA[
+		
+ 		select distinct fa.app_id, fa.app_name
+		from  fn_role fr, fn_user_role fur, fn_app fa, fn_user fu  
+		Where  fu.user_id =  fur.user_id and fur.role_id = fr.role_id and fa.app_id = fur.app_id 
+		and fu.org_user_id = :userId and (fur.role_id = 999 or fur.role_id = 1) and fr.active_yn='Y' and ((fa.enabled = 'Y' and fa.auth_central='Y') or fa.app_id =1) 
+		;
+ 
+ 		]]>
+	</sql-query>
+	
+    <query name="getEPUserByOrgUserId">
+	<![CDATA[
+		FROM EPUser WHERE orgUserId = :org_user_id
+	]]>
+    </query>
+
+	<query name="getEPUserByLoginId">
+	<![CDATA[
+		FROM EPUser WHERE loginId = :login_id
+	]]>
+    </query>
+
+    <query name="getEPUserByLoginIdLoginPwd">
+	<![CDATA[
+		FROM EPUser WHERE loginId = :login_id and loginPwd = :login_pwd		
+	]]>
+    </query>
+    
+    <sql-query name="getGlobalRoleWithApplicationRoleFunctions">	
+		<return alias="getGlobalRoleWithApplicationRoleFunctions" class="org.onap.portalapp.portal.transport.GlobalRoleWithApplicationRoleFunction" />   	
+		<![CDATA[
+ 		select distinct  d.role_id, d.role_name , c.function_cd , e.function_name , d.active_yn , d.priority , c.app_id, c.role_app_id
+		from fn_user_role a, fn_app b, ep_app_role_function c , fn_role d , ep_app_function e
+		where b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and e.function_cd = c.function_cd and c.app_id= :appId and e.app_id=c.app_id
+		;
+ 		]]>
+	</sql-query>
+	
+     <sql-query name="getGlobalRolesOfPortal">
+		<return alias="getGlobalRolesOfPortal" class="org.onap.portalapp.portal.domain.EPRole" />
+		<![CDATA[ 
+		select * from fn_role where role_name  like 'global_%' and app_id is null and active_yn='Y'
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getAppRoleFunctionOnRoleIdandAppId">
+		<return alias="appRoleFunctionOnRoleIdandAppId" class="org.onap.portalapp.portal.domain.EPAppRoleFunction" />
+		<![CDATA[ 
+		select * from ep_app_role_function where app_id =:appId and role_id =:roleId 
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getAppFunctionOnCodeAndAppId">
+		<return alias="appFunctionOnCodeAndAppId" class="org.onap.portalapp.portal.domain.CentralV2RoleFunction" />
+		<![CDATA[ 
+		select * from ep_app_function where app_id =:appId and function_cd =:functionCd 
+		;		
+		]]>
+	</sql-query>
+	
+	<sql-query name="getGlobalRoleForRequestedApp">	
+		<return alias="getGlobalRoleForRequestedApp" class="org.onap.portalapp.portal.transport.GlobalRoleWithApplicationRoleFunction" />   	
+		<![CDATA[
+ 		select distinct  d.role_id, d.role_name , c.function_cd , e.function_name , d.active_yn , d.priority , c.app_id, c.role_app_id
+        from fn_user_role a, fn_app b, ep_app_role_function c , fn_role d , ep_app_function e
+        where b.app_id = c.app_id and a.app_id = c.role_app_id and b.enabled = 'Y' and c.role_id = d.role_id and d.active_yn='Y' and e.function_cd = c.function_cd and c.app_id=:requestedAppId and c.role_id =:roleId and e.app_id = c.app_id
+        ;
+ 		]]>
+	</sql-query>
+	
+	<sql-query name="getBulkUploadPartnerGlobalRoleFunctions">	
+		<return alias="bulkUploadPartnerGlobalRoleFunctions" class="org.onap.portalapp.portal.transport.GlobalRoleWithApplicationRoleFunction" />   	
+		<![CDATA[
+		select distinct fr.role_id, fr.role_name, fr.active_yn, fr.priority, epr.function_cd, ep.function_name, ep.app_id, epr.role_app_id
+		from fn_role fr, ep_app_function ep, ep_app_role_function epr
+		where fr.role_id = epr.role_id and ep.function_cd = epr.function_cd and ep.app_id = epr.app_id and  epr.app_id = :appId and epr.role_app_id = 1	
+		;
+		]]>
+	</sql-query>
+	
+	<sql-query name="updateMenuFunctionalAndRoles">	
+		<![CDATA[
+		  UPDATE fn_menu_functional m, fn_menu_functional_roles mr SET m.url='' WHERE m.menu_id=mr.menu_id AND mr.app_id=:app_id	
+ 		 ;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove any favorites associated with a menu item that is associated with this app -->
+	<sql-query name="removeAppFromMenuFavorites">	
+		<![CDATA[
+		DELETE FROM fn_menu_favorites using fn_menu_favorites inner join fn_menu_functional_roles where fn_menu_functional_roles.app_id=:app_id AND fn_menu_functional_roles.menu_id=fn_menu_favorites.menu_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove all role, appid records from fn_menu_functional_role that is associated with this app -->
+	<sql-query name="removeAppFromMenuFunctionalRoles">	
+		<![CDATA[
+		DELETE FROM fn_menu_functional_roles WHERE app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove all roles, rolefunctions, appid records from ep_app_role_function that is associated with this app -->
+	<sql-query name="removeAppFromEpAppRoleFunction">	
+		<![CDATA[
+		DELETE FROM ep_app_role_function WHERE app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove all rolefunctions, appid records from ep_app_function that is associated with this app -->
+	<sql-query name="removeAppFromEpAppFunction">	
+		<![CDATA[
+		DELETE FROM ep_app_function WHERE app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove all records from fn_user_role associated with this app that is associated with this app -->
+	<sql-query name="removeAppFromFnUserRole">	
+		<![CDATA[
+		DELETE FROM fn_user_role WHERE app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove any widgets that is associated with this app-->
+	<sql-query name="removeAppFromEpWidgetCatalogRole">	
+		<![CDATA[
+		DELETE FROM ep_widget_catalog_role WHERE app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove any notifications that is associated with this app-->
+	<sql-query name="removeAppFromEpRoleNotification">	
+		<![CDATA[
+		DELETE FROM ep_role_notification using ep_role_notification inner join fn_role 
+		where fn_role.app_id=:app_id and ep_role_notification.role_id= fn_role.role_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove all records from fn_role that is associated with this app-->
+	<sql-query name="removeAppFromFnRole">	
+		<![CDATA[
+		DELETE FROM fn_role where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove app contact us entries that is associated with this app-->
+	<sql-query name="removeAppFromAppContactUs">	
+		<![CDATA[
+		DELETE FROM fn_app_contact_us where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove app personalization entries that is associated with this app-->
+	<sql-query name="removeAppFromEpPersUserAppSel">	
+		<![CDATA[
+		DELETE FROM fn_pers_user_app_sel where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove app personalization sorting entries that is associated with this app-->
+	<sql-query name="removeAppFromEpPersUserAppManSort">	
+		<![CDATA[
+		DELETE FROM ep_pers_user_app_man_sort where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove rows from user role request table entries that is associated with this app-->
+	<sql-query name="removeAppFromEpUserRolesRequest">	
+		<![CDATA[
+		DELETE FROM ep_user_roles_request where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove rows from web analytics table entries that is associated with this app-->
+	<sql-query name="removeAppFromEpWebAnalytics">	
+		<![CDATA[
+		DELETE FROM ep_web_analytics_source where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+	
+	<!-- Remove row from fn app table -->
+	<sql-query name="removeAppFromFnApp">	
+		<![CDATA[
+		DELETE FROM fn_app where app_id=:app_id
+		;
+ 		]]>
+	</sql-query>
+
+
+	<query name="getBasicauthAccount">
+      select id,password from BasicAuthCredentials
+    </query>
+    
+     <query name="getMicroserviceInfo">
+      select id,password from MicroserviceData
+    </query>
+	
+	<sql-query name="getUserRoleOnUserIdAndRoleIdAndAppId">	
+		<return alias="getUserRoleOnUserIdAndRoleIdAndAppId" class="org.onap.portalapp.portal.domain.EPUserApp" />   	
+		<![CDATA[
+ 		select * from fn_user_role where user_id= :userId 
+ 		and role_id= :roleId 
+ 		and app_id= :appId
+ 		; 
+ 		]]>
+	</sql-query>
+
+	<sql-query name="userAppGlobalRoles">
+		<return alias="userAppGlobalRoles"
+			class="org.onap.portalapp.portal.domain.EPRole" />
+       <![CDATA[ 
+        select fr.role_id , fr.role_name ,fr.active_yn, fr.priority, fr.app_id, fr.app_role_id 
+        from fn_user_role a, fn_role fr, fn_user fu 
+        where a.role_id in (select b.role_id from ep_app_role_function b where b.role_app_id = 1 and b.app_id =:appId) and a.user_id =fu.user_id and a.role_id = fr.role_id and fr.active_yn='Y' and fu.active_yn='Y' and fu.user_id =:userId
+        ;             
+       ]]>
+	</sql-query>
+
+	<sql-query name="getAllCentralizedAppsRoles">
+		<return alias="allCentralizedAppsRoles"
+			class="org.onap.portalapp.portal.transport.CentralizedAppRoles" />
+       <![CDATA[ 
+        select distinct fa.app_id, fa.auth_namespace, fr.role_name, fr.role_id from fn_app fa,  fn_role fr where fa.auth_central = 'Y' and fa.auth_namespace is not null
+ 		and (fa.app_id = fr.app_id or COALESCE(fr.app_id,1) = fa.app_id) and fr.active_yn = 'Y' order by fa.app_id ;          
+       ]]>
+	</sql-query>
+
+	<sql-query name="getUserCentralizedAppRoles">
+		<return alias="userCentralizedAppRoles"
+			class="org.onap.portalapp.portal.transport.CentralizedAppRoles" />
+       <![CDATA[ 
+		select distinct fur.app_id, fa.auth_namespace, fr.role_name, fur.role_id from fn_user_role fur, fn_app fa, fn_role fr, fn_user fu 
+		where fa.app_id = fur.app_id 
+		and fr.role_id = fur.role_id
+		and fu.user_id = fur.user_id 
+		and fu.ORG_USER_ID = :orgUserId
+		and fa.auth_namespace is not null
+		and fr.active_yn = 'Y'
+		order by role_id;
+		]]>
+	</sql-query>
+	<sql-query name="getAprroverRoleFunctionsOfUser">
+		<![CDATA[
+		select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea
+		where fu.role_id = ep.role_id
+		and fu.app_id = ep.app_id
+		and fu.user_id =:userId
+		and ea.function_cd = ep.function_cd and ea.function_cd like 'approver|%'
+		and exists
+		(
+		select fa.app_id from fn_user fu, fn_user_role ur, fn_app fa where fu.user_id =:userId and fu.user_id = ur.user_id
+		and ur.app_id = fa.app_id and fa.enabled = 'Y'
+		);
+		]]>
+</sql-query>
+<sql-query name="getUserApproverRoles">
+		<![CDATA[
+		select distinct fr.role_name from fn_user_role fu, ep_app_role_function ep, ep_app_function ea, fn_role fr
+		where fu.role_id = ep.role_id
+		and fu.app_id = ep.app_id
+		and fu.user_id = :userId
+		and fu.role_id = fr.role_id and fr.active_yn='Y'
+		and ea.function_cd = ep.function_cd and ea.function_cd like 'approver|%'
+		and exists
+		(
+		select fa.app_id from fn_user fu, fn_user_role ur, fn_app fa where fu.user_id =:userId and fu.user_id = ur.user_id
+		and ur.app_id = fa.app_id and fa.enabled = 'Y'
+		);
+		]]>
+</sql-query>
+<sql-query name="getAdminAppsForTheUser">
+		<![CDATA[
+		select fa.app_id  from fn_user_role ur,fn_app fa where ur.user_id =:userId and ur.app_id=fa.app_id and ur.role_id= 999 and (fa.enabled = 'Y' || fa.app_id=1)
+
+	
+		]]>
+</sql-query>
+
+
+<sql-query name="getUserRoleOnUserIdAndAppId">	
+		<return alias="getUserRoleOnUserIdAndAppId" class="org.onap.portalapp.portal.domain.EPRole" />   	
+		<![CDATA[
+		
+		select fr.role_id , fr.role_name ,fr.active_yn, fr.priority, fr.app_id, fr.app_role_id  FROM fn_role fr, fn_user_role fur WHERE fr.role_id = fur.role_id AND fur.user_id= :userId AND fur.app_id = :appId AND fr.active_yn='Y'
+ 		
+ 		]]>
+	</sql-query>
+	
+	<sql-query name="getAllAdminAppsofTheUser">
+		<![CDATA[
+		select fa.app_id  from fn_user_role ur,fn_app fa where ur.user_id =:userId and ur.app_id=fa.app_id and ur.role_id= 999
+
+		]]>
+    </sql-query>
+	<sql-query name="getAllAppsFunctionsOfUser">
+			<![CDATA[
+			select distinct ep.function_cd from fn_user_role fu, ep_app_role_function ep, ep_app_function ea, fn_app fa , fn_role fr
+			where fu.role_id = ep.role_id 
+			and fu.app_id = ep.app_id
+			and fu.user_id =:userId
+			and ea.function_cd = ep.function_cd
+            and ((fu.app_id = fa.app_id  and fa.enabled = 'Y' ) or (fa.app_id = 1))
+            and fr.role_id = fu.role_id and fr.active_yn='Y' 
+		    union
+            select distinct app_r_f.function_cd from ep_app_role_function app_r_f, ep_app_function a_f
+			where role_id = 999
+			and app_r_f.function_cd = a_f.function_cd
+			and exists
+			(
+			select fa.app_id from fn_user fu, fn_user_role ur, fn_app fa where fu.user_id =:userId and fu.user_id = ur.user_id
+			and ur.role_id = 999 and ur.app_id = fa.app_id and fa.enabled = 'Y'
+			);
+			]]>
+	</sql-query>
+	<sql-query name="updateFnUser">
+		<![CDATA[
+			UPDATE fn_user fu SET fu.language_id=:language_id WHERE fu.login_id=:login_id
+		]]>
+	</sql-query>
 </hibernate-mapping>