From f57e8475b5c9d58dd9cedc7f0d866d9cdb09965c Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 16 May 2020 12:00:02 +0000
Subject: [PATCH] Funktion und Dialog 'Neue Rolle' erstellt, Vorlagen.js entfernt und in app.js ueberfuehrt

---
 web/WEB-INF/web.xml |   72 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 954bd19..21f8d44 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.0" 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">
+    <description>Nutzerverwaltung</description>
     <display-name>Nutzerverwaltung</display-name>
     <context-param>
         <param-name>dsname</param-name>
@@ -18,7 +19,7 @@
         <url-pattern>/svc/*</url-pattern>
     </filter-mapping>
     <listener>
-        <listener-class>de.uhilger.um.Initialiser</listener-class>
+        <listener-class>de.uhilger.um.web.Initialiser</listener-class>
     </listener>
     <servlet>
         <servlet-name>TransitServlet</servlet-name>
@@ -29,20 +30,81 @@
         </init-param>
     </servlet>
     <servlet>
-        <servlet-name>TestServlet</servlet-name>
-        <jsp-file>/show.jsp</jsp-file>
+        <servlet-name>PublicTransit</servlet-name>
+        <servlet-class>de.uhilger.transit.web.TransitServlet</servlet-class>
+        <init-param>
+            <param-name>klassen</param-name>
+            <param-value>de.uhilger.um.pub</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <servlet-name>ProfilDienst</servlet-name>
+        <servlet-class>de.uhilger.transit.web.TransitServlet</servlet-class>
+        <init-param>
+            <param-name>klassen</param-name>
+            <param-value>de.uhilger.um.api.Profil</param-value>
+        </init-param>
     </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-name>PublicTransit</servlet-name>
+        <url-pattern>/pub</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ProfilDienst</servlet-name>
+        <url-pattern>/prf</url-pattern>
     </servlet-mapping>
     <session-config>
         <session-timeout>
             30
         </session-timeout>
     </session-config>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    <security-constraint>
+        <display-name>nutzerAdminConstraint</display-name>
+        <web-resource-collection>
+            <web-resource-name>nutzerAdmin</web-resource-name>
+            <description>Nutzer-Administration</description>
+            <url-pattern>/ui/*</url-pattern>
+            <url-pattern>/svc/*</url-pattern>
+            <url-pattern>/api/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <description>nutzerAdminAuthContraint</description>
+            <role-name>nutzerAdmin</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <security-constraint>
+        <display-name>nutzerProfilConstraint</display-name>
+        <web-resource-collection>
+            <web-resource-name>nutzerProfil</web-resource-name>
+            <description>Nutzerprofil</description>
+            <url-pattern>/prf/*</url-pattern>
+            <url-pattern>/profil/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <description>nutzerProfilAuthContraint</description>
+            <role-name>nutzerProfil</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <login-config>
+        <auth-method>FORM</auth-method>
+        <form-login-config>
+            <form-login-page>/login_form.html</form-login-page>
+            <form-error-page>/login_error.jsp</form-error-page>
+        </form-login-config>
+    </login-config>
+    <security-role>
+        <description/>
+        <role-name>nutzerAdmin</role-name>
+    </security-role>
+    <security-role>
+        <description/>
+        <role-name>nutzerProfil</role-name>
+    </security-role>
 </web-app>

--
Gitblit v1.9.3