From 627a4a8c29263748c914f04e5f3ed82c351f2cf8 Mon Sep 17 00:00:00 2001 From: Hima Elisetty Date: Fri, 20 Apr 2018 13:53:02 -0400 Subject: Replace ecomp reference Issue-ID: PORTAL-19 Remove ecomp trademark Change-Id: Ic864f6cfdeeddad1e7d384abd3419ae21b832062 Signed-off-by: Hima Elisetty --- ecomp-sdk/epsdk-app-os/README.md | 1 + .../src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java | 2 +- .../src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java | 2 +- .../main/java/org/onap/portalapp/conf/HibernateMappingLocations.java | 2 +- .../src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java | 2 +- .../src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java | 2 +- .../src/main/java/org/onap/portalapp/scheduler/Register.java | 2 +- .../src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java | 2 +- .../src/main/java/org/onap/portalapp/service/AdminAuthExtension.java | 2 +- ecomp-sdk/epsdk-app-os/src/main/resources/key.properties | 2 +- ecomp-sdk/epsdk-app-os/src/main/resources/logback.xml | 2 +- ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties | 2 +- .../epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp | 2 +- .../epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml | 2 +- .../src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml | 2 +- ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/index.jsp | 2 +- ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp | 2 +- ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp | 2 +- 18 files changed, 18 insertions(+), 17 deletions(-) (limited to 'ecomp-sdk/epsdk-app-os') diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index a6a748f4..fc06e4a3 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -16,6 +16,7 @@ Version 2.2.0 - PORTAL 136 Junits for SDK - PORTAL 87 hibernate mapping in epsdk-overlay forces use of analytics dependency jar - PORTAL 155 Review security issues: portal +- PORTAL-202 Remove files that have GPL or other license issues Version 2.1.0 - PORTAL 161 Refer epsdk-app-common diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index 9c777b9e..0646b41b 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.conf; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index c8fbc434..280a4eae 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.conf; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index 77a4de64..8d4ea01d 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.conf; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java index 0a1f340d..4bc8b436 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java @@ -34,7 +34,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.filter; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java index 729cfd1f..074311dc 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.login; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/Register.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/Register.java index d1a2c51a..395fbab2 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/Register.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/Register.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.scheduler; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java index 9f8f7279..a56ce92c 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.scheduler; diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java index 076e6fd7..616ccd1f 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java @@ -33,7 +33,7 @@ * * ============LICENSE_END============================================ * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * */ package org.onap.portalapp.service; diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/key.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/key.properties index aa3355d1..0315075e 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/key.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/key.properties @@ -33,7 +33,7 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ### # Properties read by the ECOMP Framework library (epsdk-fw) diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/logback.xml b/ecomp-sdk/epsdk-app-os/src/main/resources/logback.xml index 2cb5fb7c..3274c359 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/logback.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/logback.xml @@ -34,7 +34,7 @@ ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. + --> diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties index 713c6449..05fd65c2 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties @@ -33,7 +33,7 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ### # Properties read by ECOMP Framework library, ecompFW.jar diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp index 5cafe15c..53e1c2e9 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.jsp +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/jsp/ds2/left-menu.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-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml index 5a634c88..bd31efaf 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/orm/Analytics.hbm.xml @@ -34,7 +34,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" %> diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp index cd6a22f4..a91a3a9b 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login.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.util.SystemProperties"%> diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp index 15e228ec..2545c938 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/jsp/login_external.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.util.SystemProperties"%> -- cgit 1.2.3-korg