Continued a bit:

[pizzaservice-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 19e70b19da39f805c42c88c67ff36c4e708cc9f7..dc93c86fcd82529f9e60606a59718676f08cbf60 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -20,7 +20,7 @@
                        <to-view-id>/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>customer_lost_passwd</from-outcome>
+                       <from-outcome>user_lost_passwd</from-outcome>
                        <to-view-id>/customer/lost_passwd.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -47,6 +47,10 @@
                        <from-outcome>admin_product</from-outcome>
                        <to-view-id>/admin/product/admin_product_list.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_index</from-outcome>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
+               </navigation-case>
                <navigation-case>
                        <from-outcome>admin_category</from-outcome>
                        <to-view-id>/admin/category/admin_category_list.xhtml</to-view-id>
@@ -56,12 +60,43 @@
                        <to-view-id>/admin/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_logout</from-outcome>
-                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
+                       <from-outcome>login_edit_user_data</from-outcome>
+                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_profile</from-outcome>
+                       <to-view-id>/user/user_profile.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>
+               </navigation-case>
+               <navigation-case>
+                       <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>basket</from-outcome>
-                       <to-view-id>/basket.xhtml</to-view-id>
+                       <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_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_export_user</from-outcome>
+                       <to-view-id>/admin/user/admin_user_export.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/login.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>login</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>exception</from-outcome>
@@ -91,9 +126,53 @@
                        <from-outcome>admin_list_customer</from-outcome>
                        <to-view-id>/admin/customer/admin_customer_list.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_user</from-outcome>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/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>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/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>
+               </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>/basket.xhtml</from-view-id>
+               <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>
+               </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>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>user_show_addressbook</from-outcome>
+                       <to-view-id>/guest/user/show_addressbook.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>show_addressbook_entries</from-outcome>
+                       <to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/guest/user/user_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>checkout</from-outcome>
                        <to-view-id>/customer/checkout.xhtml</to-view-id>
@@ -114,14 +193,18 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/customer/checkout2.xhtml</from-view-id>
+               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>checkout_done</from-outcome>
-                       <to-view-id>/customer/checkout_done.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>empty_basket</from-outcome>
-                       <to-view-id>/customer/empty_basket.xhtml</to-view-id>
+                       <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>
@@ -135,7 +218,7 @@
                <from-view-id>/admin/product/admin_product_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>contact_data_saved</from-outcome>
-                       <to-view-id>/login/login_contact_data_saved.xhtml</to-view-id>
+                       <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_product</from-outcome>
@@ -163,6 +246,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>
@@ -193,6 +280,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>
@@ -205,20 +296,20 @@
                        <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_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_cellphone_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_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_cellphone_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>
                </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_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_cellphone_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_edit_user</from-outcome>
@@ -286,19 +377,39 @@
                        <from-outcome>admin_delete_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_delete.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-case>
+                       <from-outcome>admin_edit_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_delete_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.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>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_cellphone</from-outcome>
+                       <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>admin_show_contact_cellphone</from-outcome>
+                       <from-outcome>admin_show_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_edit_contact_cellphone</from-outcome>
+                       <from-outcome>admin_edit_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
+                       <from-outcome>admin_delete_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
@@ -309,11 +420,11 @@
                        <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>
+                       <from-outcome>admin_edit_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_delete_contact_cellphone</from-outcome>
+                       <from-outcome>admin_delete_cellphone</from-outcome>
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -325,6 +436,13 @@
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/contact/admin_contact_list.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/contact/admin_contact_edit.xhtml</from-view-id>
                <navigation-case>
@@ -381,6 +499,20 @@
                        <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/contact/admin_contact_export.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/user/admin_user_export.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-rule>
        <!--
        <factory>
                <exception-handler-factory>