From 59db0c72ece1e6ad24cd64616609faa0a3eb001b Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 17 Dec 2016 10:08:45 +0000
Subject: [PATCH] Merge origin/master

---
 web/WEB-INF/web.xml |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index e61873f..eb731ab 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -5,9 +5,37 @@
         <param-name>dsname</param-name>
         <param-value>jdbc/NewUserDB</param-value>
     </context-param>
+    <filter>
+        <filter-name>NiceFilter</filter-name>
+        <filter-class>de.uhilger.um.web.NiceFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>NiceFilter</filter-name>
+        <url-pattern>/svc/*</url-pattern>
+    </filter-mapping>
     <listener>
         <listener-class>de.uhilger.um.App</listener-class>
     </listener>
+    <servlet>
+        <servlet-name>TransitServlet</servlet-name>
+        <servlet-class>de.uhilger.transit.web.TransitServlet</servlet-class>
+        <init-param>
+            <param-name>klassen</param-name>
+            <param-value>de.uhilger.um.api</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <servlet-name>TestServlet</servlet-name>
+        <jsp-file>/show.jsp</jsp-file>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>TransitServlet</servlet-name>
+        <url-pattern>/api</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>TestServlet</servlet-name>
+        <url-pattern>/test/*</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30

--
Gitblit v1.9.3