diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-03-14 02:07:32 -0400 |
|---|---|---|
| committer | Rob Daugherty <rd472p@att.com> | 2018-03-14 04:08:41 -0400 |
| commit | 38f720752af4d4aad8c4e467a288d9048659f688 (patch) | |
| tree | e81066a8b5c77272e30fb57a64999573c4db4d86 /mso-api-handlers/mso-api-handler-infra/WebContent | |
| parent | aee3d223f92a6f250f43e17558a2dfd576ff7294 (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 'mso-api-handlers/mso-api-handler-infra/WebContent')
3 files changed, 12 insertions, 9 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml index f7fc214469..e687384774 100644 --- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml +++ b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-deployment-structure.xml @@ -5,18 +5,19 @@ <module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
- <module name="org.jboss.resteasy.resteasy-jackson-provider" />
- <module name="org.jboss.resteasy.resteasy-jettison-provider" />
+ <!-- Just to make sure these modules are not loaded -->
+ <module name="org.jboss.resteasy.resteasy-jackson-provider"/>
+ <module name="org.jboss.resteasy.resteasy-jettison-provider"/>
+ <module name="org.hibernate" />
</exclusions>
<dependencies>
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import"/>
+ <!-- This module contain the ProviderBase class: -->
+ <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true"/>
<module name="org.jboss.jandex" slot="main" />
<module name="org.javassist" slot="main" />
<module name="org.antlr" slot="main" />
<module name="org.dom4j" slot="main" />
- <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
- <!-- This module contain the ProviderBase class: -->
- <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
</dependencies>
</deployment>
-</jboss-deployment-structure>
-
+</jboss-deployment-structure>
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml index e1023bfe19..8970c2ff44 100644 --- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml +++ b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/jboss-web.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<jboss-web>
- <context-root>ecomp/mso/infra</context-root>
+ <context-root>onap/so/infra</context-root>
<security-domain>other</security-domain>
</jboss-web>
\ No newline at end of file diff --git a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml index b8ce1a6321..bbd7c61bb9 100644 --- a/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml +++ b/mso-api-handlers/mso-api-handler-infra/WebContent/WEB-INF/web.xml @@ -86,6 +86,8 @@ <url-pattern>/api-docs/*</url-pattern>
<url-pattern>/tasks/*</url-pattern>
<url-pattern>/e2eServiceInstances/*</url-pattern>
+ <url-pattern>/cloudResources/*</url-pattern>
+ <url-pattern>/cloudResourcesRequests/*</url-pattern>
</servlet-mapping>
<!-- To be replaced by AAF in the future, when Camunda scripts replacing the BPEL scripts completely -->
@@ -160,4 +162,4 @@ <url-pattern>/*</url-pattern>
</filter-mapping>
-</web-app>
+</web-app>
\ No newline at end of file |