added glassfish-specific role-group mapping and fixed URL pattern in web.xml

diff --git a/web/WEB-INF/glassfish-web.xml b/web/WEB-INF/glassfish-web.xml
index 15d7a0a50778d14265636967e7bd8542d06511ee..f1501e224d55a41400ddd27a2dc73cb776149a51 100644 (file)
--- a/web/WEB-INF/glassfish-web.xml
+++ b/web/WEB-INF/glassfish-web.xml
@@ -3,6 +3,10 @@
 <glassfish-web-app error-url="">
        <context-root>/jjobs-war</context-root>
        <class-loader delegate="true"/>
+       <security-role-mapping>
+               <role-name>admin</role-name>
+               <group-name>admin</group-name>
+       </security-role-mapping>
        <jsp-config>
                <property name="keepgenerated" value="true">
                        <description>Keep a copy of the generated servlet class' java code.</description>

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index e95cc0a5ca77cb40d27fee51682e12822ab35490..0961676cc8fde9cbcbead6c7f797ba4228697dec 100644 (file)
--- 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>