Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / faces-config.xml

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index e01217a23aedf3860ef0aa50b64c1237c70346b8..e8e7be87685afd1101d6a3726a9b73dacc4b565b 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -11,7 +11,7 @@
        </application>
        <!--
        <lifecycle>
-               <phase-listener>de.chotime.landingpage.debug.LandingDebugLifeCycleListener</phase-listener>
+               <phase-listener>org.mxchange.jjobs.debug.JobsDebugLifeCycleListener</phase-listener>
        </lifecycle>
        //-->
        <navigation-rule>
@@ -26,15 +26,15 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_register</from-outcome>
-                       <to-view-id>/guest/user/register.xhtml</to-view-id>
+                       <to-view-id>/guest/user/user_register.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_login</from-outcome>
-                       <to-view-id>/guest/user/login.xhtml</to-view-id>
+                       <to-view-id>/guest/user/user_login.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>user_lost_passwd</from-outcome>
-                       <to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
+                       <from-outcome>user_lost_password</from-outcome>
+                       <to-view-id>/guest/user/user_lost_password.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>terms</from-outcome>
@@ -52,6 +52,10 @@
                        <from-outcome>logout</from-outcome>
                        <to-view-id>/logout.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>admin_index</from-outcome>
                        <to-view-id>/admin/index.xhtml</to-view-id>
@@ -62,11 +66,19 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_resend_link</from-outcome>
-                       <to-view-id>/guest/user/resend_link.xhtml</to-view-id>
+                       <to-view-id>/guest/user/user_resend_link.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>
+                       <from-outcome>user_change_email_address</from-outcome>
+                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_change_password</from-outcome>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_change_personal_data</from-outcome>
+                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_profile</from-outcome>
@@ -96,6 +108,14 @@
                        <from-outcome>admin_export_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_export.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_business_contacts</from-outcome>
+                       <to-view-id>/admin/business_contacts/admin_business_contacts_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_export_business_contacts</from-outcome>
+                       <to-view-id>/admin/business_contacts/admin_business_contacts_export.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
@@ -137,21 +157,21 @@
                <from-view-id>/user/login_index.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_change_password</from-outcome>
-                       <to-view-id>/user/login_change_password</to-view-id>
+                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/guest/user/login.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_login.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>user_login</from-outcome>
+                       <from-outcome>login_user</from-outcome>
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                        <redirect>1</redirect>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login</from-outcome>
+                       <from-outcome>user_login</from-outcome>
                        <to-view-id>/login/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -164,81 +184,48 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/guest/user/login.xhtml</from-view-id>
-               <navigation-case>
-                       <from-outcome>login</from-outcome>
-                       <to-view-id>/user/login_index.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_add_user</from-outcome>
-                       <to-view-id>/admin/admin_user_add.xhtml</to-view-id>
-               </navigation-case>
-       </navigation-rule>
-       <navigation-rule>
-               <from-view-id>/guest/user/login.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>user_user</from-outcome>
-                       <to-view-id>/user/login_index.xhtml</to-view-id>
+                       <from-outcome>user_resend_done</from-outcome>
+                       <to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/guest/user/resend_link.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>resend_done</from-outcome>
-                       <to-view-id>/guest/user/resend_done.xhtml</to-view-id>
+                       <to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/guest/user/register.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_register.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>register_done</from-outcome>
-                       <to-view-id>/guest/user/register_done.xhtml</to-view-id>
+                       <from-outcome>user_register_done</from-outcome>
+                       <to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>register_page2</from-outcome>
-                       <to-view-id>/guest/user/register_page2.xhtml</to-view-id>
-               </navigation-case>
-       </navigation-rule>
-       <navigation-rule>
-               <from-view-id>/admin/admin_logout.xhtml</from-view-id>
-               <navigation-case>
-                       <from-outcome>index</from-outcome>
-                       <to-view-id>/index.xhtml</to-view-id>
+                       <from-outcome>user_register_page2</from-outcome>
+                       <to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>user_add_addressbook</from-outcome>
-                       <to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
+                       <from-outcome>user_register_done</from-outcome>
+                       <to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
-               <navigation-case>
-                       <from-outcome>user_change_email_address</from-outcome>
-                       <to-view-id>/user/login_change_email_address.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>user_change_password</from-outcome>
-                       <to-view-id>/user/login_change_password.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>user_change_personal_data</from-outcome>
-                       <to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
-               </navigation-case>
-       </navigation-rule>
-       <navigation-rule>
-               <from-view-id>/user/login_change_password.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_password.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
-                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
+                       <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_email_address.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_email_address.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>contact_data_saved</from-outcome>
+                       <from-outcome>user_contact_data_saved</from-outcome>
                        <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -247,14 +234,10 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
+               <from-view-id>/user/login_user_change_personal_data.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>contact_data_saved</from-outcome>
-                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_delete_category</from-outcome>
-                       <to-view-id>/admin/admin_category_delete.xhtml</to-view-id>
+                       <from-outcome>user_data_saved</from-outcome>
+                       <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
@@ -267,6 +250,10 @@
                        <from-outcome>admin_delete_country</from-outcome>
                        <to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_country</from-outcome>
+                       <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>