From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Mar 2016 21:06:59 +0000 (+0100)
Subject: Continued a bit:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=26dfba786f40bacaee71c6f019e6fd951e92a67a;p=addressbook-war.git

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)
---

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index 38f7bec9..fcaadf8c 100644
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ
diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index a9baa32f..e905316a 100644
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ
diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index 4a792881..221f558c 100644
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ
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>