From f66c6d68f71bb25c63c47b7fa840f82e4015c4cd Mon Sep 17 00:00:00 2001
From: Georg Herdt <herdt@agima-it.de>
Date: Fri, 29 Jan 2021 13:21:29 +0100
Subject: [PATCH] add listener for preparing configuration context attributes
 bug 5153

---
 .../WEB-INF/web.xml                           | 16 ++++++--------
 java/com.sap.sailing.gwt.ui/WEB-INF/web.xml   | 21 ++++---------------
 java/com.sap.sailing.www/WEB-INF/web.xml      | 15 ++++++-------
 java/com.sap.sse.security.ui/WEB-INF/web.xml  | 15 ++++++-------
 4 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
index dc74a8fb51a..c3fc8ac7d1d 100644
--- a/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
+++ b/java/com.sap.sailing.dashboards.gwt/WEB-INF/web.xml
@@ -4,6 +4,9 @@
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
     version="3.1">
 
+    <listener>
+        <listener-class>com.sap.sse.debranding.ClientConfigurationListener</listener-class>
+    </listener>
     <servlet>
         <servlet-name>default</servlet-name>
         <servlet-class>org.eclipse.jetty.servlet.DefaultServlet
@@ -17,17 +20,10 @@
                <param-value>false</param-value>
          </init-param>
     </servlet>
-
-
-    <filter>
-        <display-name>ClientConfigurationFilter</display-name>
-        <filter-name>ClientConfigurationFilter</filter-name>
-        <filter-class>com.sap.sse.debranding.ClientConfigurationFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ClientConfigurationFilter</filter-name>
+    <servlet-mapping>
+        <servlet-name>jsp</servlet-name>
         <url-pattern>*.html</url-pattern>
-    </filter-mapping>
+    </servlet-mapping>
     <servlet>
         <display-name>Sailing Service</display-name>
         <servlet-name>SailingService</servlet-name>
diff --git a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
index 7de08e73735..0d36cebe540 100755
--- a/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
+++ b/java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
@@ -58,24 +58,11 @@
 		<filter-name>LocaleInjectionFilter</filter-name>
 		<url-pattern>*.html</url-pattern>
 	</filter-mapping>
-
-    <filter>
-        <display-name>ClientConfigurationFilter</display-name>
-        <filter-name>ClientConfigurationFilter</filter-name>
-        <filter-class>com.sap.sse.debranding.ClientConfigurationFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ClientConfigurationFilter</filter-name>
-        <url-pattern>*.html</url-pattern>
-    </filter-mapping>
-
-    <servlet>
-        <display-name>ClientConfigurationServlet</display-name>
-        <servlet-name>ClientConfigurationServlet</servlet-name>
-        <servlet-class>com.sap.sse.debranding.ClientConfigurationServlet</servlet-class>
-    </servlet>
+    <listener>
+        <listener-class>com.sap.sse.debranding.ClientConfigurationListener</listener-class>
+    </listener>
     <servlet-mapping>
-        <servlet-name>ClientConfigurationServlet</servlet-name>
+        <servlet-name>jsp</servlet-name>
         <url-pattern>*.html</url-pattern>
     </servlet-mapping>
 	<servlet>
diff --git a/java/com.sap.sailing.www/WEB-INF/web.xml b/java/com.sap.sailing.www/WEB-INF/web.xml
index 5e1cc2af24f..cfb33abfc6a 100644
--- a/java/com.sap.sailing.www/WEB-INF/web.xml
+++ b/java/com.sap.sailing.www/WEB-INF/web.xml
@@ -3,7 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
     version="3.1">
-	
+    <listener>
+        <listener-class>com.sap.sse.debranding.ClientConfigurationListener</listener-class>
+    </listener>
 	<servlet>
 		<servlet-name>default</servlet-name>
 		<servlet-class>org.eclipse.jetty.servlet.DefaultServlet
@@ -17,15 +19,10 @@
 		<filter-name>CORSFilter</filter-name>
 		<filter-class>com.sap.sailing.www.CORSFilter</filter-class>
 	</filter>
-    <filter>
-        <display-name>ClientConfigurationFilter</display-name>
-        <filter-name>ClientConfigurationFilter</filter-name>
-        <filter-class>com.sap.sse.debranding.ClientConfigurationFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ClientConfigurationFilter</filter-name>
+    <servlet-mapping>
+        <servlet-name>jsp</servlet-name>
         <url-pattern>*.html</url-pattern>
-    </filter-mapping>
+    </servlet-mapping>
 	<filter-mapping>
 		<filter-name>CORSFilter</filter-name>
 		<url-pattern>/fonts/*</url-pattern>
diff --git a/java/com.sap.sse.security.ui/WEB-INF/web.xml b/java/com.sap.sse.security.ui/WEB-INF/web.xml
index ddb9071f3bb..5142b60fe6b 100644
--- a/java/com.sap.sse.security.ui/WEB-INF/web.xml
+++ b/java/com.sap.sse.security.ui/WEB-INF/web.xml
@@ -3,7 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
     version="3.1">
-
+    <listener>
+        <listener-class>com.sap.sse.debranding.ClientConfigurationListener</listener-class>
+    </listener>
     <!-- Disable directory listing: -->
     <servlet>
         <servlet-name>default</servlet-name>
@@ -51,15 +53,10 @@
                 <filter-name>GWTCacheControlServletFilter</filter-name>
                 <url-pattern>/*</url-pattern>
         </filter-mapping>
-    <filter>
-        <display-name>ClientConfigurationFilter</display-name>
-        <filter-name>ClientConfigurationFilter</filter-name>
-        <filter-class>com.sap.sse.debranding.ClientConfigurationFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ClientConfigurationFilter</filter-name>
+    <servlet-mapping>
+        <servlet-name>jsp</servlet-name>
         <url-pattern>*.html</url-pattern>
-    </filter-mapping>
+    </servlet-mapping>
       <filter>
         <filter-name>LocaleInjectionFilter</filter-name>
         <filter-class>com.sap.sse.security.ui.server.LocaleInjectionFilter</filter-class>