From 806e4b75e873c2602f93fb821f6452507cc698e2 Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Wed, 4 Nov 2015 08:00:10 -0800
Subject: [PATCH] SQOOP-2655: Sqoop2: Code clean in server module

(Colin Ma via Jarek Jarcec Cecho)
---
 server/src/main/webapp/WEB-INF/web.xml | 162 -------------------------
 server/src/main/webapp/index.html      |  23 ----
 2 files changed, 185 deletions(-)
 delete mode 100644 server/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 server/src/main/webapp/index.html

diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index aa295ec7..00000000
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app version="2.5" 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_2_5.xsd">
-
-  <display-name>Apache Sqoop</display-name>
-
-  <!-- Listeners -->
-  <listener>
-    <listener-class>org.apache.sqoop.server.ServerInitializer</listener-class>
-  </listener>
-
-  <!-- Filter -->
-  <filter>
-    <filter-name>authFilter</filter-name>
-    <filter-class>org.apache.sqoop.filter.SqoopAuthenticationFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>authFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <!-- Version servlet -->
-  <servlet>
-    <servlet-name>VersionServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.VersionServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>VersionServlet</servlet-name>
-    <url-pattern>/version</url-pattern>
-  </servlet-mapping>
-
-   <!-- Generic Configurable servlet -->
-  <servlet>
-    <servlet-name>v1.ConfigurableServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.ConfigurableServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.ConfigurableServlet</servlet-name>
-    <url-pattern>/v1/configurable/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Connector servlet -->
-  <servlet>
-    <servlet-name>v1.ConnectorServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.ConnectorServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.ConnectorServlet</servlet-name>
-    <url-pattern>/v1/connector/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Driver servlet -->
-  <servlet>
-    <servlet-name>v1.DriverServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.DriverServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.DriverServlet</servlet-name>
-    <url-pattern>/v1/driver/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Link servlet -->
-  <servlet>
-    <servlet-name>v1.LinkServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.LinkServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.LinkServlet</servlet-name>
-    <url-pattern>/v1/link/*</url-pattern>
-  </servlet-mapping>
-
- <!-- Links servlet -->
-  <servlet>
-    <servlet-name>v1.LinksServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.LinksServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.LinksServlet</servlet-name>
-    <url-pattern>/v1/links/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Job servlet -->
-  <servlet>
-    <servlet-name>v1.JobServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.JobServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.JobServlet</servlet-name>
-    <url-pattern>/v1/job/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Jobs servlet -->
-  <servlet>
-    <servlet-name>v1.JobsServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.JobsServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.JobsServlet</servlet-name>
-    <url-pattern>/v1/jobs/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Submissions servlet -->
-  <servlet>
-    <servlet-name>v1.SubmissionsServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.SubmissionsServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>v1.SubmissionsServlet</servlet-name>
-    <url-pattern>/v1/submissions/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Authorization servlet -->
-  <servlet>
-    <servlet-name>authorization.AuthorizationServlet</servlet-name>
-    <servlet-class>org.apache.sqoop.server.v1.AuthorizationServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>authorization.AuthorizationServlet</servlet-name>
-    <url-pattern>/v1/authorization/*</url-pattern>
-  </servlet-mapping>
-
-</web-app>
-
diff --git a/server/src/main/webapp/index.html b/server/src/main/webapp/index.html
deleted file mode 100644
index fd8c68d0..00000000
--- a/server/src/main/webapp/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-  <head><title>Apache Sqoop Server</title></head>
-  <body>
-    Apache Sqoop Server
-  </body>
-</html>