You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/06/14 18:59:21 UTC

svn commit: r1493155 - in /oozie/trunk: distro/src/main/tomcat/ssl-web.xml release-log.txt webapp/src/main/webapp/WEB-INF/web-common.xml webapp/src/main/webapp/WEB-INF/web.xml

Author: rkanter
Date: Fri Jun 14 16:59:20 2013
New Revision: 1493155

URL: http://svn.apache.org/r1493155
Log:
OOZIE-1410 V2 servlets are missing from ssl-web.xml (rkanter, rohini via rkanter)

Added:
    oozie/trunk/webapp/src/main/webapp/WEB-INF/web-common.xml
Modified:
    oozie/trunk/distro/src/main/tomcat/ssl-web.xml
    oozie/trunk/release-log.txt
    oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml

Modified: oozie/trunk/distro/src/main/tomcat/ssl-web.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/distro/src/main/tomcat/ssl-web.xml?rev=1493155&r1=1493154&r2=1493155&view=diff
==============================================================================
--- oozie/trunk/distro/src/main/tomcat/ssl-web.xml (original)
+++ oozie/trunk/distro/src/main/tomcat/ssl-web.xml Fri Jun 14 16:59:20 2013
@@ -16,180 +16,14 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd" [
+    <!ENTITY web-common SYSTEM "web-common.xml">
+]>
 
 <web-app>
-    <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>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>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-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>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>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>sla-event</servlet-name>
-        <url-pattern>/v1/sla/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- welcome-file -->
-    <welcome-file-list>
-        <welcome-file>index.html</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>/index.html</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>
+    <!-- The servlets are defined in web-common.xml -->
+    &web-common;
 
     <!-- Require SSL (HTTPS) for everything except callbacks -->
     <security-constraint>

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1493155&r1=1493154&r2=1493155&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 14 16:59:20 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1410 V2 servlets are missing from ssl-web.xml (rkanter, rohini via rkanter)
 OOZIE-1349 oozieCLI -Doozie.auth.token.cache doesn't work (bowenzhangusa via tucu)
 OOZIE-1398 Reduce the number of CLOB columns used (ryota)
 OOZIE-1374 Make all unit tests run with Hadoop 2 (rohini)

Added: oozie/trunk/webapp/src/main/webapp/WEB-INF/web-common.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/src/main/webapp/WEB-INF/web-common.xml?rev=1493155&view=auto
==============================================================================
--- oozie/trunk/webapp/src/main/webapp/WEB-INF/web-common.xml (added)
+++ oozie/trunk/webapp/src/main/webapp/WEB-INF/web-common.xml Fri Jun 14 16:59:20 2013
@@ -0,0 +1,237 @@
+<?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.html</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.html</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>
+

Modified: oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml?rev=1493155&r1=1493154&r2=1493155&view=diff
==============================================================================
--- oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml Fri Jun 14 16:59:20 2013
@@ -7,229 +7,22 @@
   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.
 -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd" [
+    <!ENTITY web-common SYSTEM "web-common.xml">
+]>
 
 <web-app>
-    <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.html</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>/index.html</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>
+    <!-- The servlets are defined in web-common.xml -->
+    &web-common;
 
 </web-app>