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-fe/src/main/webapp/WEB-INF/web.xml | 169 -----------------------------
 1 file changed, 169 deletions(-)

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

diff --git a/catalog-fe/src/main/webapp/WEB-INF/web.xml b/catalog-fe/src/main/webapp/WEB-INF/web.xml
index f6d709ef58..c2127dcdca 100644
--- a/catalog-fe/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-fe/src/main/webapp/WEB-INF/web.xml
@@ -39,146 +39,6 @@
 		<url-pattern>/lbClassicStatus</url-pattern>
 	</servlet-mapping>
 
-	<!-- Proxy Server Only used for tests to simulate webSeal ## Start ## -->
-<!--   	<servlet>
-		<servlet-name>ProxyAdmin1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletAdmin1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyAdmin1</servlet-name>
-		<url-pattern>/proxy-admin1</url-pattern>
-	</servlet-mapping>
-		<servlet>
-		<servlet-name>ProxyAdmin2</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletAdmin2</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyAdmin2</servlet-name>
-		<url-pattern>/proxy-admin2</url-pattern>
-	</servlet-mapping>
-		<servlet>
-		<servlet-name>ProxyAdmin3</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletAdmin3</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyAdmin3</servlet-name>
-		<url-pattern>/proxy-admin3</url-pattern>
-	</servlet-mapping>
-
-   	<servlet>
-		<servlet-name>ProxyDesigner1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletDesigner1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyDesigner1</servlet-name>
-		<url-pattern>/proxy-designer1</url-pattern>
-	</servlet-mapping>
-		<servlet>
-		<servlet-name>ProxyDesigner2</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletDesigner2</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyDesigner2</servlet-name>
-		<url-pattern>/proxy-designer2</url-pattern>
-	</servlet-mapping>
-	<servlet>
-		<servlet-name>ProxyDesigner3</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletDesigner3</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyDesigner3</servlet-name>
-		<url-pattern>/proxy-designer3</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyTester1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletTester1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyTester1</servlet-name>
-		<url-pattern>/proxy-tester1</url-pattern>
-	</servlet-mapping>
-		<servlet>
-		<servlet-name>ProxyTester2</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletTester2</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyTester2</servlet-name>
-		<url-pattern>/proxy-tester2</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyTester3</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletTester3</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyTester3</servlet-name>
-		<url-pattern>/proxy-tester3</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>ProxyGovernor1</servlet-name>
-		<url-pattern>/proxy-governor1</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyGovernor1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletGovernor1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyOps1</servlet-name>
-		<url-pattern>/proxy-ops1</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyOps1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletOps1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ProxyPs1</servlet-name>
-		<url-pattern>/proxy-ps1</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyPs1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletProductStrategist1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ProxyPm1</servlet-name>
-		<url-pattern>/proxy-pm1</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>ProxyPm1</servlet-name>
-		<servlet-class>org.openecomp.sdc.fe.servlets.websealmock.WebSealSimulatorServletProductManger1</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet> -->
-	
-	<!-- Proxy Server Only used for tests to simulate webSeal ## End ## -->
-
 	<!-- Fe Proxy Servlet -->
 	<servlet>
 		<servlet-name>FeProxy</servlet-name>
@@ -219,35 +79,6 @@
 		<url-pattern>/kibanaProxy/*</url-pattern>
 	</servlet-mapping>
 
-
-
-	<filter>
-		<filter-name>cross-origin-att</filter-name>
-		<filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
-		<async-supported>true</async-supported>
-		<init-param>
-			<param-name>allowedOrigins</param-name>
-			<param-value>*</param-value>
-		</init-param>
-		<init-param>
-			<param-name>allowedMethods</param-name>
-			<param-value>GET,POST,OPTIONS,DELETE,PUT,HEAD</param-value>
-		</init-param>
-		<init-param>
-			<param-name>allowedHeaders</param-name>
-			<param-value>HTTP_CSP_FIRSTNAME, HTTP_CSP_LASTNAME, USER_ID,
-				HTTP_CSP_EMAIL, X-ECOMP-RequestID, origin, content-type, accept, authorization, Content-MD5,X-ECOMP-ServiceID</param-value>
-		</init-param>
-		<init-param>
-			<param-name>allowCredential</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>cross-origin-att</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
 <!--  
 	<filter>
 		<filter-name>GzipFilter</filter-name>
-- 
cgit 1.2.3-korg