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 ee336973e6d805980e6b9977c752d608ac63e4de..e640f6a73608e10464b40693b65a74e6ed906aad 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -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>
+                       <to-view-id>/guest/user/user_lost_passwd.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>terms</from-outcome>
@@ -62,7 +62,7 @@
                </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>user_change_email_address</from-outcome>
@@ -149,9 +149,9 @@
                </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>
@@ -183,10 +183,10 @@
                </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>
@@ -197,41 +197,41 @@
                </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>
+                       <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>/admin/admin_logout.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>index</from-outcome>
-                       <to-view-id>/index.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_own_addressbooks.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_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_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>
@@ -240,14 +240,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>
@@ -260,6 +256,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>