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

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

diff --git a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java
index ce4be2b4ee7bd9d499358909210ae908629ad2ec..f8bc589bd4e2683008592463654889660155d5a4 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/business/basicdata/PizzaBusinessDataWebSessionBean.java
@@ -19,6 +19,7 @@ package org.mxchange.pizzaapplication.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 PizzaBusinessDataWebSessionBean extends BasePizzaController impleme
                        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 PizzaBusinessDataWebSessionBean extends BasePizzaController impleme
         */
        @SuppressWarnings ("ReturnOfCollectionOrArrayField")
        public List<BusinessBasicData> allCompanyBasicData () {
-               // Initialize list
-               this.initializeList();
-
                // Return it
                return this.businessContacts;
        }
@@ -339,12 +334,10 @@ public class PizzaBusinessDataWebSessionBean extends BasePizzaController impleme
        /**
         * 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/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java
index bf17316dc3ea422e15e6d1168ae5df46e6bfbc73..a980cb6bad42865d7bdc1e3a58d47862fb7cc497 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/business/employee/PizzaCompanyEmployeeWebRequestBean.java
@@ -19,12 +19,9 @@ package org.mxchange.pizzaapplication.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.pizzaapplication.beans.BasePizzaController;
@@ -46,6 +43,7 @@ public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaController impl
        /**
         * EJB for general company employee purposes
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote")
        private CompanyEmployeeSessionBeanRemote companyEmployeeBean;
 
        /**
@@ -79,18 +77,6 @@ public class PizzaCompanyEmployeeWebRequestBean extends BasePizzaController impl
         */
        @PostConstruct
        public void init () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/pizzaservice-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<Employee> employees = this.companyEmployeeBean.allCompanyEmployees();
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
index d1d275bb00dd0f4778da35d9b8d38e1d5d4886f4..79c20ee6b978d9594a30d43fd277517883120f6c 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/contact/PizzaContactWebSessionBean.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 PizzaContactWebSessionBean extends BasePizzaController implements P
        /**
         * EJB for general contact purposes
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote")
        private ContactSessionBeanRemote contactBean;
 
        /**
@@ -1009,18 +1008,6 @@ public class PizzaContactWebSessionBean extends BasePizzaController implements P
         */
        @PostConstruct
        public void init () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/pizzaservice-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/pizzaapplication/beans/country/PizzaCountryWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebApplicationBean.java
index 0c72466a20c0b71d78e16789d12316cb018e55fe..025a8d3999b00b145be66836a0cbb757cb8a64ee 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebApplicationBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/country/PizzaCountryWebApplicationBean.java
@@ -19,13 +19,10 @@ package org.mxchange.pizzaapplication.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 PizzaCountryWebApplicationBean extends BasePizzaController implemen
        /**
         * Remote country EJB
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote")
        private CountrySingletonBeanRemote countryBean;
 
        /**
@@ -101,18 +99,6 @@ public class PizzaCountryWebApplicationBean extends BasePizzaController implemen
         */
        @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/pizzaservice-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/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
index 8d2e551696bd4ee4dc95ad816e9c2fc5615b2830..ffe0105363c1c69378ca1222b8c876a7a18132ff 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/mobileprovider/PizzaMobileProviderWebRequestBean.java
@@ -19,13 +19,10 @@ package org.mxchange.pizzaapplication.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.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
@@ -53,6 +50,7 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple
        /**
         * Remote EJB for mobile providers (regular)
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
        private MobileProviderSingletonBeanRemote mobileRemoteBean;
 
        /**
@@ -100,18 +98,6 @@ public class PizzaMobileProviderWebRequestBean extends BasePizzaController imple
         */
        @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/pizzaservice-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/pizzaapplication/beans/phone/PizzaPhoneWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebApplicationBean.java
