the administrative area is secured by the web container's constraints, not by own...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index c510f7d57e4ea0837c10a868ab55b3ceedcd385c..3cecb2eafd8dba1c2e61c3bcf285bc922f8d53fe 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,70 +2,70 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="guest/user/show_addressbook.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="user/login_own_addressbooks.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="user/login_user_data_saved.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/index.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="650" y="1350" zoom="true"/>
-        <Node id="user/login_data_saved.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="user/login_other_addressbooks.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="user/login_start_sharing_addressbook.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="guest/user/user_list.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/login_edit_user_data.xhtml" x="1650" y="750" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="*" x="1150" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="guest/user/lost_passwd.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="guest/user/register_done.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="guest/user/login_error.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="user/login_change_password.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_export.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="guest/user/user_profile.xhtml" x="1150" y="1050" zoom="true"/>
-        <Node id="guest/user/confirm_account.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="exception.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="user/login_list_sharing_addressbooks.xhtml" x="2150" y="450" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1400" y="900" zoom="true"/>
-        <Node id="guest/user/register_page2.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="terms.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="user/login_change_personal_data.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="guest/user/resend_link.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login_add_addressbook.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="user/login_contact_data_saved.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/login_shared_addressbooks.xhtml" x="2400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="900" y="1200" zoom="true"/>
-        <Node id="guest/user/register.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="user/login_change_email_address.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="user/index.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="1150" y="1050" zoom="true"/>
+        <Node id="user/login_other_addressbooks.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/login_start_sharing_addressbook.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="*" x="900" y="150" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1400" y="900" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="2150" y="450" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="1650" y="750" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_export.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="guest/user/confirm_account.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_list_sharing_addressbooks.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="1350" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="guest/user/register_page2.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="terms.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="900" y="1200" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="1900" y="600" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="user/login_shared_addressbooks.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="1150" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a18ce4c7b310c6368d2e12cacc387411b27ba3cc..75930f359743e54fda7eeffe090566f6c985cd25 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -59,10 +59,6 @@
                        <from-outcome>login_own_addressbooks</from-outcome>
                        <to-view-id>/user/login_own_addressbooks.xhtml</to-view-id>
                </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_logout</from-outcome>
-                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
-               </navigation-case>
                <navigation-case>
                        <from-outcome>login_edit_user_data</from-outcome>
                        <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>

diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
deleted file mode 100644 (file)
index 07e7099..0000000
--- a/web/admin/admin_logout.xhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:h="http://xmlns.jcp.org/jsf/html"
-       xmlns:f="http://xmlns.jcp.org/jsf/core"
-       >
-
-       <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LOGOUT}
-               </ui:define>
-
-               <ui:define name="content">
-                       Offenes TODO.
-               </ui:define>
-       </ui:composition>
-</html>