From bdd54b1dc9fbd8889c908445161d8592ff787592 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 16:51:44 +0200
Subject: [PATCH] Opps ...
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 | 152 ++++++++++++---------------------
 web/WEB-INF/faces-config.xml   |   8 +-
 2 files changed, 59 insertions(+), 101 deletions(-)

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 4b11ea61..476510b5 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,103 +2,61 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-<<<<<<< HEAD
-        <Node id="admin/admin_user_delete.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="privacy.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/index.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_start_sharing_addressbook.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="admin/admin_country_delete.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_show.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_edit.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/admin_user_show.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="admin/admin_user_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="admin/admin_contact_show.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="*" x="900" y="300" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="login/login_list_sharing_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="admin/admin_country_list.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_delete.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_edit.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="user/register.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="admin/admin_country_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_delete.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/admin_user_list.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="terms.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="admin/admin_mobile_provider_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="logout.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_list.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/admin_user_unlock.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="imprint.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_show.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_other_addressbooks.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="admin/admin_contact_cellphone_unlink.xhtml" x="1400" y="150" zoom="true"/>
-=======
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="600" zoom="true"/>
-        <Node id="customer/checkout2.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="privacy.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="customer/checkout.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="basket.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="exception.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="customer/register.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/category/admin_category_list.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="item_added.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/category/admin_category_delete.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="admin/contact/admin_country_delete.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="terms.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="admin/contact/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="customer/lost_passwd.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="index.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="admin/category/admin_category_edit.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="logout.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="customer/checkout_done.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="*" x="400" y="600" zoom="true"/>
-        <Node id="imprint.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="customer/login.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/product/admin_product_edit.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/product/admin_product_list.xhtml" x="2400" y="150" zoom="true"/>
-        <Node id="customer/empty_basket.xhtml" x="2150" y="150" zoom="true"/>
->>>>>>> 3d514fb... Moved generic templates/page files to sub folders for re-organization.
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="login/login_start_sharing_addressbook.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="user/register_done.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="*" x="150" y="1500" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="user/show_addressbook_entries.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="user/login.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="login/login_list_sharing_addressbooks.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="login/login_edit_user_data.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="login/login_shared_addressbooks.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="basket.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="login/login_data_saved.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="user/register.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="login/login_index.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="login/login_own_addressbooks.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="terms.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="user/user_list.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="logout.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/user_profile.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="user/show_addressbook.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="imprint.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="login/login_other_addressbooks.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="login/login_change_email_address.xhtml" x="150" y="450" 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 efc46f02..6d113733 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -109,7 +109,7 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_countries</from-outcome>
-			<to-view-id>/admin/contact/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>
@@ -222,14 +222,14 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/contact/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/contact/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/contact/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>
-- 
2.39.5