X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2FWEB-INF%2Ffaces-config.xml;h=7754be67a0bf663304a5189dd0f22329d894d0a4;hb=f32b2b12df0a19f1fd120c83a849ff40863b66c4;hp=c495ccde9890cea773ca1bcae626307710e956bf;hpb=b895ad17802bb45b11595b69b979c7c51161b2b2;p=pizzaservice-war.git

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index c495ccde..7754be67 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -9,18 +9,6 @@
 			<supported-locale>en_US</supported-locale>
 		</locale-config>
 	</application>
-	<validator>
-		<validator-id>PrivacyTermsCheckboxValidator</validator-id>
-		<validator-class>org.mxchange.jcoreee.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>NameValidator</validator-id>
-		<validator-class>org.mxchange.jcoreee.validator.string.names.NameValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>ItemAmountValidator</validator-id>
-		<validator-class>org.mxchange.jcoreee.validator.number.item_amount.ItemAmountValidator</validator-class>
-	</validator>
 	<navigation-rule>
 		<from-view-id>*</from-view-id>
 		<navigation-case>
@@ -32,7 +20,7 @@
 			<to-view-id>/index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
-			<from-outcome>customer_lost_passwd</from-outcome>
+			<from-outcome>user_lost_passwd</from-outcome>
 			<to-view-id>/customer/lost_passwd.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
@@ -59,6 +47,10 @@
 			<from-outcome>admin_product</from-outcome>
 			<to-view-id>/admin/product/admin_product_list.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>user_index</from-outcome>
+			<to-view-id>/user/login_index.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_category</from-outcome>
 			<to-view-id>/admin/category/admin_category_list.xhtml</to-view-id>
@@ -67,6 +59,10 @@
 			<from-outcome>admin_index</from-outcome>
 			<to-view-id>/admin/index.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>basket</from-outcome>
 			<to-view-id>/basket.xhtml</to-view-id>
@@ -77,23 +73,68 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
-			<to-view-id>/admin/admin_user_list.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_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_list_countries</from-outcome>
-			<to-view-id>/admin/admin_country_list.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_list.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_list.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_list_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_list.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>/guest/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>
+		</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>
+		<from-view-id>/admin/admin_logout.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>index</from-outcome>
+			<to-view-id>/index.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>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>user_show_addressbook</from-outcome>
+			<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>/guest/user/show_addressbook_entries.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/basket.xhtml</from-view-id>
+		<from-view-id>/guest/user/user_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>checkout</from-outcome>
 			<to-view-id>/customer/checkout.xhtml</to-view-id>
@@ -114,14 +155,18 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/customer/checkout2.xhtml</from-view-id>
+		<from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>checkout_done</from-outcome>
-			<to-view-id>/customer/checkout_done.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>empty_basket</from-outcome>
-			<to-view-id>/customer/empty_basket.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>user_change_personal_data</from-outcome>
+			<to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -134,8 +179,8 @@
 	<navigation-rule>
 		<from-view-id>/admin/product/admin_product_list.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>admin_edit_product</from-outcome>
-			<to-view-id>/admin/product/admin_product_edit.xhtml</to-view-id>
+			<from-outcome>contact_data_saved</from-outcome>
+			<to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_product</from-outcome>
@@ -154,121 +199,251 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_country_list.xhtml</from-view-id>
+		<from-view-id>/admin/country/admin_country_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_country</from-outcome>
-			<to-view-id>/admin/admin_country_edit.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_country</from-outcome>
-			<to-view-id>/admin/admin_country_delete.xhtml</to-view-id>
+			<to-view-id>/admin/country/admin_country_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_mobile_provider_list.xhtml</from-view-id>
+		<from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_edit.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_delete.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_list.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_user</from-outcome>
-			<to-view-id>/admin/admin_user_show.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_show.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_show.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_mobile_provider</from-outcome>
+			<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/admin_contact_cellphone_show.xhtml</to-view-id>
+			<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>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<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/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/customer/admin_customer_show.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_mobile_provider</from-outcome>
+			<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>
+		</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>
+		</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>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlock_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_unlock.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/contact/admin_contact_show.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_edit_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<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>
+			<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>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.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_show_contact_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/admin_contact_cellphone_list.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_show.xhtml</to-view-id>
+			<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>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<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>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_contact_cellphone_show.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<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>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<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>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
+		</navigation-case>
+		<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>
+			<from-outcome>admin_list_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_list.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/customer/admin_customer_list.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_show_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_show.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlock_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_unlock.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/admin/customer/admin_customer_show.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>admin_edit_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_edit.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_delete_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_unlock_customer</from-outcome>
+			<to-view-id>/admin/customer/admin_customer_unlock.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_delete_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_delete.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_edit_contact</from-outcome>
+			<to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
-			<to-view-id>/admin/admin_contact_show.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<!--