From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Fri, 9 Jun 2017 03:19:04 +0300
Subject: [SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>
---
 catalog-be/src/main/webapp/WEB-INF/web.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 814a58a4fe..481cdd6a2c 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -13,7 +13,6 @@
 		<init-param>
 			<param-name>jersey.config.server.provider.classnames</param-name>
 			<param-value>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter, org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter</param-value>
-			<!-- <param-value>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter</param-value> -->
 		</init-param>
 
 		<load-on-startup>1</load-on-startup>
@@ -46,9 +45,6 @@
 		</init-param>
 		<init-param>
 			<param-name>jersey.config.server.provider.classnames</param-name>
-<!-- 			<param-value>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter,org.openecomp.sdc.be.filters.BasicAuthenticationFilter, org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter</param-value> -->
-			
-			<!-- Closed till the feature done and basic authentication defined with M Lando -->
 			<param-value>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter,org.openecomp.sdc.be.filters.BasicAuthenticationFilter</param-value>
 		</init-param>
 
@@ -58,6 +54,7 @@
 	
 	<servlet-mapping>
 		<servlet-name>jerseyDistribution</servlet-name>
+		<url-pattern>/sdc/*</url-pattern>
 		<url-pattern>/asdc/*</url-pattern>
 	</servlet-mapping>
 
@@ -78,7 +75,20 @@
 		<async-supported>true</async-supported>
 	</servlet>
 	
-	<!-- ECOMP Portal -->	
+	<!-- ECOMP Portal -->
+	<servlet>
+		<servlet-name>ECOMPServlet</servlet-name>
+		<servlet-class>org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class>
+		<load-on-startup>3</load-on-startup>
+		<async-supported>true</async-supported>
+	</servlet>
+
+	<!-- 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>
 		<servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
-- 
cgit 1.2.3-korg