Bulk upload changes and music health check apis

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / conf / ExternalAppConfig.java

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 0bdcaeb..ee53eba 100644 (file)
--- 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
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.conf;
 
@@ -61,6 +61,7 @@ import org.onap.portalapp.authentication.OpenIdConnectLoginStrategy;
 import org.onap.portalapp.authentication.SimpleLoginStrategy;
 import org.onap.portalapp.controller.core.LogoutController;
 import org.onap.portalapp.controller.core.SDKLoginController;
+import org.onap.portalapp.music.conf.MusicSessionConfig;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EPUserApp;
@@ -73,7 +74,6 @@ import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalapp.portal.service.UserRolesService;
 import org.onap.portalapp.portal.transport.ExternalAuthUserRole;
 import org.onap.portalapp.portal.transport.ExternalRoleDescription;
-import org.onap.portalapp.portal.ueb.EPUebHelper;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EPSystemProperties;
 import org.onap.portalapp.scheduler.RegistryAdapter;
@@ -100,6 +100,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -119,7 +120,7 @@ import com.google.gson.Gson;
 @Profile("src")
 @EnableAsync
 @EnableScheduling
-
+@Import({ MusicSessionConfig.class })
 public class ExternalAppConfig extends AppConfig implements Configurable {
 
        private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
@@ -284,7 +285,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                registry.addInterceptor(sessionTimeoutInterceptor()).excludePathPatterns("/oid-login", "/portalApi/healthCheck",
                                "/portalApi/healthCheck/", "/portalApi/healthCheckSuspend", "/portalApi/healthCheckSuspend/",
                                "/portalApi/healthCheckResume", "/portalApi/healthCheckResume/", "/login_external",
-                               "/login_external.htm*", "login", "/login.htm*", "/auxapi/*", "/context/*", "/api*",
+                               "/login_external.htm*", "login", "/login.htm*", "/auxapi/**/*", "/context/*", "/api*",
                                "/single_signon.htm", "/single_signon", "/dashboard", "/OpenSourceLogin.htm");
 
                registry.addInterceptor(portalResourceInterceptor());
@@ -298,11 +299,11 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         * @return New instance of {@link SchedulerFactoryBean}
         */
 
-       @Bean
+/*     @Bean
        public EPUebHelper epUebHelper() {
                return new EPUebHelper();
        }
-
+*/
        @Bean
        public HealthMonitor healthMonitor() {
                return new HealthMonitor();