summaryrefslogtreecommitdiffstats
path: root/asdc-controller/WebContent
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-03-14 02:07:32 -0400
committerRob Daugherty <rd472p@att.com>2018-03-14 04:08:41 -0400
commit38f720752af4d4aad8c4e467a288d9048659f688 (patch)
treee81066a8b5c77272e30fb57a64999573c4db4d86 /asdc-controller/WebContent
parentaee3d223f92a6f250f43e17558a2dfd576ff7294 (diff)
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>
Diffstat (limited to 'asdc-controller/WebContent')
-rw-r--r--asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml4
-rw-r--r--asdc-controller/WebContent/WEB-INF/web.xml3
2 files changed, 5 insertions, 2 deletions
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>