From 9b6efbd93a12c858a0d2643013217ec3d6c3a46d Mon Sep 17 00:00:00 2001
From: "Thomas Nelson Jr (arthurdent3) tn1381@att.com" <tn1381@att.com>
Date: Mon, 16 Jul 2018 16:41:20 -0400
Subject: various Updates

Q-api,
triggers,
conductor conditional updates.
Bug fixes

Change-Id: Iec392309787cd90f0a2827a2955399723640e800
Issue-ID: MUSIC-93
Signed-off-by: Thomas Nelson Jr (arthurdent3) tn1381@att.com <tn1381@att.com>
---
 WebContent/WEB-INF/web.xml | 78 +++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

(limited to 'WebContent')

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 323c805f..3bab5589 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -1,36 +1,39 @@
 <?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>
+    <display-name>MUSIC</display-name>
+    <listener>
+         <listener-class>
+             org.onap.music.main.PropertiesListener
+         </listener-class>
+    </listener>
     <servlet>
-		<servlet-name>music-servlet</servlet-name>
-		<servlet-class>
-                     com.sun.jersey.spi.container.servlet.ServletContainer
+        <servlet-name>music-servlet</servlet-name>
+        <servlet-class>
+            com.sun.jersey.spi.container.servlet.ServletContainer
         </servlet-class>
         <!-- this enables jersey jackson logging.   
-      	<init-param>
-			<param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
-			<param-value>com.sun.jersey.api.container.filter.LoggingFilter</param-value>
-		</init-param> 
-		-->    
-		<init-param>
-		     <param-name>com.sun.jersey.config.property.packages</param-name>
-		     <param-value>
-		     	io.swagger.jaxrs.json,
+        <init-param>
+            <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
+            <param-value>com.sun.jersey.api.container.filter.LoggingFilter</param-value>
+        </init-param> 
+        -->    
+        <init-param>
+            <param-name>com.sun.jersey.config.property.packages</param-name>
+            <param-value>
+                io.swagger.jaxrs.json,
                 io.swagger.jaxrs.listing,
                 org.onap.music.rest,
                 org.onap.music.exceptions,
                 org.onap.music.conductor.conditionals
-		     </param-value>
-		</init-param>
-		<init-param>
-		     <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
-		     <param-value>true</param-value>
-	    </init-param>
-		<load-on-startup>1</load-on-startup>
-
-  </servlet>
-
-	<servlet>
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
+            <param-value>true</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
         <servlet-name>Jersey2Config</servlet-name>
         <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
         <init-param>
@@ -43,21 +46,18 @@
         </init-param>
         <load-on-startup>2</load-on-startup>
     </servlet>
-
-  
-  	<servlet-mapping>
-		<servlet-name>music-servlet</servlet-name>
-		<url-pattern>/rest/*</url-pattern>
-	</servlet-mapping>
-  
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
+    <servlet-mapping>
+        <servlet-name>music-servlet</servlet-name>
+        <url-pattern>/rest/*</url-pattern>
+    </servlet-mapping>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.htm</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>default.html</welcome-file>
+        <welcome-file>default.htm</welcome-file>
+        <welcome-file>default.jsp</welcome-file>
+    </welcome-file-list>
 </web-app>
 <!-- 
  ============LICENSE_START==========================================
-- 
cgit 1.2.3-korg