From c999842f5ee94a6e66f60c79c4638080faa696a3 Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Wed, 25 Apr 2018 08:49:12 -0400
Subject: [PATCH] Remove iovisor-renderer web.xml

The IovisorRSApplication class was removed a while ago but
the web.xml remnant was left behind so remove it.

Change-Id: If5d68adc8aaa473549e7fb45fb806764c2b6b071
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 renderers/iovisor/pom.xml                     | 13 ----
 .../src/main/resources/WEB-INF/web.xml        | 71 -------------------
 2 files changed, 84 deletions(-)
 delete mode 100644 renderers/iovisor/src/main/resources/WEB-INF/web.xml

diff --git a/renderers/iovisor/pom.xml b/renderers/iovisor/pom.xml
index 3c47fffdb..fbc8b768f 100755
--- a/renderers/iovisor/pom.xml
+++ b/renderers/iovisor/pom.xml
@@ -103,19 +103,6 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <configuration>
-          <instructions>
-          </instructions>
-          <Import-Package>
-            *,
-            com.sun.jersey.spi.container.servlet,
-            org.eclipse.jetty.servlets,
-            org.opendaylight.aaa.shiro.filters,
-            org.opendaylight.aaa.shiro.realm,
-            org.opendaylight.aaa.shiro.web.env,
-            org.apache.shiro.web.env
-          </Import-Package>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/renderers/iovisor/src/main/resources/WEB-INF/web.xml b/renderers/iovisor/src/main/resources/WEB-INF/web.xml
deleted file mode 100644
index b296f1fae..000000000
--- a/renderers/iovisor/src/main/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-        version="3.0">
-  <servlet>
-    <servlet-name>JAXRSIOVisor</servlet-name>
-    <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
-    <init-param>
-      <param-name>javax.ws.rs.Application</param-name>
-      <param-value>org.opendaylight.groupbasedpolicy.renderer.iovisor.sbrest.IovisorRSApplication</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>JAXRSIOVisor</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-
-  <context-param>
-    <param-name>shiroEnvironmentClass</param-name>
-    <param-value>org.opendaylight.aaa.shiro.web.env.KarafIniWebEnvironment</param-value>
-  </context-param>
-
-  <listener>
-    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
-  </listener>
-
-  <filter>
-    <filter-name>ShiroFilter</filter-name>
-    <filter-class>org.opendaylight.aaa.shiro.filters.AAAShiroFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>ShiroFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter>
-    <filter-name>cross-origin-restconf</filter-name>
-    <filter-class>org.eclipse.jetty.servlets.CrossOriginFilter</filter-class>
-    <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>origin, content-type, accept, authorization</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>cross-origin-restconf</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>IOVisor api</web-resource-name>
-      <url-pattern>/*</url-pattern>
-      <http-method>POST</http-method>
-      <http-method>GET</http-method>
-      <http-method>PUT</http-method>
-      <http-method>PATCH</http-method>
-      <http-method>DELETE</http-method>
-      <http-method>HEAD</http-method>
-    </web-resource-collection>
-  </security-constraint>
-</web-app>
-- 
2.36.6