index 92ee6024584f22eeb59556c25914ae2fa1f619ee..eaa7e7e76130eb3ce4e6d747ca1f710d424c7bb5 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebApplicationBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaPhoneWebApplicationBean.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 PizzaPhoneWebApplicationBean extends BasePizzaController implements
        /**
         * General EJB for phone numbers
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote")
        private PhoneSessionBeanRemote phoneBean;
 
        /**
@@ -500,18 +498,6 @@ public class PizzaPhoneWebApplicationBean extends BasePizzaController implements
         */
        @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/pizzaservice-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/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
index 0812807ed9ebb75fb7b097efc5ecfe1d5a619282..82b4c20770f2a527e54d6406da0adcc6c628d911 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaAdminUserWebRequestBean.java
@@ -19,7 +19,7 @@ package org.mxchange.pizzaapplication.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.jusercore.events.user.add.AdminAddedUserEvent;
@@ -98,6 +95,7 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
        /**
         * Administrative user EJB
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote")
        private AdminUserSessionBeanRemote adminUserBean;
 
        /**
@@ -139,6 +137,7 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
        /**
         * General user EJB
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote")
        private UserSessionBeanRemote userBean;
 
        /**
@@ -215,7 +214,7 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
         * @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
@@ -633,25 +632,6 @@ public class PizzaAdminUserWebRequestBean extends BasePizzaController implements
                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/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
-                       this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/pizzaservice-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/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
index 677c421c95071a24f584c3b0c497aaf4ba342856..25e6a19e1e4ad29ab3df1c04f3dc9050f6c82d55 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.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.jusercore.events.user.add.ObservableAdminAddedUserEvent;
@@ -109,6 +107,7 @@ public class PizzaUserWebSessionBean extends BasePizzaController implements Pizz
        /**
         * Remote user bean
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote")
        private UserSessionBeanRemote userBean;
 
        /**
@@ -811,18 +810,6 @@ public class PizzaUserWebSessionBean extends BasePizzaController implements Pizz
         */
        @PostConstruct
        public void init () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       this.userBean = (UserSessionBeanRemote) context.lookup("java:global/pizzaservice-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/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java
index aa34d6efb92f845d57d718a6993a03d161dcc912..35d461745fa73e018e68e7f7dfb7f85f8967d6ac 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/activity/PizzaUserActivityWebApplicationBean.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.jusercore.events.user.add.ObservableAdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent;
 import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent;
@@ -74,6 +71,7 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp
        /**
         * EJB for user activity log
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote")
        private UserActivityLogSessionBeanRemote userActivityBean;
 
        /**
@@ -543,18 +541,6 @@ public class PizzaUserActivityWebApplicationBean extends BasePizzaController imp
         */
        @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/pizzaservice-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N
-               } catch (final NamingException e) {
-                       // Throw again
-                       throw new FaceletException(e);
-               }
-
                // Get whole list
                List<LogableUserActivity> list = this.userActivityBean.fetchAllUserActivityLog();
 

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java
index cedd80763f5780b26b1cdfe699f5ed0c1823c0e2..9d615b41479654e6e2af7ca8a68067e1d6756229 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.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 PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
        /**
         * Remote user bean
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote")
        private UserSessionBeanRemote userBean;
 
        /**
@@ -114,24 +112,6 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                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/pizzaservice-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/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebSessionBean.java
index 1934d77d6a16e266755d232bdd9d517cbddbce7f..fdce3c3398e6bc5694f7c55e867208875d15c844 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/email_address/PizzaEmailChangeWebSessionBean.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.jusercore.model.email_address.ChangeableEmailAddress;
@@ -70,6 +68,7 @@ public class PizzaEmailChangeWebSessionBean extends BasePizzaController implemen
        /**
         * Remote email change bean
         */
+       @EJB (lookup = "java:global/pizzaservice-ejb/userEmailChange!org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote")
        private UserEmailChangeSessionBeanRemote emailChangeBean;
 
        /**
@@ -191,18 +190,6 @@ public class PizzaEmailChangeWebSessionBean extends BasePizzaController implemen
         */
        @PostConstruct
        public void init () {
-               // Try it
-               try {
-                       // Get initial context
-                       Context context = new InitialContext();
-
-                       // Try to lookup
-                       this.emailChangeBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/email-change!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();
        }