You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by sh...@apache.org on 2014/07/22 10:51:44 UTC

git commit: OOZIE-1925 upgrade tomcat to 6.0.41 (rkanter via shwethags)

Repository: oozie
Updated Branches:
  refs/heads/master eace95845 -> 9a9b6777f


OOZIE-1925 upgrade tomcat to 6.0.41 (rkanter via shwethags)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9a9b6777
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9a9b6777
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9a9b6777

Branch: refs/heads/master
Commit: 9a9b6777f860d022fedef71ea95040c74bcf0820
Parents: eace958
Author: Shwetha GS <sh...@inmobi.com>
Authored: Tue Jul 22 14:21:34 2014 +0530
Committer: Shwetha GS <sh...@inmobi.com>
Committed: Tue Jul 22 14:21:34 2014 +0530

----------------------------------------------------------------------
 distro/src/main/tomcat/ssl-web.xml            | 232 +++++++++++++++++++-
 pom.xml                                       |   2 +-
 release-log.txt                               |   1 +
 webapp/src/main/webapp/WEB-INF/web-common.xml | 242 ---------------------
 webapp/src/main/webapp/WEB-INF/web.xml        | 232 +++++++++++++++++++-
 5 files changed, 462 insertions(+), 247 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/9a9b6777/distro/src/main/tomcat/ssl-web.xml
----------------------------------------------------------------------
diff --git a/distro/src/main/tomcat/ssl-web.xml b/distro/src/main/tomcat/ssl-web.xml
index 1d393e2..7981fb0 100644
--- a/distro/src/main/tomcat/ssl-web.xml
+++ b/distro/src/main/tomcat/ssl-web.xml
@@ -22,8 +22,236 @@
 
 <web-app>
 
