X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ffaces-config.xml;h=7bf7a25010e32e55e59275ed53f942bc0d554a83;hb=3ff12cb1730d035123669b8674c8ae56a60d02c0;hp=92ee7866b16f4b28703db7c0f6ac8c93adc51142;hpb=d7e7bea37d8e397ece12be6b88f47ae014333c78;p=addressbook-war.git

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 92ee7866..7bf7a250 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -13,22 +13,22 @@
 	</validator>
 	<navigation-rule>
 		<from-view-id>*</from-view-id>
-		<navigation-case>
-			<from-outcome>user_register</from-outcome>
-			<to-view-id>/user/register.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>index</from-outcome>
 			<to-view-id>/index.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>
+			<from-outcome>user_register</from-outcome>
+			<to-view-id>/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>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>user_lost_passwd</from-outcome>
+			<to-view-id>/user/lost_passwd.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>terms</from-outcome>
 			<to-view-id>/terms.xhtml</to-view-id>
@@ -46,23 +46,61 @@
 			<to-view-id>/bye.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_product</from-outcome>
-			<to-view-id>/admin/product.xhtml</to-view-id>
+			<from-outcome>admin_index</from-outcome>
+			<to-view-id>/admin/admin_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_category</from-outcome>
-			<to-view-id>/admin/category.xhtml</to-view-id>
+			<from-outcome>login_index</from-outcome>
+			<to-view-id>/login/login_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>admin_index</from-outcome>
-			<to-view-id>/admin/index.xhtml</to-view-id>
+			<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>