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 b2ccac40723b6bdbcdf482385f68f91743736aef..e398341e0b211b1801a8e1098d3eec5ad453fb65 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -67,6 +67,18 @@
                        <from-outcome>user_profile</from-outcome>
                        <to-view-id>/user/user_profile.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_countries</from-outcome>
                        <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
@@ -91,16 +103,6 @@
                        <from-outcome>admin_export_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_export.xhtml</to-view-id>
                </navigation-case>
-       </navigation-rule>
-       <navigation-rule>
-               <navigation-case>
-                       <from-outcome>exception</from-outcome>
-                       <to-view-id>/exception.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>
-               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_countries</from-outcome>
                        <to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
@@ -109,21 +111,33 @@
                        <from-outcome>admin_list_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_list.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>
-               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_list_mobile_provider</from-outcome>
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_list_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
+                       <from-outcome>admin_list_contact_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_contact_fax_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_contact_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_contact_landline_list.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_list_contact_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_contact_mobile_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/login.xhtml</from-view-id>
+               <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>
+                       <redirect>1</redirect>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/user/resend_link.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login</from-outcome>
                        <to-view-id>/login/login_index.xhtml</to-view-id>
@@ -257,6 +271,13 @@
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
                <navigation-case>
@@ -271,6 +292,10 @@
                        <from-outcome>admin_delete_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_lock_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_unlock_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
@@ -283,20 +308,52 @@
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_show_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+                       <from-outcome>admin_show_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+                       <from-outcome>admin_edit_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_unlink_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+                       <from-outcome>admin_unlink_contact_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+                       <from-outcome>admin_delete_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_edit_user</from-outcome>
@@ -306,6 +363,10 @@
                        <from-outcome>admin_delete_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_lock_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_unlock_user</from-outcome>
                        <to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
@@ -330,55 +391,198 @@
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+                       <from-outcome>admin_edit_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+                       <from-outcome>admin_unlink_contact_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_unlink_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+                       <from-outcome>admin_show_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
                </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_fax_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_list.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_show.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_edit_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_fax_show.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_edit_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_show.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_show_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+                       <from-outcome>admin_edit_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_landline_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_landline</from-outcome>
+                       <to-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
+               <from-view-id>/admin/mobile/admin_mobile_show.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_show_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+                       <from-outcome>admin_edit_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+                       <from-outcome>admin_delete_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_delete.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</from-view-id>
+               <from-view-id>/admin/user/admin_user_lock.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_mobile_provider</from-outcome>
                        <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/user/admin_user_unlock.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+                       <from-outcome>admin_show_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
+                       <from-outcome>admin_show_mobile_provider</from-outcome>
+                       <to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
                </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_unlink_contact_cellphone</from-outcome>
-                       <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_contact_landline_unlink.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_contact_mobile_unlink.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>admin_show_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>