summaryrefslogtreecommitdiffstats
path: root/ONAP-SDK-APP
diff options
context:
space:
mode:
authorTej, Tarun <tt3868@att.com>2017-08-09 13:50:38 -0400
committerTarun Tej Velaga <tt3868@att.com>2017-08-10 01:13:27 +0000
commitb51d8192e662e3ee8775235500cabb875f480e2b (patch)
tree470b8bbee4e2130898fc0cc2f524352c05bc0bbd /ONAP-SDK-APP
parente938284cec3b06a7f6587b7439eb378b69c3adf1 (diff)
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 <tt3868@att.com>
Diffstat (limited to 'ONAP-SDK-APP')
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java)8
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java)2
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java)4
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java)2
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/lm/LicenseableClassImpl.java)2
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java)2
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/Register.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/Register.java)3
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/scheduler/RegistryAdapter.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java)2
-rw-r--r--ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java (renamed from ONAP-SDK-APP/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java)10
-rw-r--r--ONAP-SDK-APP/src/main/resources/logback.xml2
-rw-r--r--ONAP-SDK-APP/src/main/resources/portal.properties2
11 files changed, 19 insertions, 20 deletions
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
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
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
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
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
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
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
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
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
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<Role> 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 @@
<encoder>
<pattern>${applicationLoggerPattern}</pattern>
</encoder>
- <filter class="org.onap.portalapp.util.CustomLoggingFilter" />
+ <filter class="org.openecomp.portalapp.util.CustomLoggingFilter" />
</appender>
<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
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