Code changes to address license issue

Change-Id: I1f2457e7cd3843be7a5384c3607d637769499aef
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-341

diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml
index 472848b..f96259d 100644 (file)
--- a/dcae_dmaapbc_webapp/dbca-os/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml
@@ -16,7 +16,7 @@
                <skiptests>true</skiptests>
                <springframework.version>4.2.0.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
-               <epsdk.version>1.1.0</epsdk.version>
+               <epsdk.version>2.2.0-SNAPSHOT</epsdk.version>
                <dbca.version>1.2.0-SNAPSHOT</dbca.version>
                <sonar.exclusions>**.js</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -78,7 +78,7 @@
                                                        </excludes>
                                                </overlay>
                                                <overlay>
-                                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                                       <groupId>org.onap.portal.sdk</groupId>
                                                        <artifactId>epsdk-app-overlay</artifactId>
                                                        <excludes>
                                                                <exclude>app/fusionapp/**</exclude>
@@ -151,19 +151,19 @@
                </dependency>
                <!-- SDK overlay war -->
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-app-overlay</artifactId>
                        <version>${epsdk.version}</version>
                        <type>war</type>
                </dependency>
                <!-- epsdk-app-core has dependency on analytics -->
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-analytics</artifactId>
                        <version>${epsdk.version}</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-app-common</artifactId>
                        <version>${epsdk.version}</version>
                        <type>jar</type>
@@ -171,14 +171,14 @@
                                <!-- common includes these at incorrect version -->
                                <exclusion>
                                        <artifactId>epsdk-analytics</artifactId>
-                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                       <groupId>org.onap.portal.sdk</groupId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                       <groupId>org.onap.portal.sdk</groupId>
                                        <artifactId>epsdk-core</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>org.openecomp.ecompsdkos</groupId>
+                                       <groupId>org.onap.portal.sdk</groupId>
                                        <artifactId>epsdk-workflow</artifactId>
                                </exclusion>
                                <exclusion>

diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index c827e84..9dbae28 100644 (file)
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -24,17 +24,15 @@ import java.util.List;
 
 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;
-import org.openecomp.portalsdk.core.conf.Configurable;
-import org.openecomp.portalsdk.core.lm.FusionLicenseManager;
-import org.openecomp.portalsdk.core.lm.FusionLicenseManagerUtils;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.objectcache.AbstractCacheManager;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.CacheManager;
-import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.onap.portalapp.scheduler.LogRegistry;
+import org.onap.portalsdk.core.auth.LoginStrategy;
+import org.onap.portalsdk.core.conf.AppConfig;
+import org.onap.portalsdk.core.conf.Configurable;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.objectcache.AbstractCacheManager;
+import org.onap.portalsdk.core.service.DataAccessService;
+import org.onap.portalsdk.core.util.CacheManager;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -59,19 +57,19 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
                // Exclude unused annotated classes with heavy dependencies.
                excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = {
                                // EPSDK-Analytics
-                               org.openecomp.portalsdk.analytics.system.fusion.adapter.FusionAdapter.class,
-                               org.openecomp.portalsdk.analytics.system.fusion.adapter.RaptorAdapter.class,
-                               org.openecomp.portalsdk.analytics.system.fusion.web.RaptorController.class,
-                               org.openecomp.portalsdk.analytics.system.fusion.web.RaptorControllerAsync.class,
-                               org.openecomp.portalsdk.analytics.system.fusion.DbUtils.class,
+                               org.onap.portalsdk.analytics.system.fusion.adapter.FusionAdapter.class,
+                               org.onap.portalsdk.analytics.system.fusion.adapter.RaptorAdapter.class,
+                               org.onap.portalsdk.analytics.system.fusion.web.RaptorController.class,
+                               org.onap.portalsdk.analytics.system.fusion.web.RaptorControllerAsync.class,
+                               org.onap.portalsdk.analytics.system.fusion.DbUtils.class,
                                // EPSDK-App-Common
-                               org.openecomp.portalapp.controller.sample.ElasticSearchController.class, 
+                               org.onap.portalapp.controller.sample.ElasticSearchController.class, 
                                LogRegistry.class, 
-                               org.openecomp.portalapp.controller.sample.PostDroolsController.class,
+                               org.onap.portalapp.controller.sample.PostDroolsController.class,
                                // EPSDK-Core
-                               org.openecomp.portalsdk.core.scheduler.CoreRegister.class,
-                               org.openecomp.portalsdk.core.scheduler.CronRegistry.class,
-                               org.openecomp.portalsdk.core.service.PostDroolsService.class 
+                               org.onap.portalsdk.core.scheduler.CoreRegister.class,
+                               org.onap.portalsdk.core.scheduler.CronRegistry.class,
+                               org.onap.portalsdk.core.service.PostDroolsService.class 
                                }))
 @Profile("src")
 @EnableAsync
@@ -87,7 +85,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 
        /*
         * (non-Javadoc)
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#viewResolver()
+        * @see org.onap.portalsdk.core.conf.AppConfig#viewResolver()
         */
        public ViewResolver viewResolver() {
                return super.viewResolver();
@@ -95,7 +93,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 
        /*
         * (non-Javadoc)
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#addResourceHandlers(org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry)
+        * @see org.onap.portalsdk.core.conf.AppConfig#addResourceHandlers(org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry)
         */
        @Override
        public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -104,7 +102,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 
        /*
         * (non-Javadoc)
-        * @see org.openecomp.portalsdk.core.conf.AppConfig#dataAccessService()
+        * @see org.onap.portalsdk.core.conf.AppConfig#dataAccessService()
         */
        @Override
        public DataAccessService dataAccessService() {
@@ -154,6 +152,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                return new CacheManager();
        }
 
+/*
        @Bean
        public FusionLicenseManager fusionLicenseManager() {
                return new FusionLicenseManagerImpl();
@@ -163,6 +162,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
        public FusionLicenseManagerUtils fusionLicenseManagerUtils() {
                return new FusionLicenseManagerUtils();
        }
+*/
 
        @Bean
        public LoginStrategy loginStrategy() {

diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 1dd7abc..c400561 100644 (file)
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
@@ -24,11 +24,11 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openecomp.portalsdk.core.auth.LoginStrategy;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
-import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
-import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.onap.portalsdk.core.auth.LoginStrategy;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.web.servlet.ModelAndView;
 
 /**

diff --git a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
index cbc6af2..424aebc 100644 (file)
--- a/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
+++ b/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/onap/service/AdminAuthExtension.java
@@ -21,10 +21,10 @@ 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;
+import org.onap.portalapp.service.IAdminAuthExtension; 
+import org.onap.portalsdk.core.domain.Role;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;