From 9acf56e5cdd1c7287753f7df1e99573b4d0fbd0f Mon Sep 17 00:00:00 2001 From: "Kishore Reddy, Gujja (kg811t)" Date: Fri, 27 Apr 2018 17:06:02 -0400 Subject: pom, new modules changes Issue-ID: PORTAL-254 portal/SDK release 2.3.0, domain, sdk aaf modules Change-Id: I9634b902e6127e6b649d163146b5304f78a55b1c Signed-off-by: Kishore Reddy, Gujja (kg811t) --- .../src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/ebz_template.jsp | 2 +- .../webapp/WEB-INF/fusion/jsp/ebz_template_noheader_nofooter.jsp | 2 +- .../webapp/WEB-INF/fusion/jsp/ebz_template_report_embedded.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/es_search_demo.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/es_suggest_demo.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/frame_insert.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/include.jsp | 2 +- .../epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/meta.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/popup_modal.html | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/popup_modal_role.html | 2 +- .../main/webapp/WEB-INF/fusion/jsp/popup_modal_rolefunction.html | 2 +- .../src/main/webapp/WEB-INF/fusion/jsp/webrtc/collaboration.jsp | 2 +- .../src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml | 2 +- .../src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml | 2 +- ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp | 7 +++---- .../epsdk-app-overlay/src/main/webapp/WEB-INF/jsp/leafletMap.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/login_external_ng.jsp | 2 +- .../epsdk-app-overlay/src/main/webapp/WEB-INF/jsp/net_map.jsp | 2 +- ecomp-sdk/epsdk-app-overlay/src/main/webapp/index.jsp | 2 +- ecomp-sdk/epsdk-app-overlay/src/main/webapp/manifest.jsp | 2 +- 27 files changed, 29 insertions(+), 30 deletions(-) (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp') diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp index f3685fac..07af86bc 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast.jsp @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> <%@ page import="org.onap.portalsdk.core.web.support.UserUtils" %> <%@ page import="org.onap.portalsdk.core.web.support.ControllerProperties" %> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp index 6d0de634..85c7ee8d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/broadcast_list.jsp @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> <%@ page import="java.util.*" %> <%@ page import="com.fasterxml.jackson.databind.ObjectMapper" %> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp index 7138c47d..a52c4208 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/data_out.jsp @@ -33,6 +33,6 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> ${model.output_string} diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp index 2916106a..afb4c8ed 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> <%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp index 8fcbc9c2..ec139aef 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_footer.jsp @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp index 0b986555..dd7d8dbd 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html index c58b88ce..dca7c7ee 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ebz/loginSnippet.html @@ -33,7 +33,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + -->