diff options
| author |   Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-20 17:15:25 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-23 11:44:23 -0400 |
| commit | 4ee8967d2429a8ff633693dd35f39eb26c022816 (patch) | |
| tree | 98db22e86d24dde967d2988d1f577306faa39445 /ecomp-portal-BE-os/src/main/java/org/onap/portalapp | |
| parent | dd5350525356a73410e0619b2e25722dd932f893 (diff) | |
Docker changes and Music Integration
Issue-ID: PORTAL-136, PORTAL-155, PORTAL-210,PORTAL-217
Includes JUNITS and docker changes, music integration and security fixes
Change-Id: Ib974401b48efc1f0d4f98036b0028043c3283691
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-os/src/main/java/org/onap/portalapp')
| -rw-r--r-- | ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 06657301..c059a01c 100644 --- 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 @@ -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; @@ -100,6 +101,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 +121,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); |