aboutsummaryrefslogtreecommitdiffstats
path: root/dcae_dmaapbc_webapp/dbca-os/src
diff options
context:
space:
mode:
authorDominic Lunanuova <dgl@research.att.com>2018-02-07 22:10:00 +0000
committerDominic Lunanuova <dgl@research.att.com>2018-02-08 18:49:02 +0000
commitb9a6ae1246c02031deb7f5e0d016f242e7d99452 (patch)
treed71f92fe43309c79500dd111b7e0d483a4ba8d55 /dcae_dmaapbc_webapp/dbca-os/src
parentb5a2c68c1a2c00751575d938d983f4301822f6d3 (diff)
Refactor to use org.onap local packages
This is stage 1 of refactoring to use org.onap instead of org.openecomp in java packages and class names. Leaving the update from openecomp portalsdk to onap epsdk for a future exercise since I'm trying to get a standalone GUI working (i.e. non-portal). Issue-ID: DMAAP-159 Change-Id: I6a9368c66fa3603b1d9984f600802326ff2f0592 Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Diffstat (limited to 'dcae_dmaapbc_webapp/dbca-os/src')
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java)8
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java)2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java)4
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java)2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java)2
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java (renamed from dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java)3
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml2
7 files changed, 12 insertions, 11 deletions
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index ddb4bc2..c827e84 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -17,13 +17,13 @@
* limitations under the License.
* ================================================================================
*/
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.portalapp.lm.FusionLicenseManagerImpl;
-import org.openecomp.portalapp.login.LoginStrategyImpl;
+import org.onap.portalapp.lm.FusionLicenseManagerImpl;
+import org.onap.portalapp.login.LoginStrategyImpl;
import org.openecomp.portalapp.scheduler.LogRegistry;
import org.openecomp.portalsdk.core.auth.LoginStrategy;
import org.openecomp.portalsdk.core.conf.AppConfig;
@@ -55,7 +55,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
*/
@Configuration
@EnableWebMvc
-@ComponentScan(basePackages = "org.openecomp",
+@ComponentScan(basePackages = "org.openecomp, org.onap",
// Exclude unused annotated classes with heavy dependencies.
excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
// EPSDK-Analytics
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 6d7c72d..347bb51 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppInitializer.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -17,7 +17,7 @@
* limitations under the License.
* ================================================================================
*/
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
import org.openecomp.portalsdk.core.conf.AppInitializer;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index ce77960..cbff8a9 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/HibernateMappingLocations.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -17,7 +17,7 @@
* limitations under the License.
* ================================================================================
*/
-package org.openecomp.portalapp.conf;
+package org.onap.portalapp.conf;
import org.springframework.context.annotation.Profile;
import org.springframework.core.io.ClassPathResource;
@@ -54,7 +54,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable {
*/
@Override
public String[] getPackagesToScan() {
- return new String[] { "org.openecomp" };
+ return new String[] { "org.onap", "org.openecomp" };
}
}
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index abbf926..49a6070 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
@@ -18,7 +18,7 @@
* ================================================================================
*/
-package org.openecomp.portalapp.lm;
+package org.onap.portalapp.lm;
import java.util.Date;
import java.util.List;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 270e69f..1dd7abc 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
@@ -18,7 +18,7 @@
* ================================================================================
*/
-package org.openecomp.portalapp.login;
+package org.onap.portalapp.login;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
index 2b9b60e..cbc6af2 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
@@ -17,10 +17,11 @@
* limitations under the License.
* ================================================================================
*/
-package org.openecomp.portalapp.service;
+package org.onap.portalapp.service;
import java.util.Set;
+import org.openecomp.portalapp.service.IAdminAuthExtension;
import org.openecomp.portalsdk.core.domain.Role;
import org.openecomp.portalsdk.core.domain.User;
import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
index 869b349..4766277 100644
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/resources/logback.xml
@@ -80,7 +80,7 @@
<encoder>
<pattern>${applicationLoggerPattern}</pattern>
</encoder>
- <filter class="org.openecomp.fusionapp.util.CustomLoggingFilter" />
+ <filter class="org.onap.fusionapp.util.CustomLoggingFilter" />
</appender>
<appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">