From ed7e1c3dfe332abc67ed943717db2ee94406f95e Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Thu, 29 Jun 2017 19:30:00 +0300
Subject: [SDC] rebase code

Change-Id: I456ec65a233d277e6bae35e140f2e3da5765bae6
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Signed-off-by: Michael Lando <ml636r@att.com>
---
 catalog-be/src/main/webapp/WEB-INF/web.xml | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'catalog-be/src/main/webapp')

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index fe228a3f97..b559d1b80f 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -130,7 +130,7 @@
     	<init-param>
 			<param-name>swagger.api.basepath</param-name>
 			<!-- Check if second param can be added -->
-			<param-value>http://localhost:8080/sdc/</param-value>
+			<param-value>http://localhost:8080/sdc</param-value>
 		</init-param>
 		
 		<init-param>
@@ -139,24 +139,6 @@
 		</init-param>
 		<load-on-startup>2</load-on-startup>
 	</servlet>
-
-<!-- Remove after swagger 2 integration -->
-<!-- 	<servlet>
-		<servlet-name>Jersey2Config</servlet-name>
-		<servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
-		<init-param>
-			<param-name>api.version</param-name>
-			<param-value>1.0.0</param-value>
-		</init-param> 
-		
-		<init-param>
-			<param-name>swagger.api.basepath</param-name>
-			<param-value>http://behost:8080/sdc2/rest</param-value>
-		</init-param>
-		
-		<load-on-startup>2</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet> -->
 	
 	<!-- ECOMP Portal -->
 	<servlet>
@@ -165,13 +147,6 @@
 		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
-
-<!-- Remove after swagger 2 integration -->
-	<!-- Removed, the servlet mapping will be taken from annotation -->
-<!-- 	<servlet-mapping>
-		<servlet-name>ECOMPServlet</servlet-name>
-		<url-pattern>/api/*</url-pattern>
-	</servlet-mapping> -->
 	
 	<servlet>
 		<servlet-name>ViewStatusMessages</servlet-name>
@@ -190,7 +165,7 @@
 	   <async-supported>true</async-supported>
 	   <init-param>
 		<param-name>methods</param-name>
-		<param-value>GET,POST</param-value>
+		<param-value>GET,POST,PUT,DELETE</param-value>
 	   </init-param>
 	   <init-param>
 	      <param-name>mimeTypes</param-name>
-- 
cgit 1.2.3-korg