From c607da68bfb7f7440d5be7f0396609dc01eb0e90 Mon Sep 17 00:00:00 2001 From: sa282w Date: Tue, 1 May 2018 16:45:26 -0400 Subject: Changes for 2.4.0-SNAPSHOT Issue-ID: PORTAL-210 Included the pom changes for 2.4.0-SNAPSHOT, music and AAF changes. Change-Id: Ib1e1c2679271aa40eb3b50397724e8cdc5ffe01c Signed-off-by: sa282w --- .../src/main/resources/music.properties | 32 +++++++++++++--------- .../epsdk-app-os/src/main/webapp/WEB-INF/web.xml | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'ecomp-sdk/epsdk-app-os/src/main') diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties index 635ccb50..fdf6e499 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties +++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties @@ -1,24 +1,30 @@ -music.endpoint = http://vm-ep-dev4.research.att.com/MUSIC/rest/ -music.version = v2 -music.keyspace = keyspaces music.session.keyspace = test_session music.session.attr.tables = spring_session_attributes music.session.meta.tables = spring_session -music.x.minor.version = 3 -music.x.patch.version = 0 -music.ns = com.att.ecomp.portal.demeter -music.user.id = m00468@portal.ecomp.att.com -music.password = friedG33nS- -music.consistency.info = type -music.consistency.info.value = eventual -music.cache = false +#music.cache = false music.serialize.compress = true music.session.max.inactive.interval.seconds = 1800 +music.exclude.api = /portalApi/healthCheck,/portalApi/healthCheckSuspend,/portalApi/healthCheckResume #By default it's eventual music.atomic.get = false music.atomic.put = false - +#how often the session clean up would happen (hour) +music.cleanup.frequency = 6 +#how old of session need to be cleaned up (hour) +music.cleanup.threshold = 10 cassandra.host=135.197.226.103 zookeeper.host=135.197.226.103, 135.197.226.108, 135.197.226.119 cassandra.user=cassandra -cassandra.password=cassandra \ No newline at end of file +cassandra.password=cassandra + +#Music API +#music.endpoint = http://vm-ep-dev4.research.att.com/MUSIC/rest/ +#music.version = v2 +#music.keyspace = keyspaces +#music.x.minor.version = 3 +#music.x.patch.version = 0 +#music.ns = com.att.ecomp.portal.demeter +#music.user.id = m00468@portal.ecomp.att.com +#music.password = friedG33nS- +#music.consistency.info = type +#music.consistency.info.value = eventual \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml index b5963e64..8392e8d4 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml @@ -23,7 +23,7 @@ springSessionRepositoryFilter - org.springframework.web.filter.DelegatingFilterProxy + org.onap.portalapp.music.filter.MusicSessionRepositoryFilter springSessionRepositoryFilter -- cgit 1.2.3-korg