diff options
Diffstat (limited to 'ecomp-portal-BE-os/src/main/java')
5 files changed, 6 insertions, 5 deletions
diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java index b6d384d5..06657301 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java @@ -114,7 +114,7 @@ import com.google.gson.Gson; @Configuration @EnableWebMvc -@ComponentScan(basePackages = {"org.onap", "org.openecomp" }, excludeFilters = { +@ComponentScan(basePackages = {"org.onap"}, excludeFilters = { @Filter(value = { LogoutController.class, SDKLoginController.class}, type = FilterType.ASSIGNABLE_TYPE) }) @Profile("src") @EnableAsync diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java index f340ec35..328d1d9d 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java @@ -55,7 +55,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable { @Override public String[] getPackagesToScan() { - return new String[] { "org.onap","org.openecomp" }; + return new String[] { "org.onap" }; } } diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java index 273a0b1e..b3019769 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/controller/LoginController.java @@ -130,7 +130,8 @@ public class LoginController extends EPUnRestrictedBaseController implements Log String loginId = root.get("loginId").textValue(); String password = root.get("password").textValue(); commandBean.setLoginId(loginId); - commandBean.setLoginPwd(CipherUtil.encrypt(password)); + commandBean.setLoginPwd(CipherUtil.encryptPKC(password)); + HashMap additionalParamsMap = new HashMap(); StringBuilder sbAdditionalInfo = new StringBuilder(); diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java index 82120e1c..559a182d 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java @@ -50,7 +50,7 @@ import org.springframework.stereotype.Component; /** * TODO REFACTOR moved from org.onap.portalsdk.core.scheduler to - * org.openecomp.portalapp.scheduler + * org.onap.portalapp.scheduler * */ @Component diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java index f3377055..271df279 100644 --- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java +++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/service/RemoteWebServiceCallServiceImpl.java @@ -59,7 +59,7 @@ public class RemoteWebServiceCallServiceImpl extends WebServiceCallServiceImpl i /* * (non-Javadoc) - * @see org.openecomp.portalapp.service.sessionmgt.RemoteWebServiceCallService#verifyRESTCredential(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + * @see org.onap.portalapp.service.sessionmgt.RemoteWebServiceCallService#verifyRESTCredential(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ public boolean verifyRESTCredential(String secretKey, String requestUebKey, String requestAppName, String requestPassword) throws Exception { |