From 9dbae4640afdd59c9ed8a23d60af58cbceaaaf9f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 29 Aug 2017 22:32:55 +0200 Subject: [PATCH] Please cherry-pick: - rewrote initializeList() a bit to become PostConstruct as the injection is already done early - remote more JNDI lookups from PostConstruct-annotated method to @EJB annotation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../FinancialsBusinessDataWebSessionBean.java | 17 ++++------- ...nancialsCompanyEmployeeWebRequestBean.java | 18 ++---------- .../FinancialsContactWebSessionBean.java | 17 ++--------- .../FinancialsCountryWebApplicationBean.java | 18 ++---------- ...inancialsMobileProviderWebRequestBean.java | 18 ++---------- .../FinancialsPhoneWebApplicationBean.java | 18 ++---------- .../FinancialsAdminUserWebRequestBean.java | 28 +++---------------- .../user/FinancialsUserWebSessionBean.java | 17 ++--------- ...ancialsUserActivityWebApplicationBean.java | 18 ++---------- ...ancialsConfirmationLinkWebRequestBean.java | 24 ++-------------- .../FinancialsEmailChangeWebSessionBean.java | 17 ++--------- 11 files changed, 27 insertions(+), 183 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebSessionBean.java index 10936c7e..f0505ce9 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebSessionBean.java @@ -19,6 +19,7 @@ package org.mxchange.jfinancials.beans.business.basicdata; import java.text.MessageFormat; import java.util.LinkedList; import java.util.List; +import javax.annotation.PostConstruct; import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; @@ -153,9 +154,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll throw new IllegalArgumentException("event.basicData.companyName is empty"); } - // Initialize list - this.initializeList(); - // Add it to list this.businessContacts.add(event.getBasicData()); } @@ -167,9 +165,6 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll */ @SuppressWarnings ("ReturnOfCollectionOrArrayField") public List allCompanyBasicData () { - // Initialize list - this.initializeList(); - // Return it return this.businessContacts; } @@ -339,12 +334,10 @@ public class FinancialsBusinessDataWebSessionBean extends BaseFinancialsControll /** * Initializer method */ - private void initializeList () { - // Is the list empty? - if (this.businessContacts.isEmpty()) { - // Init user's contact list - this.businessContacts.addAll(this.adminBusinessDataBean.allCompanyBasicData()); - } + @PostConstruct + public void initializeList () { + // Init user's contact list + this.businessContacts.addAll(this.adminBusinessDataBean.allCompanyBasicData()); } } diff --git a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java index 5c51226d..8d8307a2 100644 --- a/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/business/employee/FinancialsCompanyEmployeeWebRequestBean.java @@ -19,12 +19,9 @@ package org.mxchange.jfinancials.beans.business.employee; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; -import javax.faces.view.facelets.FaceletException; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote; import org.mxchange.jcontactsbusiness.employee.Employee; import org.mxchange.jfinancials.beans.BaseFinancialsController; @@ -46,6 +43,7 @@ public class FinancialsCompanyEmployeeWebRequestBean extends BaseFinancialsContr /** * EJB for general company employee purposes */ + @EJB (lookup = "java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote") private CompanyEmployeeSessionBeanRemote companyEmployeeBean; /** @@ -79,18 +77,6 @@ public class FinancialsCompanyEmployeeWebRequestBean extends BaseFinancialsContr */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Get all entries from remote bean List employees = this.companyEmployeeBean.allCompanyEmployees(); diff --git a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java index b8d48144..f11749c6 100644 --- a/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java @@ -24,14 +24,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.ContactUtils; @@ -95,6 +93,7 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im /** * EJB for general contact purposes */ + @EJB (lookup = "java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** @@ -1009,18 +1008,6 @@ public class FinancialsContactWebSessionBean extends BaseFinancialsController im */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Get full email address list for reducing EJB calls this.emailAddressList.addAll(this.contactBean.getEmailAddressList()); diff --git a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java index 5511c9cd..55f9b3be 100644 --- a/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java @@ -19,13 +19,10 @@ package org.mxchange.jfinancials.beans.country; import java.text.MessageFormat; import java.util.List; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import javax.faces.view.facelets.FaceletException; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountrySingletonBeanRemote; import org.mxchange.jcountry.events.ObservableAdminAddedCountryEvent; @@ -48,6 +45,7 @@ public class FinancialsCountryWebApplicationBean extends BaseFinancialsControlle /** * Remote country EJB */ + @EJB (lookup = "java:global/jfinancials-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote") private CountrySingletonBeanRemote countryBean; /** @@ -101,18 +99,6 @@ public class FinancialsCountryWebApplicationBean extends BaseFinancialsControlle */ @PostConstruct public void init () { - // Try this - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the bean - this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw - throw new FaceletException(ex); - } - // "Cache" country list as this will not change so often. this.countryList = this.countryBean.allCountries(); } diff --git a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java index 8a054514..ee1509be 100644 --- a/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java @@ -19,13 +19,10 @@ package org.mxchange.jfinancials.beans.mobileprovider; import java.text.MessageFormat; import java.util.List; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; -import javax.faces.view.facelets.FaceletException; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; @@ -53,6 +50,7 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro /** * Remote EJB for mobile providers (regular) */ + @EJB (lookup = "java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote") private MobileProviderSingletonBeanRemote mobileRemoteBean; /** @@ -100,18 +98,6 @@ public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsContro */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } - // Init list of mobile providers this.mobileProviders = this.mobileRemoteBean.allMobileProvider(); } diff --git a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java index 32dc4fcc..367019af 100644 --- a/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsPhoneWebApplicationBean.java @@ -21,13 +21,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import javax.faces.view.facelets.FaceletException; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; @@ -79,6 +76,7 @@ public class FinancialsPhoneWebApplicationBean extends BaseFinancialsController /** * General EJB for phone numbers */ + @EJB (lookup = "java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote") private PhoneSessionBeanRemote phoneBean; /** @@ -500,18 +498,6 @@ public class FinancialsPhoneWebApplicationBean extends BaseFinancialsController */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } - // All phone numbers this.allMobileNumbers().addAll(this.phoneBean.allMobileNumbers()); this.allFaxNumbers().addAll(this.phoneBean.allFaxNumbers()); diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java index 6bdde803..0eeeb10c 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java @@ -19,7 +19,7 @@ package org.mxchange.jfinancials.beans.user; import java.text.MessageFormat; import java.util.Locale; import java.util.Objects; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; @@ -29,9 +29,6 @@ import javax.faces.context.FacesContext; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jfinancials.beans.BaseFinancialsController; @@ -97,6 +94,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController /** * Administrative user EJB */ + @EJB (lookup = "java:global/jfinancials-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote") private AdminUserSessionBeanRemote adminUserBean; /** @@ -132,6 +130,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController /** * General user EJB */ + @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -208,7 +207,7 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController * @return Redirect outcome */ public String addUser () { - System.out.println("addUser: this.contact="+this.getContact()); + System.out.println("addUser: this.contact=" + this.getContact()); // As the form cannot validate the data (required="true"), check it here if (this.getUserName() == null) { // Throw NPE @@ -626,25 +625,6 @@ public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController this.userPasswordRepeat = userPasswordRepeat; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - /** * Locks selected user's account. This method makes sure that a lock reason * is provided that th user later can read on login attempts. diff --git a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java index b8db6c8a..08d64fd4 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; @@ -30,9 +31,6 @@ import javax.faces.context.FacesContext; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.events.locale.ObservableLocaleChangeEvent; import org.mxchange.jfinancials.beans.BaseFinancialsController; @@ -111,6 +109,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple /** * Remote user bean */ + @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -832,18 +831,6 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Initialize user list this.userList = this.userBean.allUsers(); diff --git a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebApplicationBean.java index a958858e..9a2a1198 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/activity/FinancialsUserActivityWebApplicationBean.java @@ -24,13 +24,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; -import javax.faces.view.facelets.FaceletException; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; @@ -74,6 +71,7 @@ public class FinancialsUserActivityWebApplicationBean extends BaseFinancialsCont /** * EJB for user activity log */ + @EJB (lookup = "java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote") private UserActivityLogSessionBeanRemote userActivityBean; /** @@ -543,18 +541,6 @@ public class FinancialsUserActivityWebApplicationBean extends BaseFinancialsCont */ @PostConstruct public void init () { - // Try to get EJB instance - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Get whole list List list = this.userActivityBean.fetchAllUserActivityLog(); diff --git a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java index 1de8906d..bcbe7486 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/confirmlink/FinancialsConfirmationLinkWebRequestBean.java @@ -20,16 +20,13 @@ import java.text.MessageFormat; import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.inject.Any; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent; import org.mxchange.jcoreee.events.helper.clear.ObservableHelperCleanupEvent; import org.mxchange.jcoreee.utils.FacesUtils; @@ -74,6 +71,7 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsCont /** * Remote user bean */ + @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -114,24 +112,6 @@ public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsCont this.confirmationKey = confirmationKey; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - @Override public void maybeConfirmUserAccount () { // Trace message diff --git a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java index 1911777e..044ccb3f 100644 --- a/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/email_address/FinancialsEmailChangeWebSessionBean.java @@ -20,13 +20,11 @@ import java.text.MessageFormat; import java.util.List; import java.util.Objects; import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jfinancials.beans.BaseFinancialsController; @@ -70,6 +68,7 @@ public class FinancialsEmailChangeWebSessionBean extends BaseFinancialsControlle /** * Remote email change bean */ + @EJB (lookup = "java:global/jfinancials-ejb/userEmailChange!org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote") private UserEmailChangeSessionBeanRemote emailChangeBean; /** @@ -197,18 +196,6 @@ public class FinancialsEmailChangeWebSessionBean extends BaseFinancialsControlle */ @PostConstruct public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.emailChangeBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userEmailChange!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - // Init list this.emailAddresses = this.emailChangeBean.allQueuedAddresses(); } -- 2.39.5