Alexander Wels has uploaded a new change for review.

Change subject: restapi,userportal,webadmin: reformat web.xml
......................................................................

restapi,userportal,webadmin: reformat web.xml

- Reformatted web.xml to be consistent.

Change-Id: I2233a4cb959c87fe0ad13a98ecf5d38d4c6a2184
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml
M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
3 files changed, 265 insertions(+), 273 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/33983/1

diff --git 
a/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml 
b/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml
index 59608d2..6505717 100644
--- a/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,135 +1,125 @@
 <?xml version="1.0"?>
 
-<!--
-Copyright (c) 2014 Red Hat, Inc.
+<!-- Copyright (c) 2014 Red Hat, Inc. Licensed 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. -->
 
-Licensed 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
+<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">
 
-  http://www.apache.org/licenses/LICENSE-2.0
+    <context-param>
+        <param-name>resteasy.media.type.param.mapping</param-name>
+        <param-value>accept</param-value>
+    </context-param>
 
-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.
--->
+    <filter>
+        <filter-name>CSRFProtection</filter-name>
+        
<filter-class>org.ovirt.engine.api.common.security.CSRFProtectionFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>CSRFProtection</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-<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">
+    <filter>
+        <filter-name>RestApiSessionValidationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.RestApiSessionValidationFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>RestApiSessionValidationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <context-param>
-    <param-name>resteasy.media.type.param.mapping</param-name>
-    <param-value>accept</param-value>
-  </context-param>
+    <filter>
+        <filter-name>SessionValidationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>SessionValidationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>CSRFProtection</filter-name>
-    
<filter-class>org.ovirt.engine.api.common.security.CSRFProtectionFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>CSRFProtection</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
+        <init-param>
+            <param-name>user-name-format</param-name>
+            <param-value>RESTAPI_SPECIFIC</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>RestApiSessionValidationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.RestApiSessionValidationFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>RestApiSessionValidationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>NegotiationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
+        <init-param>
+            <param-name>capabilities</param-name>
+            <param-value>AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>NegotiationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>SessionValidationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>SessionValidationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>LoginFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>LoginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
-    <init-param>
-      <param-name>user-name-format</param-name>
-      <param-value>RESTAPI_SPECIFIC</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>EnforceAuthFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.EnforceAuthFilter</filter-class>
+        <!-- schemes parameter names should be in format of scheme.XXX Add 
+            an init-param per each scheme -->
+        <init-param>
+            <param-name>scheme.basic_auth</param-name>
+            <param-value>Basic realm="RESTAPI"</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>EnforceAuthFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>NegotiationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
-    <init-param>
-      <param-name>capabilities</param-name>
-      <param-value>AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>NegotiationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>RestApiSessionMgmtFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.RestApiSessionMgmtFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>RestApiSessionMgmtFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
- <filter>
-    <filter-name>LoginFilter</filter-name>
-    <filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>LoginFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <!-- confidentiality -->
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>everything</web-resource-name>
+            <url-pattern>/*</url-pattern>
+        </web-resource-collection>
+        <user-data-constraint>
+            <transport-guarantee>NONE</transport-guarantee>
+        </user-data-constraint>
+    </security-constraint>
 
- <filter>
-    <filter-name>EnforceAuthFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.EnforceAuthFilter</filter-class>
-<!-- schemes parameter names should be in format of scheme.XXX
-Add an init-param per each scheme -->
-    <init-param>
-      <param-name>scheme.basic_auth</param-name>
-      <param-value>Basic realm="RESTAPI"</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>EnforceAuthFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter>
-    <filter-name>RestApiSessionMgmtFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.RestApiSessionMgmtFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>RestApiSessionMgmtFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <!-- confidentiality -->
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>everything</web-resource-name>
-      <url-pattern>/*</url-pattern>
-    </web-resource-collection>
-    <user-data-constraint>
-      <transport-guarantee>NONE</transport-guarantee>
-    </user-data-constraint>
-  </security-constraint>
-
-  <session-config>
-    <session-timeout>180</session-timeout>
-    <cookie-config>
-      <http-only>true</http-only>
-      <secure>false</secure>
-    </cookie-config>
-  </session-config>
+    <session-config>
+        <session-timeout>180</session-timeout>
+        <cookie-config>
+            <http-only>true</http-only>
+            <secure>false</secure>
+        </cookie-config>
+    </session-config>
 
 </web-app>
diff --git 
a/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml 
b/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
index b5c067d..bef551b 100644
--- a/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
+++ b/frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml
@@ -1,77 +1,78 @@
 <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">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+    version="3.0">
 
     <display-name>oVirt UserPortal UI</display-name>
     <!-- Application with context parameters -->
     <context-param>
-      <param-name>obrandThemePath</param-name>
-      <param-value>/theme</param-value>
+        <param-name>obrandThemePath</param-name>
+        <param-value>/theme</param-value>
     </context-param>
     <context-param>
-      <param-name>obrandResourcePath</param-name>
-      <param-value>/theme-resource</param-value>
+        <param-name>obrandResourcePath</param-name>
+        <param-value>/theme-resource</param-value>
     </context-param>
     <context-param>
-      <param-name>obrandApplicationName</param-name>
-      <param-value>userportal</param-value>
+        <param-name>obrandApplicationName</param-name>
+        <param-value>userportal</param-value>
     </context-param>
     <context-param>
-      <param-name>contextToRootModifier</param-name>
-      <param-value>..</param-value>
+        <param-name>contextToRootModifier</param-name>
+        <param-value>..</param-value>
     </context-param>
 
-   <filter>
-    <filter-name>SessionValidationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>SessionValidationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>SessionValidationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>SessionValidationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
-    <init-param>
-      <param-name>user-name-format</param-name>
-      <param-value>UPN</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
+        <init-param>
+            <param-name>user-name-format</param-name>
+            <param-value>UPN</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>NegotiationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
-    <init-param>
-      <param-name>capabilities</param-name>
-      <param-value>AUTHENTICATE_NEGOTIATE_INTERACTIVE | 
AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>NegotiationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>NegotiationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
+        <init-param>
+            <param-name>capabilities</param-name>
+            <param-value>AUTHENTICATE_NEGOTIATE_INTERACTIVE | 
AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>NegotiationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
- <filter>
-    <filter-name>LoginFilter</filter-name>
-    <filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>LoginFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>LoginFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>LoginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
- <filter>
-    <filter-name>SessionMgmtFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.SessionMgmtFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>SessionMgmtFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>SessionMgmtFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.SessionMgmtFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>SessionMgmtFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     <filter-mapping>
         <filter-name>LocaleFilter</filter-name>
diff --git a/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml 
b/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
index 93836f9..a88f172 100644
--- a/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
+++ b/frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml
@@ -1,123 +1,124 @@
 <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">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
+    version="3.0">
 
     <display-name>oVirt WebAdmin UI</display-name>
 
     <!-- Application with context parameters -->
     <context-param>
-      <param-name>obrandThemePath</param-name>
-      <param-value>/theme</param-value>
+        <param-name>obrandThemePath</param-name>
+        <param-value>/theme</param-value>
     </context-param>
     <context-param>
-      <param-name>obrandResourcePath</param-name>
-      <param-value>/theme-resource</param-value>
+        <param-name>obrandResourcePath</param-name>
+        <param-value>/theme-resource</param-value>
     </context-param>
     <context-param>
-      <param-name>obrandApplicationName</param-name>
-      <param-value>webadmin</param-value>
+        <param-name>obrandApplicationName</param-name>
+        <param-value>webadmin</param-value>
     </context-param>
     <context-param>
-      <param-name>contextToRootModifier</param-name>
-      <param-value>..</param-value>
+        <param-name>contextToRootModifier</param-name>
+        <param-value>..</param-value>
     </context-param>
-  <filter>
-    <filter-name>SessionValidationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>SessionValidationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>SessionValidationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.SessionValidationFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>SessionValidationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
-  <filter>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
-    <init-param>
-      <param-name>user-name-format</param-name>
-      <param-value>UPN</param-value>
-    </init-param>
-  </filter>
-  <filter-mapping>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
+    <filter>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.BasicAuthenticationFilter</filter-class>
+        <init-param>
+            <param-name>user-name-format</param-name>
+            <param-value>UPN</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>BasicAuthenticationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
- <filter>
-    <filter-name>NegotiationFilter</filter-name>
-    
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
-    <init-param>
-      <param-name>capabilities</param-name>
-      <param-value>AUTHENTICATE_NEGOTIATE_INTERACTIVE | 
AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
-    </init-param>
- </filter>
- <filter-mapping>
-    <filter-name>NegotiationFilter</filter-name>
-    <url-pattern>/*</url-pattern>
- </filter-mapping>
+    <filter>
+        <filter-name>NegotiationFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.NegotiationFilter</filter-class>
+        <init-param>
+            <param-name>capabilities</param-name>
+            <param-value>AUTHENTICATE_NEGOTIATE_INTERACTIVE | 
AUTHENTICATE_NEGOTIATE_NON_INTERACTIVE</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>NegotiationFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
- <filter>
-    <filter-name>LoginFilter</filter-name>
-    <filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
+    <filter>
+        <filter-name>LoginFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.LoginFilter</filter-class>
         <init-param>
             <param-name>login-as-admin</param-name>
             <param-value>true</param-value>
         </init-param>
     </filter>
     <filter-mapping>
-      <filter-name>LoginFilter</filter-name>
-      <url-pattern>/*</url-pattern>
+        <filter-name>LoginFilter</filter-name>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter>
-      <filter-name>SessionMgmtFilter</filter-name>
-      
<filter-class>org.ovirt.engine.core.aaa.filters.SessionMgmtFilter</filter-class>
+        <filter-name>SessionMgmtFilter</filter-name>
+        
<filter-class>org.ovirt.engine.core.aaa.filters.SessionMgmtFilter</filter-class>
     </filter>
     <filter-mapping>
-      <filter-name>SessionMgmtFilter</filter-name>
-      <url-pattern>/*</url-pattern>
+        <filter-name>SessionMgmtFilter</filter-name>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
     <filter-mapping>
-      <filter-name>LocaleFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>ERROR</dispatcher>
+        <filter-name>LocaleFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>ERROR</dispatcher>
     </filter-mapping>
 
     <filter-mapping>
-      <filter-name>BrandingFilter</filter-name>
-      <url-pattern>/*</url-pattern>
-      <dispatcher>REQUEST</dispatcher>
-      <dispatcher>ERROR</dispatcher>
+        <filter-name>BrandingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>ERROR</dispatcher>
     </filter-mapping>
 
-       <filter-mapping>
-               <filter-name>GwtCachingFilter</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
+    <filter-mapping>
+        <filter-name>GwtCachingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
     <filter-mapping>
         <filter-name>HeaderFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-       <servlet-mapping>
-               <servlet-name>WebAdminHostPageServlet</servlet-name>
-               <url-pattern>/WebAdmin.html</url-pattern>
-       </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>WebAdminHostPageServlet</servlet-name>
+        <url-pattern>/WebAdmin.html</url-pattern>
+    </servlet-mapping>
 
-       <servlet-mapping>
-               <servlet-name>GenericApiServlet</servlet-name>
-               <url-pattern>/GenericApiGWTService</url-pattern>
-       </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>GenericApiServlet</servlet-name>
+        <url-pattern>/GenericApiGWTService</url-pattern>
+    </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>XsrfTokenServiceServlet</servlet-name>
         <url-pattern>/xsrf</url-pattern>
     </servlet-mapping>
 
-       <servlet-mapping>
-               <servlet-name>PluginResourceServlet</servlet-name>
-               <url-pattern>/plugin/*</url-pattern>
-       </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>PluginResourceServlet</servlet-name>
+        <url-pattern>/plugin/*</url-pattern>
+    </servlet-mapping>
 
     <servlet-mapping>
         <servlet-name>BrandingServlet</servlet-name>
@@ -139,32 +140,32 @@
         <url-pattern>/405.html</url-pattern>
     </servlet-mapping>
 
-       <!-- Default page to serve -->
-       <welcome-file-list>
-               <welcome-file>WebAdmin.html</welcome-file>
-       </welcome-file-list>
+    <!-- Default page to serve -->
+    <welcome-file-list>
+        <welcome-file>WebAdmin.html</welcome-file>
+    </welcome-file-list>
 
-       <!-- Error page to present -->
-       <error-page>
-               <error-code>404</error-code>
-               <location>/404.html</location>
-       </error-page>
+    <!-- Error page to present -->
+    <error-page>
+        <error-code>404</error-code>
+        <location>/404.html</location>
+    </error-page>
 
-       <error-page>
-               <error-code>405</error-code>
-               <location>/405.html</location>
-       </error-page>
+    <error-page>
+        <error-code>405</error-code>
+        <location>/405.html</location>
+    </error-page>
 
-       <!-- Confidentiality -->
-       <security-constraint>
-               <web-resource-collection>
-                       <web-resource-name>everything</web-resource-name>
-                       <url-pattern>/*</url-pattern>
-               </web-resource-collection>
-               <user-data-constraint>
-                       <transport-guarantee>NONE</transport-guarantee>
-               </user-data-constraint>
-       </security-constraint>
+    <!-- Confidentiality -->
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>everything</web-resource-name>
+            <url-pattern>/*</url-pattern>
+        </web-resource-collection>
+        <user-data-constraint>
+            <transport-guarantee>NONE</transport-guarantee>
+        </user-data-constraint>
+    </security-constraint>
 
     <session-config>
         <cookie-config>


-- 
To view, visit http://gerrit.ovirt.org/33983
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2233a4cb959c87fe0ad13a98ecf5d38d4c6a2184
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to