From b94bd70f1595fad9546c3506393613f68504f495 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Sun, 11 Feb 2018 19:21:35 +0200 Subject: org.onap migration Change-Id: I77143c1fee8cb918a04881dfa4c33bedb811e9c6 Issue-ID: VID-86 Signed-off-by: Ofir Sonsino --- .../src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java | 2 +- .../main/java/org/onap/portalapp/conf/HibernateMappingLocations.java | 2 +- epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp | 2 +- epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 2 +- epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp | 2 +- epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'epsdk-app-onap/src/main') diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index eb110931e..1583bc92d 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -64,7 +64,7 @@ import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; */ @Configuration @EnableWebMvc -@ComponentScan(basePackages = "org.openecomp") +@ComponentScan(basePackages = {"org.openecomp", "org.onap"}) @PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true) @Profile("src") @EnableAsync diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index e0e09d6a9..3116346ee 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -51,7 +51,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { */ @Override public String[] getPackagesToScan() { - return new String[] { "org.openecomp" }; + return new String[] { "org.openecomp", "org.onap" }; } } diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp index ca840e62f..76fe13e4b 100644 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp @@ -43,7 +43,7 @@ -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp index 88131c593..7a983a109 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -87,7 +87,7 @@ -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp index 8678dcee1..87f863f0c 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp @@ -31,7 +31,7 @@ Consider / investigate replacing this approach with an alternative REST / Angular mechanism. --> -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp index 2c8022263..f8d8d9c3f 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp @@ -40,7 +40,7 @@ Consider / investigate replacing this approach with an alternative REST / Angular mechanism. --> -<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.onap.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) -- cgit 1.2.3-korg