-    <!-- The servlets are defined in web-common.xml -->
-    &web-common;
+    <!--
+      ========================================================================
+      IMPORTANT: ANY CHANGES TO THE SERVLETS, SERVLET MAPPINGS, LISTENERS, ETC
+                 MUST BE REFLECTED IN webapp/src/main/webapp/WEB-INF/web.xml
+                 AS WELL.
+      ========================================================================
+    -->
+
+    <display-name>OOZIE</display-name>
+
+    <!-- Listeners -->
+    <listener>
+        <listener-class>org.apache.oozie.servlet.ServicesLoader</listener-class>
+    </listener>
+
+    <!-- Servlets -->
+    <servlet>
+        <servlet-name>versions</servlet-name>
+        <display-name>WS API for Workflow Instances</display-name>
+        <servlet-class>org.apache.oozie.servlet.VersionServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>callback</servlet-name>
+        <display-name>Callback Notification</display-name>
+        <servlet-class>org.apache.oozie.servlet.CallbackServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0jobs</servlet-name>
+        <display-name>WS API for Workflow Jobs</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0JobsServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1jobs</servlet-name>
+        <display-name>WS API for Workflow Jobs</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1JobsServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>sla-event</servlet-name>
+        <display-name>WS API for specific SLA Events</display-name>
+        <servlet-class>org.apache.oozie.servlet.SLAServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2sla</servlet-name>
+        <display-name>WS API for specific SLA Events</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2SLAServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- servlet-mapping -->
+    <servlet-mapping>
+        <servlet-name>versions</servlet-name>
+        <url-pattern>/versions</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0admin</servlet-name>
+        <url-pattern>/v0/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1admin</servlet-name>
+        <url-pattern>/v1/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2admin</servlet-name>
+        <url-pattern>/v2/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>callback</servlet-name>
+        <url-pattern>/callback/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0jobs</servlet-name>
+        <url-pattern>/v0/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1jobs</servlet-name>
+        <url-pattern>/v1/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1jobs</servlet-name>
+        <url-pattern>/v2/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0job</servlet-name>
+        <url-pattern>/v0/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1job</servlet-name>
+        <url-pattern>/v1/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2job</servlet-name>
+        <url-pattern>/v2/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>sla-event</servlet-name>
+        <url-pattern>/v1/sla/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2sla</servlet-name>
+        <url-pattern>/v2/sla/*</url-pattern>
+    </servlet-mapping>
+
+    <!-- welcome-file -->
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
+    <filter>
+        <filter-name>hostnameFilter</filter-name>
+        <filter-class>org.apache.oozie.servlet.HostnameFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>authenticationfilter</filter-name>
+        <filter-class>org.apache.oozie.servlet.AuthFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>hostnameFilter</filter-name>
+        <url-pattern>*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/versions/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v0/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v1/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v2/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/index.jsp</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/admin/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>*.js</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/ext-2.2/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/docs/*</url-pattern>
+    </filter-mapping>
 
     <!-- Require SSL (HTTPS) for everything except callbacks -->
     <security-constraint>

http://git-wip-us.apache.org/repos/asf/oozie/blob/9a9b6777/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef3844c..7fb57e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
          <distcp.version>${hadooplib.version}</distcp.version>
 
          <!-- Tomcat version -->
-         <tomcat.version>6.0.37</tomcat.version>
+         <tomcat.version>6.0.41</tomcat.version>
 
          <openjpa.version>2.2.2</openjpa.version>
          <xerces.version>2.10.0</xerces.version>

http://git-wip-us.apache.org/repos/asf/oozie/blob/9a9b6777/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 9fe3e64..ad555c6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,4 +1,5 @@
 -- Oozie 4.2.0 release (trunk - unreleased)
+OOZIE-1925 upgrade tomcat to 6.0.41 (rkanter via shwethags)
 OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)
 
 -- Oozie 4.1.0 release (4.1 - unreleased)

http://git-wip-us.apache.org/repos/asf/oozie/blob/9a9b6777/webapp/src/main/webapp/WEB-INF/web-common.xml
----------------------------------------------------------------------
diff --git a/webapp/src/main/webapp/WEB-INF/web-common.xml b/webapp/src/main/webapp/WEB-INF/web-common.xml
deleted file mode 100644
index 4353cb7..0000000
--- a/webapp/src/main/webapp/WEB-INF/web-common.xml
+++ /dev/null
@@ -1,242 +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.
--->
-
-    <display-name>OOZIE</display-name>
-
-    <!-- Listeners -->
-    <listener>
-        <listener-class>org.apache.oozie.servlet.ServicesLoader</listener-class>
-    </listener>
-
-    <!-- Servlets -->
-    <servlet>
-        <servlet-name>versions</servlet-name>
-        <display-name>WS API for Workflow Instances</display-name>
-        <servlet-class>org.apache.oozie.servlet.VersionServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v0admin</servlet-name>
-        <display-name>Oozie admin</display-name>
-        <servlet-class>org.apache.oozie.servlet.V0AdminServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v1admin</servlet-name>
-        <display-name>Oozie admin</display-name>
-        <servlet-class>org.apache.oozie.servlet.V1AdminServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v2admin</servlet-name>
-        <display-name>Oozie admin</display-name>
-        <servlet-class>org.apache.oozie.servlet.V2AdminServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>callback</servlet-name>
-        <display-name>Callback Notification</display-name>
-        <servlet-class>org.apache.oozie.servlet.CallbackServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v0jobs</servlet-name>
-        <display-name>WS API for Workflow Jobs</display-name>
-        <servlet-class>org.apache.oozie.servlet.V0JobsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v1jobs</servlet-name>
-        <display-name>WS API for Workflow Jobs</display-name>
-        <servlet-class>org.apache.oozie.servlet.V1JobsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v0job</servlet-name>
-        <display-name>WS API for a specific Workflow Job</display-name>
-        <servlet-class>org.apache.oozie.servlet.V0JobServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v1job</servlet-name>
-        <display-name>WS API for a specific Workflow Job</display-name>
-        <servlet-class>org.apache.oozie.servlet.V1JobServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v2job</servlet-name>
-        <display-name>WS API for a specific Workflow Job</display-name>
-        <servlet-class>org.apache.oozie.servlet.V2JobServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>sla-event</servlet-name>
-        <display-name>WS API for specific SLA Events</display-name>
-        <servlet-class>org.apache.oozie.servlet.SLAServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet>
-        <servlet-name>v2sla</servlet-name>
-        <display-name>WS API for specific SLA Events</display-name>
-        <servlet-class>org.apache.oozie.servlet.V2SLAServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- servlet-mapping -->
-    <servlet-mapping>
-        <servlet-name>versions</servlet-name>
-        <url-pattern>/versions</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v0admin</servlet-name>
-        <url-pattern>/v0/admin/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v1admin</servlet-name>
-        <url-pattern>/v1/admin/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v2admin</servlet-name>
-        <url-pattern>/v2/admin/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>callback</servlet-name>
-        <url-pattern>/callback/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v0jobs</servlet-name>
-        <url-pattern>/v0/jobs</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v1jobs</servlet-name>
-        <url-pattern>/v1/jobs</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v1jobs</servlet-name>
-        <url-pattern>/v2/jobs</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v0job</servlet-name>
-        <url-pattern>/v0/job/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v1job</servlet-name>
-        <url-pattern>/v1/job/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v2job</servlet-name>
-        <url-pattern>/v2/job/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>sla-event</servlet-name>
-        <url-pattern>/v1/sla/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>v2sla</servlet-name>
-        <url-pattern>/v2/sla/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- welcome-file -->
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-    <filter>
-        <filter-name>hostnameFilter</filter-name>
-        <filter-class>org.apache.oozie.servlet.HostnameFilter</filter-class>
-    </filter>
-
-    <filter>
-        <filter-name>authenticationfilter</filter-name>
-        <filter-class>org.apache.oozie.servlet.AuthFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>hostnameFilter</filter-name>
-        <url-pattern>*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/versions/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/v0/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/v1/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/v2/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/index.jsp</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/admin/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>*.js</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/ext-2.2/*</url-pattern>
-    </filter-mapping>
-
-    <filter-mapping>
-        <filter-name>authenticationfilter</filter-name>
-        <url-pattern>/docs/*</url-pattern>
-    </filter-mapping>
-

http://git-wip-us.apache.org/repos/asf/oozie/blob/9a9b6777/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
index 61a6404..416a396 100644
--- a/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -22,7 +22,235 @@
 
 <web-app>
 
-    <!-- The servlets are defined in web-common.xml -->
-    &web-common;
+    <!--
+      ========================================================================
+      IMPORTANT: ANY CHANGES TO THE SERVLETS, SERVLET MAPPINGS, LISTENERS, ETC
+                 MUST BE REFLECTED IN distro/src/main/tomcat/ssl-web.xml
+                 AS WELL.
+      ========================================================================
+    -->
+
+    <display-name>OOZIE</display-name>
+
+    <!-- Listeners -->
+    <listener>
+        <listener-class>org.apache.oozie.servlet.ServicesLoader</listener-class>
+    </listener>
+
+    <!-- Servlets -->
+    <servlet>
+        <servlet-name>versions</servlet-name>
+        <display-name>WS API for Workflow Instances</display-name>
+        <servlet-class>org.apache.oozie.servlet.VersionServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2admin</servlet-name>
+        <display-name>Oozie admin</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2AdminServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>callback</servlet-name>
+        <display-name>Callback Notification</display-name>
+        <servlet-class>org.apache.oozie.servlet.CallbackServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0jobs</servlet-name>
+        <display-name>WS API for Workflow Jobs</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0JobsServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1jobs</servlet-name>
+        <display-name>WS API for Workflow Jobs</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1JobsServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v0job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V0JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v1job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V1JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2job</servlet-name>
+        <display-name>WS API for a specific Workflow Job</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2JobServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>sla-event</servlet-name>
+        <display-name>WS API for specific SLA Events</display-name>
+        <servlet-class>org.apache.oozie.servlet.SLAServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>v2sla</servlet-name>
+        <display-name>WS API for specific SLA Events</display-name>
+        <servlet-class>org.apache.oozie.servlet.V2SLAServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <!-- servlet-mapping -->
+    <servlet-mapping>
+        <servlet-name>versions</servlet-name>
+        <url-pattern>/versions</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0admin</servlet-name>
+        <url-pattern>/v0/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1admin</servlet-name>
+        <url-pattern>/v1/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2admin</servlet-name>
+        <url-pattern>/v2/admin/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>callback</servlet-name>
+        <url-pattern>/callback/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0jobs</servlet-name>
+        <url-pattern>/v0/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1jobs</servlet-name>
+        <url-pattern>/v1/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1jobs</servlet-name>
+        <url-pattern>/v2/jobs</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v0job</servlet-name>
+        <url-pattern>/v0/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v1job</servlet-name>
+        <url-pattern>/v1/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2job</servlet-name>
+        <url-pattern>/v2/job/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>sla-event</servlet-name>
+        <url-pattern>/v1/sla/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>v2sla</servlet-name>
+        <url-pattern>/v2/sla/*</url-pattern>
+    </servlet-mapping>
+
+    <!-- welcome-file -->
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+    </welcome-file-list>
+
+    <filter>
+        <filter-name>hostnameFilter</filter-name>
+        <filter-class>org.apache.oozie.servlet.HostnameFilter</filter-class>
+    </filter>
+
+    <filter>
+        <filter-name>authenticationfilter</filter-name>
+        <filter-class>org.apache.oozie.servlet.AuthFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>hostnameFilter</filter-name>
+        <url-pattern>*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/versions/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v0/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v1/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/v2/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/index.jsp</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/admin/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>*.js</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/ext-2.2/*</url-pattern>
+    </filter-mapping>
+
+    <filter-mapping>
+        <filter-name>authenticationfilter</filter-name>
+        <url-pattern>/docs/*</url-pattern>
+    </filter-mapping>
 
 </web-app>