From 4ff1d060ab5aedb9c79f5d033308f142304662ae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 2 May 2016 09:15:46 +0200
Subject: [PATCH] These validators are registered by using an annotation
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 nbproject/faces-config.NavData | 112 ++++++++++++++++-----------------
 web/WEB-INF/faces-config.xml   |  32 ----------
 2 files changed, 56 insertions(+), 88 deletions(-)

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 1c2b0590..b8166e9b 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,63 +2,63 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="index.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="*" x="2400" y="300" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="login/login_shared_addressbooks.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="basket.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="exception.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="user/register.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="*" x="650" y="750" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="150" y="1500" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="login/login_contact_data_saved.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="2650" y="150" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="basket.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="exception.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="user/register.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="login/login_user_data_saved.xhtml" x="1900" y="150" zoom="true"/>
         <Node id="user/user_list.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="imprint.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="imprint.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="2400" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="150" y="1350" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 2ea7f93c..f42c1034 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -9,38 +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>AddressbookNameValidator</validator-id>
-		<validator-class>org.mxchange.addressbook.validator.names.AddressbookNameValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>PhoneNumberValidator</validator-id>
-		<validator-class>org.mxchange.jphone.validators.PhoneNumberValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>AddressbookIdValidator</validator-id>
-		<validator-class>org.mxchange.addressbook.validator.addressbook.AddressbookIdValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>UserProfileVisibilityValidator</validator-id>
-		<validator-class>org.mxchange.addressbook.validator.booleans.UserProfileVisibilityValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>UserIdValidator</validator-id>
-		<validator-class>org.mxchange.addressbook.validator.user.UserIdValidator</validator-class>
-	</validator>
-	<validator>
-		<validator-id>AddressbookUserPasswordValidator</validator-id>
-		<validator-class>org.mxchange.addressbook.validators.password.AddressbookUserPasswordValidator</validator-class>
-	</validator>
 	<navigation-rule>
 		<from-view-id>*</from-view-id>
 		<navigation-case>
-- 
2.39.5