From: Roland Häder Date: Wed, 19 Apr 2017 20:12:39 +0000 (+0200) Subject: chaos in faces-config.xml, now lifted, still navigation rules are missing for some... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=08afef8b90f3f96b5bd153cffef98ee2e6a4f0f0;p=addressbook-war.git chaos in faces-config.xml, now lifted, still navigation rules are missing for some projects, e.g. basket/checkout for pizzaservice or addressbook Signed-off-by: Roland Häder --- diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index bf7c2d6c..a21503cd 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -9,8 +9,17 @@ en_US + * + + exception + /exception.xhtml + index /index.xhtml @@ -19,9 +28,13 @@ user_register /guest/user/user_register.xhtml + + user_login + /guest/user/user_login.xhtml + user_lost_password - /guest/user/user_lost_passwordord.xhtml + /guest/user/user_lost_password.xhtml terms @@ -52,17 +65,33 @@ /guest/user/user_resend_link.xhtml - login_own_addressbooks - /user/login_own_addressbooks.xhtml + user_change_email_address + /user/login_change_email_address.xhtml - login_edit_user_data - /login/login_edit_user_data.xhtml + user_change_password + /user/login_change_password.xhtml + + + user_change_personal_data + /user/login_change_personal_data.xhtml user_profile /user/user_profile.xhtml + + admin_list_fax + /admin/fax/admin_fax_list.xhtml + + + admin_list_landline + /admin/landline/admin_landline_list.xhtml + + + admin_list_mobile + /admin/mobile/admin_mobile_list.xhtml + admin_list_countries /admin/country/admin_country_list.xhtml @@ -87,121 +116,104 @@ admin_export_user /admin/user/admin_user_export.xhtml - - - /user/login.xhtml - - user_login - /login/login_index.xhtml - - - exception - /exception.xhtml - - - admin_list_user - /admin/user/admin_user_list.xhtml - admin_list_countries /admin/country/admin_country_list.xhtml + + admin_list_contact + /admin/contact/admin_contact_list.xhtml + admin_list_mobile_provider /admin/mobile_provider/admin_mobile_provider_list.xhtml - admin_list_contact_cellphone - /admin/cellphone/admin_contact_cellphone_list.xhtml + admin_list_contact_fax + /admin/fax/admin_contact_fax_list.xhtml - - - /guest/user/user_resend_link.xhtml - resend_done - /guest/user/user_resend_done.xhtml - - - - /guest/user/user_register.xhtml - - register_done - /guest/user/user_register_done.xhtml + admin_list_contact_landline + /admin/landline/admin_contact_landline_list.xhtml - register_page2 - /guest/user/user_register_page2.xhtml + admin_list_contact_mobile + /admin/mobile/admin_contact_mobile_list.xhtml - /admin/admin_logout.xhtml + /user/login_index.xhtml - index - /index.xhtml + user_change_password + /user/login_change_password.xhtml - /user/login_own_addressbooks.xhtml + /guest/user/user_login.xhtml - user_add_addressbook - /user/login_add_addressbook.xhtml + login_user + /user/login_index.xhtml + 1 + + + /guest/user/user_resend_link.xhtml - user_show_addressbook - /guest/user/user_show_addressbook.xhtml + user_login + /login/login_index.xhtml - show_addressbook_entries - /guest/user/user_show_addressbook_entries.xhtml + login_edit_user_data + /user/login_edit_user_data.xhtml - - - /guest/user/user_list.xhtml - login_list_sharing_addressbooks - /user/login_list_sharing_addressbooks.xhtml + user_profile + /guest/user/user_profile.xhtml - /guest/user/user_show_addressbook.xhtml + /guest/user/user_resend_link.xhtml - login_start_sharing_addressbook - /user/login_start_sharing_addressbook.xhtml + user_resend_done + /guest/user/user_resend_done.xhtml - /user/login_shared_addressbooks.xhtml + /guest/user/user_resend_link.xhtml - user_show_addressbook - /guest/user/user_show_addressbook.xhtml + resend_done + /guest/user/user_resend_done.xhtml - /user/login_edit_user_data.xhtml + /guest/user/user_register.xhtml - user_change_email_address - /user/login_user_change_email_address.xhtml + user_register_done + /guest/user/user_register_done.xhtml - user_change_password - /user/login_user_change_password.xhtml + user_register_page2 + /guest/user/user_register_page2.xhtml + + + /guest/user/user_register_page2.xhtml - user_change_personal_data - /user/login_user_change_personal_data.xhtml + user_register_done + /guest/user/user_register_done.xhtml /user/login_user_change_password.xhtml - login_data_saved + user_data_saved /user/login_data_saved.xhtml /user/login_user_change_email_address.xhtml - contact_data_saved + user_contact_data_saved /user/login_contact_data_saved.xhtml @@ -212,13 +224,9 @@ /user/login_user_change_personal_data.xhtml - login_data_saved + user_data_saved /user/login_data_saved.xhtml - - admin_delete_category - /admin/admin_category_delete.xhtml - /admin/country/admin_country_list.xhtml @@ -250,6 +258,24 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml + + /admin/mobile/admin_mobile_list.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + + /admin/user/admin_user_delete.xhtml + + admin_show_user + /admin/user/admin_user_show.xhtml + + + admin_list_user + /admin/user/admin_user_list.xhtml + + /admin/user/admin_user_list.xhtml @@ -280,20 +306,52 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_show_cellphone - /admin/cellphone/admin_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml + + + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml + + + admin_unlink_contact_mobile + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml + + + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_show_fax + /admin/fax/admin_fax_show.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_edit_fax + /admin/fax/admin_fax_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_unlink_contact_fax + /admin/contact/unlink/admin_contact_fax_unlink.xhtml + + + admin_delete_fax + /admin/fax/admin_fax_delete.xhtml + + + admin_show_landline + /admin/landline/admin_landline_show.xhtml + + + admin_edit_landline + /admin/landline/admin_landline_edit.xhtml + + + admin_unlink_contact_landline + /admin/contact/unlink/admin_contact_landline_unlink.xhtml + + + admin_delete_landline + /admin/landline/admin_landline_delete.xhtml admin_edit_user @@ -303,14 +361,30 @@ admin_delete_user /admin/user/admin_user_delete.xhtml + + admin_resend_user_confirm_link + /admin/user/admin_user_resend_confirmation_link.xhtml + + + admin_lock_user + /admin/user/admin_user_lock.xhtml + admin_unlock_user /admin/user/admin_user_unlock.xhtml + + admin_show_user_activity_log + /admin/user/admin_user_activity_log.xhtml + admin_edit_contact /admin/contact/admin_contact_edit.xhtml + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + /admin/contact/admin_contact_show.xhtml @@ -327,60 +401,272 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml + + + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml + + + admin_unlink_contact_mobile + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml + + + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml + + + admin_edit_fax + /admin/fax/admin_fax_edit.xhtml + + + admin_delete_fax + /admin/fax/admin_fax_delete.xhtml + + + admin_unlink_contact_fax + /admin/contact/unlink/admin_contact_fax_unlink.xhtml + + + admin_show_fax + /admin/fax/admin_fax_show.xhtml + + + admin_edit_landline + /admin/landline/admin_landline_edit.xhtml + + + admin_delete_landline + /admin/landline/admin_landline_delete.xhtml + + + admin_unlink_contact_landline + /admin/contact/unlink/admin_contact_landline_unlink.xhtml + + + admin_show_landline + /admin/landline/admin_landline_show.xhtml + + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + + /admin/fax/admin_fax_list.xhtml + + admin_show_fax + /admin/fax/admin_fax_show.xhtml + + + admin_edit_fax + /admin/fax/admin_fax_edit.xhtml + + + admin_delete_fax + /admin/fax/admin_fax_delete.xhtml + + + + /admin/landline/admin_landline_list.xhtml + + admin_show_landline + /admin/landline/admin_landline_show.xhtml + + + admin_edit_landline + /admin/landline/admin_landline_edit.xhtml + + + admin_delete_landline + /admin/landline/admin_landline_delete.xhtml + + + + /admin/mobile/admin_mobile_list.xhtml + + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml + + + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml + + + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml + + + + /admin/fax/admin_fax_delete.xhtml + + admin_show_fax_provider + /admin/fax_provider/admin_fax_provider_show.xhtml + + + admin_list_fax + /admin/fax/admin_fax_list.xhtml + + + + /admin/landline/admin_landline_delete.xhtml + + admin_show_landline_provider + /admin/landline_provider/admin_landline_provider_show.xhtml + + + admin_list_landline + /admin/landline/admin_landline_list.xhtml + + + + /admin/user/admin_user_resend_confirmation_link.xhtml + + admin_show_user + /admin/user/admin_user_show.xhtml + + + + /admin/mobile/admin_mobile_delete.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + admin_list_mobile + /admin/mobile/admin_mobile_list.xhtml + + + /admin/fax/admin_fax_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_show_fax + /admin/fax/admin_fax_show.xhtml + + + /admin/landline/admin_landline_edit.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_show_landline + /admin/landline/admin_landline_show.xhtml + + + /admin/mobile/admin_mobile_edit.xhtml - admin_show_cellphone - /admin/cellphone/admin_contact_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml - /admin/cellphone/admin_contact_cellphone_list.xhtml + /admin/fax/admin_fax_show.xhtml + + admin_edit_fax + /admin/fax/admin_fax_edit.xhtml + + + admin_delete_fax + /admin/fax/admin_fax_delete.xhtml + + + admin_unlink_contact_fax + /admin/contact/unlink/admin_contact_fax_unlink.xhtml + + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + + /admin/landline/admin_landline_show.xhtml + + admin_edit_landline + /admin/landline/admin_landline_edit.xhtml + - admin_show_cellphone - /admin/cellphone/admin_contact_cellphone_show.xhtml + admin_delete_landline + /admin/landline/admin_landline_delete.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_unlink_contact_landline + /admin/contact/unlink/admin_contact_landline_unlink.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_show_contact + /admin/contact/admin_contact_show.xhtml - /admin/cellphone/admin_contact_cellphone_show.xhtml + /admin/mobile/admin_mobile_show.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml admin_show_contact /admin/contact/admin_contact_show.xhtml + + /admin/user/admin_user_lock.xhtml + + admin_show_user + /admin/user/admin_user_show.xhtml + + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + + /admin/user/admin_user_unlock.xhtml + + admin_show_user + /admin/user/admin_user_show.xhtml + + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + + /admin/contact/unlink/admin_contact_fax_unlink.xhtml + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + + /admin/contact/unlink/admin_contact_landline_unlink.xhtml + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + /admin/contact/admin_contact_list.xhtml @@ -409,6 +695,13 @@ /admin/user/admin_user_show.xhtml + + /admin/user/admin_user_activity_log.xhtml + + admin_show_user + /admin/user/admin_user_show.xhtml + +