diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-03-14 09:22:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-14 09:22:15 +0000 |
| commit | 09f3630ea990197e9d7b669aa2d6a63ec397bf3e (patch) | |
| tree | 6625d3e9ac31600d86bf54a50e75dba61cc2c82a /asdc-controller/WebContent | |
| parent | a56de0e221751debd038aca5b6d20d8f9325d294 (diff) | |
| parent | 38f720752af4d4aad8c4e467a288d9048659f688 (diff) | |
Merge "AT&T 1712 and 1802 release code"
Diffstat (limited to 'asdc-controller/WebContent')
| -rw-r--r-- | asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml | 4 | ||||
| -rw-r--r-- | asdc-controller/WebContent/WEB-INF/web.xml | 3 |
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>
|