updated source references, how does '/src/' come in everywhere?

[addressbook-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 cd30a0069b43a9c6c74a5e23a63df007261c0823..f5aaab2f8f6f6cca8b753d264aa936e6c4e0c39d 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -17,15 +17,15 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_register</from-outcome>
-                       <to-view-id>/user/register.xhtml</to-view-id>
+                       <to-view-id>/guest/user/register.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_login</from-outcome>
-                       <to-view-id>/user/login.xhtml</to-view-id>
+                       <to-view-id>/guest/user/login.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_lost_passwd</from-outcome>
-                       <to-view-id>/user/lost_passwd.xhtml</to-view-id>
+                       <to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>terms</from-outcome>
@@ -48,24 +48,55 @@
                        <to-view-id>/admin/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_index</from-outcome>
-                       <to-view-id>/login/login_index.xhtml</to-view-id>
+                       <from-outcome>user_index</from-outcome>
+                       <to-view-id>/user/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>user_resend_link</from-outcome>
-                       <to-view-id>/user/resend_link.xhtml</to-view-id>
+                       <to-view-id>/guest/user/resend_link.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_own_addressbooks</from-outcome>
-                       <to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
+                       <to-view-id>/user/login_own_addressbooks.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>
+               </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>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_logout</from-outcome>
-                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
+                       <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>basket</from-outcome>
-                       <to-view-id>/basket.xhtml</to-view-id>
+                       <from-outcome>login</from-outcome>
+                       <to-view-id>/login/login_index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>exception</from-outcome>
@@ -89,17 +120,32 @@
                </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>/login/login_index.xhtml</to-view-id>
+                       <to-view-id>/user/login_index.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>/user/register.xhtml</from-view-id>
+               <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>/user/register_done.xhtml</to-view-id>
+                       <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>
@@ -110,68 +156,68 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_own_addressbooks.xhtml</from-view-id>
+               <from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login_add_addressbook</from-outcome>
-                       <to-view-id>/login/login_add_addressbook.xhtml</to-view-id>
+                       <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>/user/show_addressbook.xhtml</to-view-id>
+                       <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>/user/show_addressbook_entries.xhtml</to-view-id>
+                       <to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/user_list.xhtml</from-view-id>
+               <from-view-id>/guest/user/user_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_list_sharing_addressbooks</from-outcome>
-                       <to-view-id>/login/login_list_sharing_addressbooks.xhtml</to-view-id>
+                       <to-view-id>/user/login_list_sharing_addressbooks.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/user/show_addressbook.xhtml</from-view-id>
+               <from-view-id>/guest/user/show_addressbook.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_start_sharing_addressbook</from-outcome>
-                       <to-view-id>/login/login_start_sharing_addressbook.xhtml</to-view-id>
+                       <to-view-id>/user/login_start_sharing_addressbook.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_shared_addressbooks.xhtml</from-view-id>
+               <from-view-id>/user/login_shared_addressbooks.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_show_addressbook</from-outcome>
-                       <to-view-id>/user/show_addressbook.xhtml</to-view-id>
+                       <to-view-id>/guest/user/show_addressbook.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_edit_user_data.xhtml</from-view-id>
+               <from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login_change_email_address</from-outcome>
-                       <to-view-id>/login/login_change_email_address.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>login_change_password</from-outcome>
-                       <to-view-id>/login/login_change_password.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>login_change_personal_data</from-outcome>
-                       <to-view-id>/login/login_change_personal_data.xhtml</to-view-id>
+                       <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>/login/login_change_password.xhtml</from-view-id>
+               <from-view-id>/user/login_change_password.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_data_saved</from-outcome>
-                       <to-view-id>/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>/login/login_change_email_address.xhtml</from-view-id>
+               <from-view-id>/user/login_change_email_address.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>
@@ -179,10 +225,10 @@
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_change_personal_data.xhtml</from-view-id>
+               <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_data_saved</from-outcome>
-                       <to-view-id>/login/login_data_saved.xhtml</to-view-id>
+                       <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_delete_category</from-outcome>
@@ -199,6 +245,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>
@@ -229,6 +279,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>
@@ -241,20 +295,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>
@@ -288,11 +342,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>
@@ -300,22 +354,22 @@
                        <to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
                </navigation-case>
                <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-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>
@@ -326,11 +380,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>
@@ -342,6 +396,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>
@@ -349,6 +410,20 @@
                        <to-view-id>/admin/contact/admin_contact_list.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>