From b51d8192e662e3ee8775235500cabb875f480e2b Mon Sep 17 00:00:00 2001 From: "Tej, Tarun" Date: Wed, 9 Aug 2017 13:50:38 -0400 Subject: [PATCH] Fix console issues Reverted package names to org.openecomp to fix portal issues Issue-ID: POLICY-144 Change-Id: Ie108db431b9d211b15c59a29e564517c785e0da5 Signed-off-by: Tarun Tej Velaga --- .../java/org/onap/policy/rest/jpa/PolicyEntity.java | 15 --------------- .../portalapp/conf/ExternalAppConfig.java | 8 ++++---- .../portalapp/conf/ExternalAppInitializer.java | 2 +- .../portalapp/conf/HibernateMappingLocations.java | 4 ++-- .../portalapp/lm/FusionLicenseManagerImpl.java | 2 +- .../portalapp/lm/LicenseableClassImpl.java | 2 +- .../portalapp/login/LoginStrategyImpl.java | 2 +- .../portalapp/scheduler/Register.java | 3 +-- .../portalapp/scheduler/RegistryAdapter.java | 2 +- .../portalapp/service/AdminAuthExtension.java | 10 +++++----- ONAP-SDK-APP/src/main/resources/logback.xml | 2 +- ONAP-SDK-APP/src/main/resources/portal.properties | 2 +- .../org/onap/policy/admin/PolicyManagerServlet.java | 2 +- .../onap/policy/controller/AutoPushController.java | 2 +- .../controller/CreateBRMSParamController.java | 21 +-------------------- .../org/onap/policy/controller/PDPController.java | 2 +- .../onap/policy/controller/PolicyController.java | 2 +- .../controller/PolicyExportAndImportController.java | 2 +- .../org/{onap => openecomp}/policy/model/Roles.java | 2 +- .../webapp/app/policyApp/main/policyEditor.html | 2 +- .../onap/policy/admin/PolicyManagerServletTest.java | 2 +- .../onap/policy/controller/PDPControllerTest.java | 2 +- .../servers/onap/WEB-INF/classes/portal.properties | 2 +- 23 files changed, 30 insertions(+), 65 deletions(-) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/conf/ExternalAppConfig.java (96%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/conf/ExternalAppInitializer.java (97%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/conf/HibernateMappingLocations.java (95%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/lm/FusionLicenseManagerImpl.java (96%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/lm/LicenseableClassImpl.java (97%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/login/LoginStrategyImpl.java (98%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/scheduler/Register.java (96%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/scheduler/RegistryAdapter.java (98%) rename ONAP-SDK-APP/src/main/java/org/{onap => openecomp}/portalapp/service/AdminAuthExtension.java (89%) rename POLICY-SDK-APP/src/main/java/org/{onap => openecomp}/policy/model/Roles.java (98%) diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java index 4cb4440c1..265d2f65b 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java @@ -136,21 +136,6 @@ public class PolicyEntity implements Serializable { public void preUpdate() { this.modifiedDate = new Date(); } - - /* - public void resetPolicyVersion(){ - this.policyVersion = 1; - } - public void advancePolicyVersion(){ - this.policyVersion++; - } - public int getPolicyVersion(){ - return this.policyVersion; - } - public void setPolicyVersion(int polVer){ - this.policyVersion = polVer; - } - */ /** * @return the policyId diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java similarity index 96% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java index 15a6c765e..91ed598cf 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java @@ -17,13 +17,13 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.conf; +package org.openecomp.portalapp.conf; import java.util.ArrayList; import java.util.List; -import org.onap.portalapp.login.LoginStrategyImpl; -import org.onap.portalapp.scheduler.RegistryAdapter; +import org.openecomp.portalapp.login.LoginStrategyImpl; +import org.openecomp.portalapp.scheduler.RegistryAdapter; import org.openecomp.portalsdk.core.auth.LoginStrategy; import org.openecomp.portalsdk.core.conf.AppConfig; import org.openecomp.portalsdk.core.conf.Configurable; @@ -52,7 +52,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry */ @Configuration @EnableWebMvc -@ComponentScan(basePackages = "org.onap") +@ComponentScan(basePackages = "org.onap, org.openecomp") @PropertySource(value = { "${container.classpath:}/WEB-INF/conf/app/test.properties" }, ignoreResourceNotFound = true) @Profile("src") @EnableAsync diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java similarity index 97% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java index a77c781ff..2a904ce3c 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.conf; +package org.openecomp.portalapp.conf; import org.openecomp.portalsdk.core.conf.AppInitializer; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java similarity index 95% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java index ee73a5a98..c66a96c6b 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.conf; +package org.openecomp.portalapp.conf; import org.springframework.context.annotation.Profile; import org.springframework.core.io.ClassPathResource; @@ -51,7 +51,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { */ @Override public String[] getPackagesToScan() { - return new String[] { "org.onap" }; + return new String[] { "org.onap", "org.openecomp" }; } } diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java similarity index 96% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java index 5028162b5..4993a005d 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java @@ -1,4 +1,4 @@ -package org.onap.portalapp.lm; +package org.openecomp.portalapp.lm; import java.util.Date; import java.util.List; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java similarity index 97% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java index d3b08e242..26c5d9174 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.lm; +package org.openecomp.portalapp.lm; import java.io.FileNotFoundException; import java.io.InputStream; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java similarity index 98% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java index dca71ae5f..a4b684719 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java @@ -1,4 +1,4 @@ -package org.onap.portalapp.login; +package org.openecomp.portalapp.login; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java similarity index 96% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java index b33707f2a..0bb7da14a 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java @@ -17,12 +17,11 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.scheduler; +package org.openecomp.portalapp.scheduler; import java.util.ArrayList; import java.util.List; -import org.openecomp.portalapp.scheduler.LogRegistry; import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.openecomp.portalsdk.core.scheduler.Registerable; import org.openecomp.portalsdk.core.util.SystemProperties; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java similarity index 98% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java index 40069cf77..18b3fa45f 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java @@ -17,7 +17,7 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.scheduler; +package org.openecomp.portalapp.scheduler; import java.util.ArrayList; import java.util.Arrays; diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java similarity index 89% rename from ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java rename to ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java index dadb66c8e..db5c0a69a 100644 --- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java +++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java @@ -17,13 +17,13 @@ * limitations under the License. * ================================================================================ */ -package org.onap.portalapp.service; +package org.openecomp.portalapp.service; import java.util.Set; -import org.onap.policy.model.Roles; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.UserInfo; +import org.openecomp.policy.model.Roles; import org.openecomp.portalapp.service.IAdminAuthExtension; import org.openecomp.portalsdk.core.domain.Role; import org.openecomp.portalsdk.core.domain.User; @@ -48,7 +48,7 @@ public class AdminAuthExtension implements IAdminAuthExtension { /* * (non-Javadoc) - * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserExtension(org.openecomp.portalsdk.core.domain.User) */ public void saveUserExtension(User user) { logger.debug("saveUserExtension"); @@ -57,7 +57,7 @@ public class AdminAuthExtension implements IAdminAuthExtension { /* * (non-Javadoc) - * @see org.onap.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#editUserExtension(org.openecomp.portalsdk.core.domain.User) */ public void editUserExtension(User user) { logger.debug("editUserExtension"); @@ -65,7 +65,7 @@ public class AdminAuthExtension implements IAdminAuthExtension { /* * (non-Javadoc) - * @see org.onap.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) + * @see org.openecomp.portalapp.service.IAdminAuthExtension#saveUserRoleExtension(java.util.Set, org.openecomp.portalsdk.core.domain.User) */ public void saveUserRoleExtension(Set roles, User user) { logger.debug("saveUserRoleExtension"); diff --git a/ONAP-SDK-APP/src/main/resources/logback.xml b/ONAP-SDK-APP/src/main/resources/logback.xml index 5340181f1..fe4aac919 100644 --- a/ONAP-SDK-APP/src/main/resources/logback.xml +++ b/ONAP-SDK-APP/src/main/resources/logback.xml @@ -99,7 +99,7 @@ ${applicationLoggerPattern} - + diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties index deca4e34b..2ab096f1a 100644 --- a/ONAP-SDK-APP/src/main/resources/portal.properties +++ b/ONAP-SDK-APP/src/main/resources/portal.properties @@ -40,7 +40,7 @@ use_rest_for_functional_menu=true ########################################################################## # Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl +portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl # CSP Global Log On for single sign on onap_redirect_url = todo_csp_global_logon diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java index 036d13aa6..6fab5a608 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java @@ -66,7 +66,6 @@ import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.components.HumanPolicyComponent; import org.onap.policy.controller.PolicyController; import org.onap.policy.controller.PolicyExportAndImportController; -import org.onap.policy.model.Roles; import org.onap.policy.rest.XACMLRest; import org.onap.policy.rest.XACMLRestProperties; import org.onap.policy.rest.adapter.PolicyRestAdapter; @@ -79,6 +78,7 @@ import org.onap.policy.rest.jpa.UserInfo; import org.onap.policy.utils.PolicyUtils; import org.onap.policy.xacml.api.XACMLErrorConstants; import org.onap.policy.xacml.util.XACMLPolicyScanner; +import org.openecomp.policy.model.Roles; import org.openecomp.portalsdk.core.web.support.UserUtils; import com.att.research.xacml.util.XACMLProperties; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java index f78a79c9c..7d601d6f3 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java @@ -46,7 +46,6 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.model.PDPGroupContainer; import org.onap.policy.model.PDPPolicyContainer; -import org.onap.policy.model.Roles; import org.onap.policy.rest.adapter.AutoPushTabAdapter; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.PolicyEntity; @@ -55,6 +54,7 @@ import org.onap.policy.xacml.api.XACMLErrorConstants; import org.onap.policy.xacml.api.pap.OnapPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPPolicy; +import org.openecomp.policy.model.Roles; import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.openecomp.portalsdk.core.web.support.JsonMessage; import org.openecomp.portalsdk.core.web.support.UserUtils; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java index 3107950c9..9104b9822 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java @@ -20,12 +20,7 @@ package org.onap.policy.controller; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; import java.io.PrintWriter; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -367,25 +362,11 @@ public class CreateBRMSParamController extends RestrictedBaseController { public void paramUIGenerate(PolicyRestAdapter policyAdapter, PolicyEntity entity) { String data = entity.getConfigurationData().getConfigBody(); if(data != null){ - File file = new File(PolicyController.getConfigHome() +File.separator+ entity.getConfigurationData().getConfigurationName()); - if(file.exists()){ - try (BufferedReader br = new BufferedReader(new FileReader(file))) { - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); - while (line != null) { - sb.append(line); - sb.append("\n"); - line = br.readLine(); - } - }catch(Exception e){ - policyLogger.error(XACMLErrorConstants.ERROR_DATA_ISSUE+ e.getMessage() + e); - } - } try { StringBuilder params = new StringBuilder(""); Boolean flag = false; Boolean comment = false; - for (String line : Files.readAllLines(Paths.get(file.toString()))) { + for (String line : data.split("\n")) { if (line.isEmpty() || line.startsWith("//")) { continue; } diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java index 0f8a3c988..f40587d4b 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java @@ -37,11 +37,11 @@ import org.json.JSONObject; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.model.PDPGroupContainer; -import org.onap.policy.model.Roles; import org.onap.policy.xacml.api.XACMLErrorConstants; import org.onap.policy.xacml.api.pap.OnapPDPGroup; import org.onap.policy.xacml.std.pap.StdPDP; import org.onap.policy.xacml.std.pap.StdPDPGroup; +import org.openecomp.policy.model.Roles; import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.openecomp.portalsdk.core.web.support.JsonMessage; import org.openecomp.portalsdk.core.web.support.UserUtils; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java index aa1918967..375ee2d10 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java @@ -40,7 +40,6 @@ import org.json.JSONObject; import org.onap.policy.admin.PolicyNotificationMail; import org.onap.policy.admin.RESTfulPAPEngine; import org.onap.policy.model.PDPGroupContainer; -import org.onap.policy.model.Roles; import org.onap.policy.rest.XACMLRestProperties; import org.onap.policy.rest.XacmlAdminAuthorization; import org.onap.policy.rest.dao.CommonClassDao; @@ -49,6 +48,7 @@ import org.onap.policy.rest.jpa.FunctionDefinition; import org.onap.policy.rest.jpa.PolicyEntity; import org.onap.policy.rest.jpa.PolicyVersion; import org.onap.policy.rest.jpa.UserInfo; +import org.openecomp.policy.model.Roles; import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.openecomp.portalsdk.core.web.support.JsonMessage; import org.openecomp.portalsdk.core.web.support.UserUtils; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java index 92794dda9..d26781c0f 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyExportAndImportController.java @@ -45,7 +45,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.json.JSONObject; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.model.Roles; import org.onap.policy.rest.adapter.PolicyExportAdapter; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.ActionBodyEntity; @@ -55,6 +54,7 @@ import org.onap.policy.rest.jpa.PolicyEntity; import org.onap.policy.rest.jpa.PolicyVersion; import org.onap.policy.rest.jpa.UserInfo; import org.onap.policy.xacml.api.XACMLErrorConstants; +import org.openecomp.policy.model.Roles; import org.openecomp.portalsdk.core.controller.RestrictedBaseController; import org.openecomp.portalsdk.core.web.support.UserUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/Roles.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/Roles.java similarity index 98% rename from POLICY-SDK-APP/src/main/java/org/onap/policy/model/Roles.java rename to POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/Roles.java index 51e78d0e5..31a41ca7b 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/model/Roles.java +++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/model/Roles.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.policy.model; +package org.openecomp.policy.model; import java.io.Serializable; diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html index 1c43444dd..6ae6b88e2 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html @@ -216,7 +216,7 @@ - + diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java index e61742f1c..e3de43a83 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyManagerServletTest.java @@ -40,7 +40,6 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.policy.controller.CreateDcaeMicroServiceController; import org.onap.policy.controller.PolicyController; -import org.onap.policy.model.Roles; import org.onap.policy.rest.dao.CommonClassDao; import org.onap.policy.rest.jpa.ActionBodyEntity; import org.onap.policy.rest.jpa.ConfigurationDataEntity; @@ -49,6 +48,7 @@ import org.onap.policy.rest.jpa.PolicyEditorScopes; import org.onap.policy.rest.jpa.PolicyEntity; import org.onap.policy.rest.jpa.PolicyVersion; import org.onap.policy.rest.jpa.UserInfo; +import org.openecomp.policy.model.Roles; public class PolicyManagerServletTest extends Mockito{ diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java index 55a2288c7..8433c4740 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PDPControllerTest.java @@ -34,10 +34,10 @@ import org.junit.Test; import org.mockito.Mockito; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; -import org.onap.policy.model.Roles; import org.onap.policy.xacml.api.pap.OnapPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPGroup; import org.onap.policy.xacml.std.pap.StdPDPGroupStatus; +import org.openecomp.policy.model.Roles; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties index e7332be87..6b5ba6186 100644 --- a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties +++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties @@ -41,7 +41,7 @@ use_rest_for_functional_menu=true ########################################################################## # Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl +portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl # CSP Global Log On for single sign on onap_redirect_url = ${{ONAP_REDIRECT_URL}} -- 2.16.6