From a13d6f4c3dd6d4c38d1f9cd97ac9fd377f580a4b Mon Sep 17 00:00:00 2001
From: c00149107 <chenchuanyu@huawei.com>
Date: Wed, 18 Oct 2017 11:48:21 +0800
Subject: Deal With Error Response from Vfc

Deal With Error Response from Vfc

Change-Id: Id5ce999d561099581b49524969c901ac6dac3f90
Issue-ID:SO-233
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---
 .../WebContent/WEB-INF/jboss-deployment-structure.xml  | 18 +++++++++++-------
 adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml    | 16 ++--------------
 2 files changed, 13 insertions(+), 21 deletions(-)

(limited to 'adapters/mso-vfc-adapter/WebContent/WEB-INF')

diff --git a/adapters/mso-vfc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-vfc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index e7bc08ae83..fb268917f2 100644
--- a/adapters/mso-vfc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-vfc-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -1,17 +1,21 @@
 <jboss-deployment-structure>
 	<deployment>
-		<!-- Exclusions allow you to prevent the server from automatically adding 
-			some dependencies -->
+		<!-- Exclusions allow you to prevent the server from automatically adding some dependencies -->
 		<exclusions>
 			<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" />
 		</exclusions>
 		<dependencies>
-			<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.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>
\ No newline at end of file
+</jboss-deployment-structure>
diff --git a/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml
index 0c198defa0..cd97471b5b 100644
--- a/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-vfc-adapter/WebContent/WEB-INF/web.xml
@@ -41,20 +41,8 @@
 	</servlet>
 	<servlet-mapping>
 		<servlet-name>Resteasy</servlet-name>
-		<url-pattern>/vfcadapter/*</url-pattern>
+		<url-pattern>/rest/*</url-pattern>
 	</servlet-mapping>
-	<security-constraint>
-		<web-resource-collection>
-			<web-resource-name>SoapRequests</web-resource-name>
-			<description>Soap Ingress Requests</description>
-			<url-pattern>/VfcAdapter</url-pattern>
-			<url-pattern>/VfcAdapterAsync</url-pattern>
-			<http-method>POST</http-method>
-		</web-resource-collection>
-		<auth-constraint>
-			<role-name>BPEL-Client</role-name>
-		</auth-constraint>
-	</security-constraint>
 	<security-constraint>
 		<web-resource-collection>
 			<web-resource-name>SiteStatus</web-resource-name>
@@ -70,7 +58,7 @@
 		<web-resource-collection>
 			<web-resource-name>RestRequests</web-resource-name>
 			<description>Rest Ingress Requests</description>
-			<url-pattern>/rest/v1/vfc/*</url-pattern>
+			<url-pattern>/rest/v1/vfcadapter/*</url-pattern>
 			<http-method>DELETE</http-method>
 			<http-method>GET</http-method>
 			<http-method>POST</http-method>
-- 
cgit 1.2.3-korg