From 4538f38e35e68f5752a45b6db773108e53d6078f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 5 May 2016 16:06:36 +0200
Subject: [PATCH] re-organized pages: - moved /user/ -> /guest/user/ as these
 are pages for current guest but later users - moved /login/ -> /user/ as
 these are pages for current (logged-in) users

---
 nbproject/faces-config.NavData                | 16 ++---
 web/WEB-INF/faces-config.xml                  | 62 +++++++++----------
 web/{ => guest}/user/login.xhtml              |  0
 web/{ => guest}/user/login_error.xhtml        |  0
 web/{ => guest}/user/lost_passwd.xhtml        |  0
 web/{ => guest}/user/register.xhtml           |  0
 web/{ => guest}/user/register_done.xhtml      |  0
 web/{ => guest}/user/resend_link.xhtml        |  0
 web/{ => guest}/user/show_addressbook.xhtml   |  0
 .../user/show_addressbook_entries.xhtml       |  0
 web/{ => guest}/user/user_list.xhtml          |  0
 web/{ => guest}/user/user_profile.xhtml       |  0
 web/{login => user}/index.xhtml               |  0
 .../login_add_addressbook.xhtml               |  0
 .../login_change_email_address.xhtml          |  0
 .../login_change_password.xhtml               |  0
 .../login_change_personal_data.xhtml          |  0
 .../login_contact_data_saved.xhtml            |  0
 web/{login => user}/login_data_saved.xhtml    |  0
 .../login_edit_user_data.xhtml                |  0
 web/{login => user}/login_index.xhtml         |  0
 .../login_list_sharing_addressbooks.xhtml     |  0
 .../login_other_addressbooks.xhtml            |  0
 .../login_own_addressbooks.xhtml              |  0
 .../login_shared_addressbooks.xhtml           |  0
 .../login_start_sharing_addressbook.xhtml     |  0
 .../login_user_data_saved.xhtml               |  0
 27 files changed, 37 insertions(+), 41 deletions(-)
 rename web/{ => guest}/user/login.xhtml (100%)
 rename web/{ => guest}/user/login_error.xhtml (100%)
 rename web/{ => guest}/user/lost_passwd.xhtml (100%)
 rename web/{ => guest}/user/register.xhtml (100%)
 rename web/{ => guest}/user/register_done.xhtml (100%)
 rename web/{ => guest}/user/resend_link.xhtml (100%)
 rename web/{ => guest}/user/show_addressbook.xhtml (100%)
 rename web/{ => guest}/user/show_addressbook_entries.xhtml (100%)
 rename web/{ => guest}/user/user_list.xhtml (100%)
 rename web/{ => guest}/user/user_profile.xhtml (100%)
 rename web/{login => user}/index.xhtml (100%)
 rename web/{login => user}/login_add_addressbook.xhtml (100%)
 rename web/{login => user}/login_change_email_address.xhtml (100%)
 rename web/{login => user}/login_change_password.xhtml (100%)
 rename web/{login => user}/login_change_personal_data.xhtml (100%)
 rename web/{login => user}/login_contact_data_saved.xhtml (100%)
 rename web/{login => user}/login_data_saved.xhtml (100%)
 rename web/{login => user}/login_edit_user_data.xhtml (100%)
 rename web/{login => user}/login_index.xhtml (100%)
 rename web/{login => user}/login_list_sharing_addressbooks.xhtml (100%)
 rename web/{login => user}/login_other_addressbooks.xhtml (100%)
 rename web/{login => user}/login_own_addressbooks.xhtml (100%)
 rename web/{login => user}/login_shared_addressbooks.xhtml (100%)
 rename web/{login => user}/login_start_sharing_addressbook.xhtml (100%)
 rename web/{login => user}/login_user_data_saved.xhtml (100%)

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 50c026e6..60dd8052 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -17,23 +17,22 @@
         <Node id="user/register_done.xhtml" x="400" y="600" zoom="true"/>
         <Node id="*" x="1900" y="300" zoom="true"/>
         <Node id="admin/admin_category_delete.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="1150" y="600" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="650" y="600" zoom="true"/>
         <Node id="user/show_addressbook_entries.xhtml" x="1900" y="450" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="150" y="1500" zoom="true"/>
         <Node id="user/login.xhtml" x="400" y="1050" zoom="true"/>
         <Node id="login/login_list_sharing_addressbooks.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="900" y="300" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="450" zoom="true"/>
         <Node id="login/login_contact_data_saved.xhtml" x="400" y="1200" zoom="true"/>
         <Node id="admin/country/admin_country_list.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="900" y="300" zoom="true"/>
         <Node id="login/login_shared_addressbooks.xhtml" x="400" y="750" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="300" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1150" y="750" zoom="true"/>
         <Node id="basket.xhtml" x="150" y="900" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="exception.xhtml" x="900" y="600" zoom="true"/>
         <Node id="login/login_data_saved.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="exception.xhtml" x="900" y="600" zoom="true"/>
         <Node id="admin/user/admin_user_delete.xhtml" x="2150" y="150" zoom="true"/>
         <Node id="user/register.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="login/login_index.xhtml" x="150" y="1350" zoom="true"/>
