From 35aae895ce49f86408916b267cb8920e0ed07edf Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 7 Apr 2016 14:22:04 +0200
Subject: [PATCH] added glassfish-specific role-group mapping and fixed URL
 pattern in web.xml

---
 .../localization/bundle_en_US.properties      |  4 +--
 web/WEB-INF/glassfish-web.xml                 | 18 ++++++-----
 web/WEB-INF/web.xml                           | 30 ++++---------------
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 8d5ddbc9..b0faf968 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -102,8 +102,8 @@ LINK_GUEST_PRIVACY=Privacy
 LINK_GUEST_IMPRINT_TITLE=Go to imprint page
 LINK_GUEST_TERMS_TITLE=View terms & conditions
 LINK_GUEST_PRIVACY_TITLE=View privacy statement
-MENU_USER_TITLE=User
-ENTER_USER_NAME=User name:
+MENU_USER_TITLE=Agent
+ENTER_USER_NAME=Agent name:
 BUTTON_USER_LOGIN=Login
 BUTTON_CONTINUE_STEP_2=Continue to step 2
 GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:
diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml
index b70617b4..b56fd7b2 100644
--- a/web/WEB-INF/glassfish-web.xml
+++ b/web/WEB-INF/glassfish-web.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
-	<context-root>/addressbook-war</context-root>
-	<class-loader delegate="true"/>
-	<jsp-config>
-		<property name="keepgenerated" value="true">
-			<description>Keep a copy of the generated servlet class' java code.</description>
-		</property>
-	</jsp-config>
+  <context-root>/addressbook-war</context-root>
+  <security-role-mapping>
+    <role-name>admin</role-name>
+    <group-name>admin</group-name>
+  </security-role-mapping>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class' java code.</description>
+    </property>
+  </jsp-config>
 </glassfish-web-app>
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 63b7ef9b..0122fc6e 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -26,46 +26,26 @@
     <welcome-file-list>
         <welcome-file>faces/index.xhtml</welcome-file>
     </welcome-file-list>
-    <security-constraint>
-        <display-name>LoginConstraint</display-name>
-        <web-resource-collection>
-            <web-resource-name>loginArea</web-resource-name>
-            <description>Login area</description>
-            <url-pattern>/llogin/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <description>User Authentication</description>
-            <role-name>user</role-name>
-        </auth-constraint>
-    </security-constraint>
     <security-constraint>
         <display-name>AdminConstraint</display-name>
         <web-resource-collection>
             <web-resource-name>admin</web-resource-name>
             <description>Administrative area</description>
-            <url-pattern>/admin/*</url-pattern>
+            <url-pattern>/faces/admin/*</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <description>Admin authentication</description>
             <role-name>admin</role-name>
         </auth-constraint>
     </security-constraint>
-    <login-config>
-        <auth-method>FORM</auth-method>
-        <realm-name>Loginbereich / Login area</realm-name>
-        <form-login-config>
-            <form-login-page>/user/login.xhtml</form-login-page>
-            <form-error-page>/user/login_error.xhtml</form-error-page>
-        </form-login-config>
-    </login-config>
-    <security-role>
-        <description>A logged-in user that has previously registered himself/herself.</description>
-        <role-name>user</role-name>
-    </security-role>
     <mime-mapping>
         <extension>tpl</extension>
         <mime-type>text/plain</mime-type>
     </mime-mapping>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>file</realm-name>
+    </login-config>
     <security-role>
         <description>Administrativre rule</description>
         <role-name>admin</role-name>
-- 
2.39.5