Continued:

[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 ab8b7f848533a6546ac20c3d56a1733c94255013..7bf7a25010e32e55e59275ed53f942bc0d554a83 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -47,22 +47,60 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_index</from-outcome>
-                       <to-view-id>/admin/index.xhtml</to-view-id>
-               </navigation-case>
-           <navigation-case>
-               <from-outcome>login_index</from-outcome>
-               <to-view-id>/login/index.xhtml</to-view-id>
-           </navigation-case>
-           <navigation-case>
-               <from-outcome>resend_link</from-outcome>
-               <to-view-id>/user/resend_link.xhtml</to-view-id>
-           </navigation-case>
+                       <to-view-id>/admin/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>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>resend_link</from-outcome>
+                       <to-view-id>/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>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_other_addressbooks</from-outcome>
+                       <to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_user_list</from-outcome>
+                       <to-view-id>/login/login_user_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>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>login_edit_address</from-outcome>
+                       <to-view-id>/login/login_edit_address.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-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-rule>
+       <navigation-rule>
+               <from-view-id>/user/register.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>register_done</from-outcome>
+                       <to-view-id>/user/register_done.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/admin_logout.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>index</from-outcome>
-                       <to-view-id>/*</to-view-id>
+                       <to-view-id>/index.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <application>
@@ -71,11 +109,4 @@
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
-    <navigation-rule>
-        <from-view-id>/user/login.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>login</from-outcome>
-            <to-view-id>/login/index.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
 </faces-config>