From aa5dac0eb5cd194aa82f200bbc21589761a498ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 19 Apr 2017 22:12:39 +0200 Subject: [PATCH] chaos in faces-config.xml, now lifted, still navigation rules are missing for some projects, e.g. basket/checkout for pizzaservice or addressbook MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- web/WEB-INF/faces-config.xml | 441 ++++++++++++++++++++++++++++++----- 1 file changed, 387 insertions(+), 54 deletions(-) diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index d0530359..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,13 +65,33 @@ /guest/user/user_resend_link.xhtml - login_edit_user_data - /login/login_edit_user_data.xhtml + user_change_email_address + /user/login_change_email_address.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 @@ -83,28 +116,25 @@ admin_export_user /admin/user/admin_user_export.xhtml - - - /user/login.xhtml - user_login - /login/login_index.xhtml + admin_list_countries + /admin/country/admin_country_list.xhtml - exception - /exception.xhtml + admin_list_contact + /admin/contact/admin_contact_list.xhtml - admin_list_user - /admin/user/admin_user_list.xhtml + admin_list_mobile_provider + /admin/mobile_provider/admin_mobile_provider_list.xhtml - admin_list_countries - /admin/country/admin_country_list.xhtml + admin_list_contact_fax + /admin/fax/admin_contact_fax_list.xhtml - admin_list_mobile_provider - /admin/mobile_provider/admin_mobile_provider_list.xhtml + admin_list_contact_landline + /admin/landline/admin_contact_landline_list.xhtml admin_list_contact_mobile @@ -112,56 +142,78 @@ - /guest/user/user_resend_link.xhtml + /user/login_index.xhtml - resend_done - /guest/user/user_resend_done.xhtml + user_change_password + /user/login_change_password.xhtml - /guest/user/user_register.xhtml + /guest/user/user_login.xhtml - register_done - /guest/user/user_register_done.xhtml + login_user + /user/login_index.xhtml + 1 + + + /guest/user/user_resend_link.xhtml - register_page2 - /guest/user/user_register_page2.xhtml + user_login + /login/login_index.xhtml + + + login_edit_user_data + /user/login_edit_user_data.xhtml + + + user_profile + /guest/user/user_profile.xhtml - /admin/admin_logout.xhtml + /guest/user/user_resend_link.xhtml - index - /index.xhtml + user_resend_done + /guest/user/user_resend_done.xhtml - /user/login_edit_user_data.xhtml + /guest/user/user_resend_link.xhtml - user_change_email_address - /user/login_user_change_email_address.xhtml + resend_done + /guest/user/user_resend_done.xhtml + + + /guest/user/user_register.xhtml - user_change_password - /user/login_user_change_password.xhtml + user_register_done + /guest/user/user_register_done.xhtml - user_change_personal_data - /user/login_user_change_personal_data.xhtml + user_register_page2 + /guest/user/user_register_page2.xhtml + + + + /guest/user/user_register_page2.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 @@ -172,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 @@ -210,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 @@ -249,12 +315,44 @@ admin_unlink_contact_mobile - /admin/mobile/admin_contact_mobile_unlink.xhtml + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml admin_delete_mobile /admin/mobile/admin_mobile_delete.xhtml + + admin_show_fax + /admin/fax/admin_fax_show.xhtml + + + admin_edit_fax + /admin/fax/admin_fax_edit.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 /admin/user/admin_user_edit.xhtml @@ -263,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 @@ -288,59 +402,271 @@ admin_edit_mobile - /admin/mobile/admin_contact_mobile_edit.xhtml + /admin/mobile/admin_mobile_edit.xhtml admin_delete_mobile - /admin/mobile/admin_contact_mobile_delete.xhtml + /admin/mobile/admin_mobile_delete.xhtml admin_unlink_contact_mobile - /admin/mobile/admin_contact_mobile_unlink.xhtml + /admin/contact/unlink/admin_contact_mobile_unlink.xhtml admin_show_mobile - /admin/mobile/admin_contact_mobile_show.xhtml + /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_contact_mobile_list.xhtml + /admin/mobile/admin_mobile_list.xhtml admin_show_mobile - /admin/mobile/admin_contact_mobile_show.xhtml + /admin/mobile/admin_mobile_show.xhtml admin_edit_mobile - /admin/mobile/admin_contact_mobile_edit.xhtml + /admin/mobile/admin_mobile_edit.xhtml admin_delete_mobile - /admin/mobile/admin_contact_mobile_delete.xhtml + /admin/mobile/admin_mobile_delete.xhtml - /admin/mobile/admin_contact_mobile_show.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_show_fax + /admin/fax/admin_fax_show.xhtml + + + + /admin/landline/admin_landline_edit.xhtml + + admin_show_landline + /admin/landline/admin_landline_show.xhtml + + + + /admin/mobile/admin_mobile_edit.xhtml + + admin_show_mobile + /admin/mobile/admin_mobile_show.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_delete_landline + /admin/landline/admin_landline_delete.xhtml + + + admin_unlink_contact_landline + /admin/contact/unlink/admin_contact_landline_unlink.xhtml + + + admin_show_contact + /admin/contact/admin_contact_show.xhtml + + + + /admin/mobile/admin_mobile_show.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml admin_edit_mobile - /admin/mobile/admin_contact_mobile_edit.xhtml + /admin/mobile/admin_mobile_edit.xhtml admin_delete_mobile - /admin/mobile/admin_contact_mobile_delete.xhtml + /admin/mobile/admin_mobile_delete.xhtml admin_unlink_contact_mobile - /admin/mobile/admin_contact_mobile_unlink.xhtml + /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 @@ -369,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 + +