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 9375fd1da880c85196c6236c7956e491d0adbd2e..689302fd07167625eaf3bb95fbdf77e6abec1696 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -9,6 +9,11 @@
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
+       <!--
+       <lifecycle>
+               <phase-listener>de.chotime.landingpage.debug.LandingDebugLifeCycleListener</phase-listener>
+       </lifecycle>
+       //-->
        <navigation-rule>
                <from-view-id>*</from-view-id>
                <navigation-case>
@@ -103,16 +108,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>
@@ -121,10 +116,6 @@
                        <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>
@@ -143,7 +134,15 @@
                </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>
@@ -323,12 +322,44 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/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_fax</from-outcome>
+                       <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_unlink_contact_fax</from-outcome>
+                       <to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.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_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/contact/unlink/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>
                        <to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
@@ -364,6 +395,22 @@
                        <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_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_unlink_contact_mobile</from-outcome>
+                       <to-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</to-view-id>
+               </navigation-case>
+               <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_fax</from-outcome>
                        <to-view-id>/admin/fax/admin_fax_edit.xhtml</to-view-id>
@@ -374,7 +421,7 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_fax</from-outcome>
@@ -390,27 +437,15 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/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_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_mobile</from-outcome>
-                       <to-view-id>/admin/mobile/admin_mobile_show.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>
@@ -458,6 +493,60 @@
                        <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_delete.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_fax_provider</from-outcome>
+                       <to-view-id>/admin/fax_provider/admin_fax_provider_show.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-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_delete.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>admin_show_landline_provider</from-outcome>
+                       <to-view-id>/admin/landline_provider/admin_landline_provider_show.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-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_delete.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-case>
+                       <from-outcome>admin_list_mobile</from-outcome>
+                       <to-view-id>/admin/mobile/admin_mobile_list.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/fax/admin_fax_edit.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-rule>
+       <navigation-rule>
+               <from-view-id>/admin/landline/admin_landline_edit.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-rule>
+       <navigation-rule>
+               <from-view-id>/admin/mobile/admin_mobile_edit.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-rule>
        <navigation-rule>
                <from-view-id>/admin/fax/admin_fax_show.xhtml</from-view-id>
                <navigation-case>
@@ -470,7 +559,7 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/admin_contact_fax_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_contact</from-outcome>
@@ -489,7 +578,7 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/admin_contact_landline_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_contact</from-outcome>
@@ -512,7 +601,7 @@
                </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>
+                       <to-view-id>/admin/contact/unlink/admin_contact_mobile_unlink.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_show_contact</from-outcome>
@@ -542,25 +631,29 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/admin/fax/admin_contact_fax_unlink.xhtml</from-view-id>
+               <from-view-id>/admin/contact/unlink/admin_contact_fax_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/landline/admin_contact_landline_unlink.xhtml</from-view-id>
+               <from-view-id>/admin/contact/unlink/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>
+               <from-view-id>/admin/contact/unlink/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>
                </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/contact/admin_contact_list.xhtml</from-view-id>