aboutsummaryrefslogtreecommitdiffstats
path: root/dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-10-11 11:33:47 -0400
committerChris Lott <cl778h@att.com>2017-10-11 18:53:59 +0000
commitc9dbe4f1b27c47d23102b8e0da880ccb5de9efa4 (patch)
tree77e20de71d4e34765cf673caf8ce7041715d954b /dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf
parent9b8af9d7c37b3ab3e5dc9d16c95578b6f653c973 (diff)
Exclude unneeded classes so app will start
1. The webapp fails to start in WindRiver (same docker image works in Rackspace). Extend app configuration to exclude unneeded class where the error happens. 2. Use MariaDB connector; drop Mysql connector. Issue: DMAAP-159, PORTAL-20 Change-Id: I203e0d463308011eb18085974001118958a2abaf Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com> (cherry picked from commit 4c9cbdc7bf459490fe75d60ff3676e6ce34eb6b1)
Diffstat (limited to 'dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf')
-rw-r--r--dcae_dmaapbc_webapp/dbca-os/src/main/java/org/openecomp/portalapp/conf/ExternalAppConfig.java29
1 files changed, 19 insertions, 10 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/openecomp/portalapp/conf/ExternalAppConfig.java
index 4988857..ddb4bc2 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/openecomp/portalapp/conf/ExternalAppConfig.java
@@ -22,8 +22,6 @@ package org.openecomp.portalapp.conf;
import java.util.ArrayList;
import java.util.List;
-import org.openecomp.portalapp.controller.sample.ElasticSearchController;
-import org.openecomp.portalapp.controller.sample.PostDroolsController;
import org.openecomp.portalapp.lm.FusionLicenseManagerImpl;
import org.openecomp.portalapp.login.LoginStrategyImpl;
import org.openecomp.portalapp.scheduler.LogRegistry;
@@ -34,10 +32,7 @@ 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.scheduler.CoreRegister;
-import org.openecomp.portalsdk.core.scheduler.CronRegistry;
import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.service.PostDroolsService;
import org.openecomp.portalsdk.core.util.CacheManager;
import org.openecomp.portalsdk.core.util.SystemProperties;
import org.springframework.context.annotation.Bean;
@@ -54,16 +49,30 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
/**
- * ECOMP Portal SDK sample application. ECOMP Portal SDK core AppConfig class to
- * reuse interceptors, view resolvers and other features defined there.
+ * Configures Spring features in the DMaaP Bus Control web application.
+ * Subclasses the ECOMP Portal SDK core AppConfig class to reuse interceptors,
+ * view resolvers and other features defined there.
*/
@Configuration
@EnableWebMvc
@ComponentScan(basePackages = "org.openecomp",
// Exclude unused annotated classes with heavy dependencies.
- excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = { CoreRegister.class,
- CronRegistry.class, ElasticSearchController.class, LogRegistry.class, PostDroolsController.class,
- PostDroolsService.class }))
+ 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,
+ // EPSDK-App-Common
+ org.openecomp.portalapp.controller.sample.ElasticSearchController.class,
+ LogRegistry.class,
+ org.openecomp.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
+ }))
@Profile("src")
@EnableAsync
@EnableScheduling