From 2b62288632d54ae41bddc5e884ac8c77c0146d47 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Mar 2016 22:08:41 +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-core.jar | Bin 21279 -> 21291 bytes lib/jphone-core.jar | Bin 25281 -> 26423 bytes .../jjobs/beans/user/UserWebSessionBean.java | 12 +++--- .../converter/country/CountryConverter.java | 10 ++--- .../password/UserPasswordValidator.java | 35 ++++++++++++++++-- .../login/login_enter_current_password.tpl | 2 +- 6 files changed, 43 insertions(+), 16 deletions(-) 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|3Wd1XJy?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*)9koB$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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 diff --git a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java index edda1086..9d705477 100644 --- a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java @@ -285,13 +285,13 @@ public class UserWebSessionBean implements UserWebSessionController { user.getUserContact().setContactCountry(this.getCountry()); // Is there a phone number? - if (user.getUserContact().getContactPhoneNumber() instanceof DialableLandLineNumber) { + if (user.getUserContact().getContactLandLineNumber() instanceof DialableLandLineNumber) { // Debug message - System.out.println(MessageFormat.format("UserWebBean:doChangePersonalData: phoneId={0}", user.getUserContact().getContactPhoneNumber().getPhoneId())); //NOI18N + System.out.println(MessageFormat.format("UserWebBean:doChangePersonalData: phoneId={0}", user.getUserContact().getContactLandLineNumber().getPhoneId())); //NOI18N // Yes, then update as well - user.getUserContact().getContactPhoneNumber().setPhoneAreaCode(this.getPhoneAreaCode()); - user.getUserContact().getContactPhoneNumber().setPhoneNumber(this.getPhoneNumber()); + user.getUserContact().getContactLandLineNumber().setPhoneAreaCode(this.getPhoneAreaCode()); + user.getUserContact().getContactLandLineNumber().setPhoneNumber(this.getPhoneNumber()); } // Is there a fax number? @@ -453,7 +453,7 @@ public class UserWebSessionBean implements UserWebSessionController { } // Set phone number - contact.setContactPhoneNumber(phone); + contact.setContactLandLineNumber(phone); } // Don't set null or wrong references @@ -963,7 +963,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/jjobs/converter/country/CountryConverter.java b/src/java/org/mxchange/jjobs/converter/country/CountryConverter.java index 2ceb8be5..7a580678 100644 --- a/src/java/org/mxchange/jjobs/converter/country/CountryConverter.java +++ b/src/java/org/mxchange/jjobs/converter/country/CountryConverter.java @@ -42,7 +42,7 @@ public class CountryConverter implements Converter { /** * Country bean */ - private JobsCountrySingletonBeanRemote countryController; + private JobsCountrySingletonBeanRemote 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 = (JobsCountrySingletonBeanRemote) context.lookup("java:global/jjobs-ejb/country!org.mxchange.jcountry.data.JobsCountrySingletonBeanRemote"); //NOI18N + // ... and country bean + this.countryBean = (JobsCountrySingletonBeanRemote) context.lookup("java:global/jjobs-ejb/country!org.mxchange.jcountry.data.JobsCountrySingletonBeanRemote"); //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},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 countryList = this.countryController.allCountries(); + List countryList = this.countryBean.allCountries(); // Init value Country country = null; diff --git a/src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java b/src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java index 924f3bbc..3673c7cf 100644 --- a/src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java +++ b/src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java @@ -16,14 +16,19 @@ */ package org.mxchange.jjobs.validators.password; +import java.text.MessageFormat; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.FacesValidator; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import javax.inject.Inject; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; +import org.mxchange.jcoreeelogger.beans.local.logger.Log; +import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jjobs.beans.login.UserLoginWebSessionController; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; @@ -42,16 +47,38 @@ public class UserPasswordValidator extends BaseStringValidator implements Valida */ private static final long serialVersionUID = 48_581_795_687_317L; + /** + * Logger instance + */ + @Log + private LoggerBeanLocal loggerBeanLocal; + /** * User login controller */ - @Inject private UserLoginWebSessionController loginController; + /** + * Default constructor + */ + public UserPasswordValidator () { + // Try to get it + try { + // Get initial context + Context context = new InitialContext(); + + // Lookup logger + this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N + } catch (final NamingException ex) { + // Continue to throw it + throw new RuntimeException("context.lookup() failed.", ex); //NOI18N + } + } + @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { // Trace message - //this.getLogger().logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N + this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N // The required field String[] requiredFileds = {"currentPassword"}; //NOI18N @@ -69,6 +96,6 @@ public class UserPasswordValidator extends BaseStringValidator implements Valida } // Trace message - //this.getLogger().logTrace("validate: EXIT!"); //NOI18N + this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N } } 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 @@
- +
-- 2.39.5