From 38f720752af4d4aad8c4e467a288d9048659f688 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Wed, 14 Mar 2018 02:07:32 -0400
Subject: AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml | 4 ++++
 asdc-controller/WebContent/WEB-INF/web.xml                        | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'asdc-controller/WebContent')

diff --git a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml b/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
index f6cef8a2ce..c2869686fd 100644
--- a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -2,6 +2,8 @@
 	<deployment>
 		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->
 		<exclusions>
+			<!-- <module name="org.jboss.resteasy.resteasy-jackson-provider" /> -->
+      		<!-- <module name="org.jboss.resteasy.resteasy-jettison-provider" /> -->
 			<module name="org.apache.log4j" />
 			<module name="org.slf4j" />
 			<module name="org.slf4j.impl" />
@@ -9,6 +11,8 @@
 			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
 		</exclusions>
 		<dependencies>
+				<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+            	<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />				
 			    <module name="org.jboss.jandex" slot="main" />
                 <module name="org.javassist" slot="main" />
                 <module name="org.antlr" slot="main" />
diff --git a/asdc-controller/WebContent/WEB-INF/web.xml b/asdc-controller/WebContent/WEB-INF/web.xml
index 9a779591ee..910b466fa5 100644
--- a/asdc-controller/WebContent/WEB-INF/web.xml
+++ b/asdc-controller/WebContent/WEB-INF/web.xml
@@ -59,8 +59,7 @@
 
   <context-param>
   	<param-name>mso.configuration</param-name>
-  	<param-value>MSO_PROP_ASDC=mso.asdc.json,MSO_PROP_TOPOLOGY=topology.properties</param-value>
-
+  	<param-value>MSO_PROP_ASDC=mso.asdc.json,MSO_PROP_TOPOLOGY=topology.properties,MSO_ASDC_CLIENTS=mso.asdc.clients.properties</param-value>
   </context-param>
 
   <context-param>
-- 
cgit 1.2.3-korg