From 26dfba786f40bacaee71c6f019e6fd951e92a67a Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Mar 2016 22:06:59 +0100
Subject: [PATCH] Continued a bit: - renamed method - the password validator is
 currently not working as it currently need the web controller, not the EJB -
 updated jar(s)

---
 lib/jcontacts-business-core.jar               | Bin 64576 -> 64576 bytes
 lib/jcontacts-core.jar                        | Bin 21279 -> 21291 bytes
 lib/jphone-core.jar                           | Bin 25281 -> 26423 bytes
 .../beans/user/UserWebSessionBean.java        |   4 ++--
 .../converter/country/CountryConverter.java   |  10 +++++-----
 .../login/login_enter_current_password.tpl    |   2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index 38f7bec9b70f927a6c77d80bf420e15e01e2b9eb..fcaadf8ccb43000591b17665bdb1e7b4d4824515 100644
GIT binary patch
delta 520
zcmX@`gZaP@X5IjAW)?061`Y;>+VvR|c{P}8fRx32=H$)k6K~0bsXrPZYO*?`6_`$8
zbOF<=86Cm&dq!6<ZO-HjrfZqp!Srz^H!v;0Y%d7Z?_nAHdfGWw1_lr|nS5}G(qxA$
z{>>Aa@3DfV%ioE}ED~d20AXXWw7&q~<_(;i#6YHOPE{yi12b-@y^;bmjynE?h#d4#
zlLL#qN?R@tW=yGj#|mb&wrDGW8Jm|J;{Y>i)*8ry8S78UvV$4tFE;al8KL)Dn81uX
z51v67M<3hqF$2S8GTSE$P{2%f{A3SOF}eAZKA7GL6bJD?eDVU*wx2`5^pwwmVEV=9
zP%!QAB^XRk`w|YOKYR%T)1F`b!Sw8}@nHJz*Eld8_bnStpZS&rrY*lGgX#I-A$*=6
wIbeSEk5n-I_(ukq_WPL#rZ@d80n?hla>4Y>Ul8>izth3|qTdj8*M4UK056>3fB*mh

delta 520
zcmX@`gZaP@X5IjAW)?061`Y-W_1?6Jyc*1EK+0l1n7Snorv88hC#y4Bfw+@X7+t{h
zYDPye{hrYkOq(+~gXvl(cQAdN$qh^kFxv|P^?6vvzMgiDm4N|-O(q{)qBPkdi+}S(
z=6kGQ>GF3XGK<6*7(mz<EbTAAw|N8SCNYpHn^P4E*uab%YOkcgjH8Y}AtDDo)a1Y-
zuhN!_gBerm-m!uitu5LLV8-Sp$2h=@nzaV9V8;4Wvg}~S`HRgwU`FV@7A7#`&Vy$V
z#?i-ie9XXbnauXd0wgop@smB6ZvLbXrnf@HKYa26^KCzefaxip1Htr*&!J%2;Y%=>
zp7tdiOn>+i2Btl~`h)4&U*o~_->-3CI__IGm_G9@3rt&nPX^QTzeD&uKXSnQ>L00K
p`tgqpFzxp<5lnCTSpudtf8~PdnZF?FIew>u`9;4W>aP9H0s!%>%SZqK

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index a9baa32fa6cfb062f87ed9a9ccba1ebe106e8244..e905316a232cc3f743e47c1d041b3c782fa666f1 100644
GIT binary patch
delta 474
zcmbQgjB)icM&1B#W)?061`Y;>s`VKYc{P|Tft1C3<`N)vOCC)9(Ew4C)ftVzbPS^v
zn4Zb#2&V5c+6n>XJ>He>`^v!yGzy4y7$z?WRGcj5#6CGMkZp4mQxL15M0#q8bADb)
zVseR3VqS_*=Hy-Mfr1jnXrh}XIeeMH2L2K9ob*MLfdPaKKn5CZUd8=ZfCPhN88<7+
zHHw3rxp}GS7cMYkj>BwDFvH603=1>R*ONK@EkNF$?BZ_^_EDR^KA7GC6bJeIv%eFV
zwg~V7)2#u4VESf&FE5JECmRR)%7a8uoz4IUOB$0V&kuyy@-R@EX^AN~oaBSRAwAhK
zNSbN316Zg&NJRl;()`lW+H4jE1`u|Eo5R4cq|wrAvOs|3Wd1<z$+=!ilR1M0*x39*
FDgf}}o~Qr-

