From 8239d07593a0ca0ebc60aa64f6d343721c66f4c6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 30 Aug 2016 17:11:12 +0200
Subject: [PATCH] Please cherry-pick: - moved to new location + updated
 faces-config.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/WEB-INF/faces-config.xml                  | 32 +++++++++----------
 ...count.xhtml => user_confirm_account.xhtml} |  0
 .../user/{login.xhtml => user_login.xhtml}    |  0
 ...gin_error.xhtml => user_login_error.xhtml} |  0
 ...st_passwd.xhtml => user_lost_passwd.xhtml} |  0
 .../{register.xhtml => user_register.xhtml}   |  0
 ...er_done.xhtml => user_register_done.xhtml} |  0
 ..._page2.xhtml => user_register_page2.xhtml} |  0
 ...send_done.xhtml => user_resend_done.xhtml} |  0
 ...send_link.xhtml => user_resend_link.xhtml} |  0
 10 files changed, 16 insertions(+), 16 deletions(-)
 rename web/guest/user/{confirm_account.xhtml => user_confirm_account.xhtml} (100%)
 rename web/guest/user/{login.xhtml => user_login.xhtml} (100%)
 rename web/guest/user/{login_error.xhtml => user_login_error.xhtml} (100%)
 rename web/guest/user/{lost_passwd.xhtml => user_lost_passwd.xhtml} (100%)
 rename web/guest/user/{register.xhtml => user_register.xhtml} (100%)
 rename web/guest/user/{register_done.xhtml => user_register_done.xhtml} (100%)
 rename web/guest/user/{register_page2.xhtml => user_register_page2.xhtml} (100%)
 rename web/guest/user/{resend_done.xhtml => user_resend_done.xhtml} (100%)
 rename web/guest/user/{resend_link.xhtml => user_resend_link.xhtml} (100%)

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index ee336973..21738b76 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -26,15 +26,15 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_register</from-outcome>
-			<to-view-id>/guest/user/register.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_register.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_login</from-outcome>
-			<to-view-id>/guest/user/login.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_login.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_lost_passwd</from-outcome>
-			<to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_lost_passwd.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>terms</from-outcome>
@@ -62,7 +62,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_resend_link</from-outcome>
-			<to-view-id>/guest/user/resend_link.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_resend_link.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_change_email_address</from-outcome>
@@ -149,7 +149,7 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_login.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>user_login</from-outcome>
 			<to-view-id>/user/login_index.xhtml</to-view-id>
@@ -183,10 +183,10 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>user_user</from-outcome>
-			<to-view-id>/user/login_index.xhtml</to-view-id>
+			<from-outcome>resend_done</from-outcome>
+			<to-view-id>/guest/user/user_resend_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -197,28 +197,28 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/guest/user/register.xhtml</from-view-id>
+		<from-view-id>/guest/user/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>
+			<to-view-id>/guest/user/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>
+			<to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_logout.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>index</from-outcome>
-			<to-view-id>/index.xhtml</to-view-id>
+			<from-outcome>register_done</from-outcome>
+			<to-view-id>/guest/user/user_register_done.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>
+			<from-outcome>register_page2</from-outcome>
+			<to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
similarity index 100%
rename from web/guest/user/confirm_account.xhtml
rename to web/guest/user/user_confirm_account.xhtml
diff --git a/web/guest/user/login.xhtml b/web/guest/user/user_login.xhtml
similarity index 100%
rename from web/guest/user/login.xhtml
rename to web/guest/user/user_login.xhtml
diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/user_login_error.xhtml
similarity index 100%
rename from web/guest/user/login_error.xhtml
rename to web/guest/user/user_login_error.xhtml
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/user_lost_passwd.xhtml
similarity index 100%
rename from web/guest/user/lost_passwd.xhtml
rename to web/guest/user/user_lost_passwd.xhtml
diff --git a/web/guest/user/register.xhtml b/web/guest/user/user_register.xhtml
similarity index 100%
rename from web/guest/user/register.xhtml
rename to web/guest/user/user_register.xhtml
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/user_register_done.xhtml
similarity index 100%
rename from web/guest/user/register_done.xhtml
rename to web/guest/user/user_register_done.xhtml
diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
similarity index 100%
rename from web/guest/user/register_page2.xhtml
rename to web/guest/user/user_register_page2.xhtml
diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/user_resend_done.xhtml
similarity index 100%
rename from web/guest/user/resend_done.xhtml
rename to web/guest/user/user_resend_done.xhtml
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
similarity index 100%
rename from web/guest/user/resend_link.xhtml
rename to web/guest/user/user_resend_link.xhtml
-- 
2.39.5