Please cherry-pick/rename:

- fixed JNDI names as they are all camel-cased now

Signed-off-by: Roland Häder <roland@mxchange.org>

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 c2b5d1bbb69a2a481f24ae49a855cb01b510f38f..7fe5248a0776e46cefbb045c80dc197e438e76c6 100644 (file)
--- 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 ae981191b86b2d69d6d4ad560c666cdc28678cb2..bbb2405f0facc7dfc0950c9fff8f053a5bed9711 100644 (file)
--- 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 9d1d13decfaf51bfbc8838a30418e6619491cea6..823f8500e5062e5f2832f19a1463148560efe37e 100644 (file)
--- 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 639904dab9fedeb606e3079a5e3d2f77a2dc01d1..7b8102872f4155be25b9dc2b2514b5cb91b520df 100644 (file)
--- 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