delta 475
zcmZ3zjB)-lM&1B#W)?061`Y-Wx7leEc{P|_ft1C3W_=)aOCC)9(Ew4C)ftVzbPS^v
zn4Zb#2&V5c+6n>XJy?I7P-Nm{U;tqqhRKNmijyD6v2PAxieTjvO;0Ux&d)1JOfCt?
z$e+AUCXi3G7+GkufUGRzW*bfeCa_t@)|q~Ir^&zo!UkZoHqYn&CqR@r^CUpd+Pu;9
z3m2HN!eKTinBnGihJ_jE%gLht79ej<4)C`J`(Tp4KA1iN6bJeAzrPchb_wtT(-Q*%
z!SvGrUtScSPPPy9RRD>gx|abCmNdq2gF|9Ix8US^fjnSi-UdoD%`gQE7fAC?erL)y
z*)9ko<r^f;)b9Y7nh_)pHhz9-X>B$O0|N-Vzzt_$SkkEL1yn3KInPUXvS_dX+b=(m
FEC4oLmTmw5

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index 4a792881003d7be6485b4aba1e0a4aa6cf1d4c0e..221f558c88c722e38e98a8f00c55f365f4cf1498 100644
GIT binary patch
literal 26423
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

delta 5942
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
UZ&{V(U>lS1w+%UK(-v<17aeXB+5i9m

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java
index 9480a5bf..e11c65f2 100644
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java
@@ -378,7 +378,7 @@ public class UserWebSessionBean implements UserWebSessionController {
 			}
 
 			// Set phone number
-			contact.setContactPhoneNumber(phone);
+			contact.setContactLandLineNumber(phone);
 		}
 
 		// Don't set null or wrong references
@@ -888,7 +888,7 @@ public class UserWebSessionBean implements UserWebSessionController {
 		// Get cellphone, phone and fax instance
 		DialableCellphoneNumber cellphone = user.getUserContact().getContactCellphoneNumber();
 		DialableFaxNumber fax = user.getUserContact().getContactFaxNumber();
-		DialableLandLineNumber phone = user.getUserContact().getContactPhoneNumber();
+		DialableLandLineNumber phone = user.getUserContact().getContactLandLineNumber();
 
 		// - contact data
 		if ((phone instanceof DialableLandLineNumber) && (phone.getPhoneAreaCode() > 0)) {
diff --git a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java
index 108c9551..1a810c9c 100644
--- a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java
@@ -42,7 +42,7 @@ public class CountryConverter implements Converter {
 	/**
 	 * Country bean
 	 */
-	private AddressbookCountrySingletonBeanRemote countryController;
+	private AddressbookCountrySingletonBeanRemote countryBean;
 
 	/**
 	 * Logger instance
@@ -62,8 +62,8 @@ public class CountryConverter implements Converter {
 			// Lookup logger
 			this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
 
-			// ... and country controller
-			this.countryController = (AddressbookCountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote"); //NOI18N
+			// ... and country bean
+			this.countryBean = (AddressbookCountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote"); //NOI18N
 		} catch (final NamingException ex) {
 			// Continue to throw it
 			throw new RuntimeException("context.lookup() failed.", ex); //NOI18N
@@ -73,7 +73,7 @@ public class CountryConverter implements Converter {
 	@Override
 	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Trace message
-		this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2},this.countryController={3} - CALLED!", context, component, submittedValue, this.countryController)); //NOI18N
+		this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: context={0},component={1},submittedValue={2},this.countryBean={3} - CALLED!", context, component, submittedValue, this.countryBean)); //NOI18N
 
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
@@ -85,7 +85,7 @@ public class CountryConverter implements Converter {
 		}
 
 		// Get full list
-		List<Country> countryList = this.countryController.allCountries();
+		List<Country> countryList = this.countryBean.allCountries();
 
 		// Init value
 		Country country = null;
diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/login_enter_current_password.tpl
index 26206e4c..eb11c933 100644
--- a/web/WEB-INF/templates/login/login_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/login_enter_current_password.tpl
@@ -16,7 +16,7 @@
 				<div class="table_right">
 					<h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
 						<h:message for="currentPassword" class="errors" />
-						<f:validator for="currentPassword" validatorId="UserPasswordValidator" />
+						<!-- <f:validator for="currentPassword" validatorId="UserPasswordValidator" /> //-->
 					</h:inputSecret>
 				</div>
 
-- 
2.39.5