@@ -41,21 +40,18 @@
         <Node id="login/login_own_addressbooks.xhtml" x="900" y="750" zoom="true"/>
         <Node id="admin/user/admin_user_edit.xhtml" x="1900" y="150" zoom="true"/>
         <Node id="terms.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
         <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
         <Node id="admin/user/admin_user_list.xhtml" x="1650" y="600" zoom="true"/>
         <Node id="admin/country/admin_country_delete.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="user/user_list.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="150" zoom="true"/>
         <Node id="logout.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="650" y="150" zoom="true"/>
         <Node id="admin/contact/admin_contact_delete.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="imprint.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="user/show_addressbook.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="imprint.xhtml" x="400" y="450" zoom="true"/>
         <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="150" y="450" zoom="true"/>
         <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="150" zoom="true"/>
         <Node id="admin/admin_product_delete.xhtml" x="1400" y="600" zoom="true"/>
         <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index a8d5b23b..2da1c597 100644
--- 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>
@@ -49,15 +49,15 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_index</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>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>admin_logout</from-outcome>
@@ -89,21 +89,21 @@
 		</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_index</from-outcome>
-			<to-view-id>/login/index.xhtml</to-view-id>
+			<to-view-id>/user/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/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-rule>
 	<navigation-rule>
@@ -114,68 +114,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>
+			<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>
+			<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>
+			<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>
+			<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>
@@ -183,10 +183,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>
diff --git a/web/user/login.xhtml b/web/guest/user/login.xhtml
similarity index 100%
rename from web/user/login.xhtml
rename to web/guest/user/login.xhtml
diff --git a/web/user/login_error.xhtml b/web/guest/user/login_error.xhtml
similarity index 100%
rename from web/user/login_error.xhtml
rename to web/guest/user/login_error.xhtml
diff --git a/web/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
similarity index 100%
rename from web/user/lost_passwd.xhtml
rename to web/guest/user/lost_passwd.xhtml
diff --git a/web/user/register.xhtml b/web/guest/user/register.xhtml
similarity index 100%
rename from web/user/register.xhtml
rename to web/guest/user/register.xhtml
diff --git a/web/user/register_done.xhtml b/web/guest/user/register_done.xhtml
similarity index 100%
rename from web/user/register_done.xhtml
rename to web/guest/user/register_done.xhtml
diff --git a/web/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
similarity index 100%
rename from web/user/resend_link.xhtml
rename to web/guest/user/resend_link.xhtml
diff --git a/web/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml
similarity index 100%
rename from web/user/show_addressbook.xhtml
rename to web/guest/user/show_addressbook.xhtml
diff --git a/web/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml
similarity index 100%
rename from web/user/show_addressbook_entries.xhtml
rename to web/guest/user/show_addressbook_entries.xhtml
diff --git a/web/user/user_list.xhtml b/web/guest/user/user_list.xhtml
similarity index 100%
rename from web/user/user_list.xhtml
rename to web/guest/user/user_list.xhtml
diff --git a/web/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
similarity index 100%
rename from web/user/user_profile.xhtml
rename to web/guest/user/user_profile.xhtml
diff --git a/web/login/index.xhtml b/web/user/index.xhtml
similarity index 100%
rename from web/login/index.xhtml
rename to web/user/index.xhtml
diff --git a/web/login/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
similarity index 100%
rename from web/login/login_add_addressbook.xhtml
rename to web/user/login_add_addressbook.xhtml
diff --git a/web/login/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
similarity index 100%
rename from web/login/login_change_email_address.xhtml
rename to web/user/login_change_email_address.xhtml
diff --git a/web/login/login_change_password.xhtml b/web/user/login_change_password.xhtml
similarity index 100%
rename from web/login/login_change_password.xhtml
rename to web/user/login_change_password.xhtml
diff --git a/web/login/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
similarity index 100%
rename from web/login/login_change_personal_data.xhtml
rename to web/user/login_change_personal_data.xhtml
diff --git a/web/login/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
similarity index 100%
rename from web/login/login_contact_data_saved.xhtml
rename to web/user/login_contact_data_saved.xhtml
diff --git a/web/login/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
similarity index 100%
rename from web/login/login_data_saved.xhtml
rename to web/user/login_data_saved.xhtml
diff --git a/web/login/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
similarity index 100%
rename from web/login/login_edit_user_data.xhtml
rename to web/user/login_edit_user_data.xhtml
diff --git a/web/login/login_index.xhtml b/web/user/login_index.xhtml
similarity index 100%
rename from web/login/login_index.xhtml
rename to web/user/login_index.xhtml
diff --git a/web/login/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml
similarity index 100%
rename from web/login/login_list_sharing_addressbooks.xhtml
rename to web/user/login_list_sharing_addressbooks.xhtml
diff --git a/web/login/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml
similarity index 100%
rename from web/login/login_other_addressbooks.xhtml
rename to web/user/login_other_addressbooks.xhtml
diff --git a/web/login/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
similarity index 100%
rename from web/login/login_own_addressbooks.xhtml
rename to web/user/login_own_addressbooks.xhtml
diff --git a/web/login/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml
similarity index 100%
rename from web/login/login_shared_addressbooks.xhtml
rename to web/user/login_shared_addressbooks.xhtml
diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml
similarity index 100%
rename from web/login/login_start_sharing_addressbook.xhtml
rename to web/user/login_start_sharing_addressbook.xhtml
diff --git a/web/login/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
similarity index 100%
rename from web/login/login_user_data_saved.xhtml
rename to web/user/login_user_data_saved.xhtml
-- 
2.39.5