aboutsummaryrefslogtreecommitdiffstats
path: root/WebContent/WEB-INF
diff options
context:
space:
mode:
Diffstat (limited to 'WebContent/WEB-INF')
-rw-r--r--WebContent/WEB-INF/music.properties.sample3
-rw-r--r--WebContent/WEB-INF/web.xml14
2 files changed, 10 insertions, 7 deletions
diff --git a/WebContent/WEB-INF/music.properties.sample b/WebContent/WEB-INF/music.properties.sample
index d562429b..41b919fe 100644
--- a/WebContent/WEB-INF/music.properties.sample
+++ b/WebContent/WEB-INF/music.properties.sample
@@ -6,7 +6,6 @@ all.public.ips=12.13.14.45:12.13.14.46:12.13.14.47
#######################################
# Optional current values are defaults
#######################################
-#zookeeper.host=localhost
#cassandra.host=localhost
#music.ip=localhost
#debug=true
@@ -15,5 +14,7 @@ all.public.ips=12.13.14.45:12.13.14.46:12.13.14.47
# Cassandra Username and password
cassandra.user=cassandra
cassandra.password=cassandra
+cassandra.connecttimeoutms=5000
+cassandra.readtimeoutms=5000
# AAF Endpoint
aaf.endpoint.url=http://aafendpoint/proxy/authz/nss/ \ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 7b6caf4c..f6c4986e 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
<display-name>MUSIC</display-name>
+ <!--
<listener>
- <listener-class>
- org.onap.music.main.PropertiesListener
- </listener-class>
+ <listener-class>
+ org.onap.music.main.PropertiesListener
+ </listener-class>
</listener>
+ -->
<listener>
- <listener-class>
- org.onap.music.main.CronJobManager
- </listener-class>
+ <listener-class>
+ org.onap.music.main.CronJobManager
+ </listener-class>
</listener>
<servlet>
<servlet-name>music-servlet</servlet-name>