From: Roland Häder Date: Tue, 16 Aug 2016 15:50:22 +0000 (+0200) Subject: Please cherry-pick/rename: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=09c17f86695994a806010e9e26efe5ec0d26ddcd;p=jjobs-war.git Please cherry-pick/rename: - fixed JNDI names as they are all camel-cased now Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java index c2b5d1bb..7fe5248a 100644 --- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java @@ -19,6 +19,7 @@ package org.mxchange.jjobs.beans.email_address; import java.text.MessageFormat; import java.util.List; import java.util.Objects; +import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; @@ -68,7 +69,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements /** * Remote email change bean */ - private final UserEmailChangeSessionBeanRemote emailBean; + private final UserEmailChangeSessionBeanRemote emailChangeBean; /** * Features controller @@ -92,10 +93,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements Context context = new InitialContext(); // Try to lookup - this.emailBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/jjobs-ejb/email-change!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N - - // Init list - this.emailAddresses = this.emailBean.allQueuedAddresses(); + this.emailChangeBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/jjobs-ejb/userEmailChange!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -147,7 +145,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements String baseUrl = FacesUtils.generateBaseUrl(); // Call EJB - this.emailBean.enqueueEmailAddressForChange(emailChange, baseUrl); + this.emailChangeBean.enqueueEmailAddressForChange(emailChange, baseUrl); // Unset all so the user is forced to re-enter it this.clear(); @@ -176,6 +174,15 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements this.emailAddressRepeat = emailAddressRepeat; } + /** + * Post-construction + */ + @PostConstruct + public void init () { + // Init list + this.emailAddresses = this.emailChangeBean.allQueuedAddresses(); + } + @Override public boolean isRequiredChangeEmailAddressSet () { return ((this.getEmailAddress() != null) && @@ -212,7 +219,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements } // Check EJB - boolean isQueued = this.emailBean.isEmailAddressEnqueued(emailAddress); + boolean isQueued = this.emailChangeBean.isEmailAddressEnqueued(emailAddress); // Is it there? if (isQueued) { diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index ae981191..bbb2405f 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -99,7 +99,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController im Context context = new InitialContext(); // Try to lookup the beans - this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminmobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N + this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminMobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java index 9d1d13de..823f8500 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java @@ -66,7 +66,7 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsController impleme Context context = new InitialContext(); // Try to lookup the beans - this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N + this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/mobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java index 639904da..7b810287 100644 --- a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java +++ b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java @@ -63,7 +63,7 @@ public class JobsMobileProviderConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N /// and mobile provider controller - this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.MobileProvider.MobileProviderSingletonBeanRemote"); //NOI18N + this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/mobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N