From: Roland Häder Date: Tue, 29 Aug 2017 19:34:12 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1ad8d3b40b8f892b661d583287b3456cc0f2b192;p=addressbook-war.git Please cherry-pick: - removed many PostConstruct methods as this was a bad idea anyway as it confuses the container while it is wrapping the managed beans into proxy objects. @EJB(lookup="full-JNDI-name") does fully replace this many code - still I kept some there and may have to re-rename the now private method - removed some JSF-only and some obsolete methods from interface and/or bean - added GNU header to beans.xml Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java index 896b2c4b..23297141 100644 --- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java @@ -16,23 +16,20 @@ */ package org.mxchange.addressbook.beans.business.basicdata; -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.FacesException; -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.addressbook.beans.BaseAddressbookController; import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.employee.Employee; import org.mxchange.jcontactsbusiness.events.basicdata.added.AdminAddedBusinessBasicDataEvent; +import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData; import org.mxchange.jcountry.data.Country; @@ -41,7 +38,6 @@ import org.mxchange.jphone.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent; /** * An administrative business contact bean (controller) @@ -58,8 +54,9 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC private static final long serialVersionUID = 56_189_028_928_374L; /** - * Remote contact bean + * EJB for administrative purposes */ + @EJB (lookup = "java:global/addressbook-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote") private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; /** @@ -514,22 +511,4 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC this.landLineNumber = landLineNumber; } - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - } diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java index 71a98bb9..de80c145 100644 --- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java @@ -17,16 +17,13 @@ package org.mxchange.addressbook.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; -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.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.user.login.AddressbookUserLoginWebSessionController; import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote; @@ -50,18 +47,20 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro private static final long serialVersionUID = 56_189_028_928_371L; /** - * Remote contact bean + * EJB for administrative basic business data purposes */ + @EJB (lookup = "java:global/addressbook-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote", description = "A stateless session bean for administrative purposes.") private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; /** * A list of all registered companies (globally) */ - private List businessContacts; + private final List businessContacts; /** - * Remote contact bean + * EJB for general basic business data purposes */ + @EJB (lookup = "java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote", description = "A stateless session bean for general purposes.") private BusinessDataSessionBeanRemote businessDataBean; /** @@ -121,6 +120,9 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro public AddressbookBusinessDataWebSessionBean () { // Call super constructor super(); + + // Init list + this.businessContacts = new LinkedList<>(); } /** @@ -151,6 +153,9 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro throw new IllegalArgumentException("event.basicData.companyName is empty"); } + // Initialize list + this.initializeList(); + // Add it to list this.businessContacts.add(event.getBasicData()); } @@ -162,6 +167,10 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro */ @SuppressWarnings ("ReturnOfCollectionOrArrayField") public List allCompanyBasicData () { + // Initialize list + this.initializeList(); + + // Return it return this.businessContacts; } @@ -328,27 +337,14 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro } /** - * Post-initialization of this class + * Initializer method */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.businessDataBean = (BusinessDataSessionBeanRemote) context.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N - - // Try to lookup - this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); + private void initializeList () { + // Is the list empty? + if (this.businessContacts.isEmpty()) { + // Init user's contact list + this.businessContacts.addAll(this.adminBusinessDataBean.allCompanyBasicData()); } - - // Init user's contact list - this.businessContacts = this.adminBusinessDataBean.allCompanyBasicData(); } } diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java index 250859f1..230121f4 100644 --- a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java @@ -16,13 +16,9 @@ */ package org.mxchange.addressbook.beans.business.employee; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; -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.addressbook.beans.BaseAddressbookController; import org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote; @@ -43,6 +39,7 @@ public class AddressbookAdminCompanyEmployeeWebRequestBean extends BaseAddressbo /** * EJB for administrative company employee purposes */ + @EJB (lookup = "java:global/addressbook-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote") private AdminCompanyEmployeeSessionBeanRemote adminCompanyEmployeeBean; /** @@ -53,22 +50,4 @@ public class AddressbookAdminCompanyEmployeeWebRequestBean extends BaseAddressbo super(); } - /** - * Initialization method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.adminCompanyEmployeeBean = (AdminCompanyEmployeeSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - } diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java index ad8679ac..3e8ecd09 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java @@ -19,20 +19,15 @@ package org.mxchange.addressbook.beans.contact; import java.text.MessageFormat; import java.util.Date; import java.util.Iterator; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; -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.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; @@ -84,14 +79,9 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro /** * Administrative contact EJB */ + @EJB (lookup = "java:global/addressbook-ejb/adminContact!org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote") private AdminContactSessionBeanRemote adminContactBean; - /** - * Bean helper instance - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * Birth day */ @@ -108,8 +98,9 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro private String comment; /** - * Remote contact bean + * EJB for general contact purposes */ + @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** @@ -1047,40 +1038,6 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro this.zipCode = zipCode; } - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N - - // Try to lookup (administative) - this.adminContactBean = (AdminContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminContact!org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - - @Override - @Deprecated - public boolean isPersonalTitleRequired () { - // Get context parameter - String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_admin_personal_title_enabled"); //NOI18N - - // Is it set? - boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N - - // Return value - return isRequired; - } - @Override public void validateContactData () { if (this.getPersonalTitle() == null) { diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java index 1a2b1e42..0e068df8 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java @@ -55,15 +55,4 @@ public interface AddressbookAdminContactWebRequestController extends Serializabl @Deprecated void setControllerType (final String controllerType); - /** - * Checks/returns whether the personal title (Mr./Mrs.) is required for this - * controller. - *

- * @return Whether personal title is required - *

- * @Deprecated Don't use this method - */ - @Deprecated - boolean isPersonalTitleRequired (); - } diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 082518f4..754cbbf0 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -42,7 +42,6 @@ import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.title.PersonalTitle; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; -import org.mxchange.jcontacts.exceptions.ContactNotFoundException; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; @@ -94,7 +93,7 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController private String comment; /** - * Remote contact bean + * EJB for general contact purposes */ private ContactSessionBeanRemote contactBean; @@ -1110,41 +1109,12 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController return (Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())); } - @Override - public Contact lookupContactById (final Long contactId) throws ContactNotFoundException { - // Init variable - Contact localContact = null; - - // Clear this bean - this.clear(); - - // Try to lookup it in visible user list - for (final Iterator iterator = this.contactList.iterator(); iterator.hasNext();) { - // Get next user - Contact next = iterator.next(); - - // Is the user id found? - if (Objects.equals(next.getContactId(), contactId)) { - // Copy to other variable - localContact = next; - break; - } - } - - // Is it still null? - if (null == localContact) { - // Not visible for the current user - throw new ContactNotFoundException(contactId); - } - - // Copy all data to this bean - this.copyContact(localContact); - - // Return it - return localContact; - } - - @Override + /** + * Returns a list of all selectable contacts for user creation. Contacts + * from already existing users are excluded in this list. + *

+ * @return A list of all selectable contacts + */ public List selectableContacts () { return Collections.unmodifiableList(this.selectableContacts); } diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java index 90e59805..91fc4276 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java @@ -19,7 +19,6 @@ package org.mxchange.addressbook.beans.contact; import java.io.Serializable; import java.util.List; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jcontacts.exceptions.ContactNotFoundException; /** * An interface for user beans @@ -59,18 +58,6 @@ public interface AddressbookContactWebSessionController extends Serializable { */ void updateContactDataFromController (final Contact userContact); - /** - * Tries to lookup contact by given id number. If the user is not found a - * proper exceptions are thrown. - *

- * @param contactId Contact id - *

- * @return Contact instance - *

- * @throws ContactNotFoundException If the user is not found - */ - Contact lookupContactById (final Long contactId) throws ContactNotFoundException; - /** * Creates an instance from all properties *

@@ -133,12 +120,4 @@ public interface AddressbookContactWebSessionController extends Serializable { */ String doChangePersonalContactData (); - /** - * Returns a list of all selectable contacts for user creation. Contacts - * from already existing users are excluded in this list. - *

- * @return A list of all selectable contacts - */ - List selectableContacts (); - } diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java index 58d2a9af..772bff39 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java @@ -18,19 +18,14 @@ package org.mxchange.addressbook.beans.contact.phone; import java.text.MessageFormat; import java.util.Calendar; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.RequestScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; 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.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; @@ -86,6 +81,7 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookC /** * Administrative EJB for phone number */ + @EJB (lookup = "java:global/addressbook-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote") private AdminContactsPhoneSessionBeanRemote adminContactPhoneBean; /** @@ -115,12 +111,6 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookC @Inject private AddressbookAdminPhoneWebRequestController adminPhoneController; - /** - * Bean helper - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * Contact instance */ @@ -783,24 +773,6 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookC this.phoneId = phoneId; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.adminContactPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - /** * Unlinks fax data with current contact *

diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java index bb6c7d34..2d0fdfcf 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java @@ -28,7 +28,6 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; @@ -58,12 +57,6 @@ public class AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro */ private static final long serialVersionUID = 542_145_347_916L; - /** - * Bean helper - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * General contact controller */ diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java index 9fe77989..b4cabfe7 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java @@ -19,16 +19,13 @@ package org.mxchange.addressbook.beans.country; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; @@ -66,6 +63,7 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro /** * Remote country EJB */ + @EJB (lookup = "java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote") private CountrySingletonBeanRemote countryBean; /** @@ -263,24 +261,6 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro this.countryPhoneCode = countryPhoneCode; } - /** - * Post-construction method - */ - @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/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw - throw new FaceletException(ex); - } - } - /** * Clears this bean's data. This should be called after a form has been * submitted and the processing of the form was successful. diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java index beaffd4a..467625e7 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java @@ -19,16 +19,13 @@ package org.mxchange.addressbook.beans.mobileprovider; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; @@ -55,6 +52,7 @@ public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo /** * Remote EJB for mobile providers (administrative) */ + @EJB (lookup = "java:global/addressbook-ejb/adminMobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote") private AdminMobileProviderSessionBeanRemote adminRemoteBean; /** @@ -208,24 +206,6 @@ public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo this.providerName = providerName; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminMobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } - } - /** * Checks whether if the given mobile provider is already created by * checking both dial prefix and country. diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java index bafe654d..011b7a66 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java @@ -20,19 +20,14 @@ import java.text.MessageFormat; import java.util.Calendar; 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.event.Observes; 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.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; @@ -86,14 +81,9 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll /** * Remote EJB for phone number (administrative) */ + @EJB (lookup = "java:global/addressbook-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote") private AdminPhoneSessionBeanRemote adminPhoneBean; - /** - * Bean helper - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * fax number */ @@ -914,24 +904,6 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll this.phoneNumber = phoneNumber; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup the beans - this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw it again - throw new FaceletException(e); - } - } - /** * Returns an instance of a DialableFaxNumber from all fields stored in this * bean. diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java index ac9e4f01..14b428e7 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java @@ -35,7 +35,6 @@ import javax.naming.NamingException; import org.mxchange.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.contact.AddressbookAdminContactWebRequestController; import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.addressbook.beans.localization.AddressbookLocalizationSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; @@ -101,12 +100,6 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle */ private AdminUserSessionBeanRemote adminUserBean; - /** - * Bean helper - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * Contact instance */ diff --git a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java index 7d8407f1..79bc7eea 100644 --- a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java @@ -27,13 +27,11 @@ import javax.annotation.PostConstruct; import javax.enterprise.context.ApplicationScoped; 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.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; @@ -68,12 +66,6 @@ public class AddressbookUserActivityWebApplicationBean extends BaseAddressbookCo */ private static final long serialVersionUID = 192_586_376_717_856_904L; - /** - * Bean helper - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * User instance */ diff --git a/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java index 720f6430..85c793f4 100644 --- a/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java @@ -31,7 +31,6 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestHelperController; import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent; import org.mxchange.jcoreee.events.helper.clear.ObservableHelperCleanupEvent; @@ -60,12 +59,6 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo */ private static final long serialVersionUID = 57_637_182_796_370L; - /** - * Bean helper instance - */ - @Inject - private AddressbookWebRequestHelperController beanHelper; - /** * Event being fired when a bean helper should be cleaned */ diff --git a/src/java/org/mxchange/addressbook/beans/user/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/login/AddressbookUserLoginWebSessionBean.java index f2d0782d..ff6b4beb 100644 --- a/src/java/org/mxchange/addressbook/beans/user/login/AddressbookUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/login/AddressbookUserLoginWebSessionBean.java @@ -20,18 +20,14 @@ import java.text.MessageFormat; import java.util.Collections; 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.Event; import javax.enterprise.event.Observes; import javax.enterprise.inject.Any; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -107,6 +103,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle /** * Remote register session-scoped bean */ + @EJB (lookup = "java:global/addressbook-ejb/userLogin!org.mxchange.juserlogincore.model.user.login.UserLoginSessionBeanRemote") private UserLoginSessionBeanRemote userLoginBean; /** @@ -131,6 +128,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle /** * EJB for user's password history */ + @EJB (lookup = "java:global/addressbook-ejb/userPasswordHistory!org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote") private UserPasswordHistorySessionBeanRemote userPasswordHistoryBean; /** @@ -341,29 +339,6 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle return ((this.isUserLoggedIn()) && (Objects.equals(this.getLoggedInUser().getUserMustChangePassword(), Boolean.TRUE))); } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-ejb/userLogin!org.mxchange.juserlogincore.model.user.login.UserLoginSessionBeanRemote"); //NOI18N - - // Also find this - this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup("java:global/addressbook-ejb/userPasswordHistory!org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote"); //NOI18N - - // Defaul template is guest - this.baseTemplatePathName = GUEST_BASE_TEMPLATE_NAME; - } catch (final NamingException ex) { - // Continue to throw - throw new FaceletException(ex); - } - } - @Override public boolean isInvisible () { // Check on login diff --git a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java index 278849e1..9bc31579 100644 --- a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java @@ -17,16 +17,13 @@ package org.mxchange.addressbook.beans.user.password; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; import org.mxchange.addressbook.beans.user.login.AddressbookUserLoginWebSessionController; @@ -65,6 +62,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro /** * Remote user bean */ + @EJB (lookup = "java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -179,7 +177,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro PasswordHistory passwordHistory = this.userBean.updateUserPassword(user, baseUrl); // Fire event - this.userUpdatedPasswordEvent.fire(new UpdatedUserPasswordEvent(passwordHistory,this.getUserPassword())); + this.userUpdatedPasswordEvent.fire(new UpdatedUserPasswordEvent(passwordHistory, this.getUserPassword())); } catch (final UserNotFoundException | UserStatusUnconfirmedException | UserStatusLockedException ex) { // Clear bean this.clear(); @@ -249,24 +247,6 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro this.userPasswordRepeat = userPasswordRepeat; } - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - @Override public boolean isRequiredChangePasswordSet () { // Is all data set? diff --git a/src/java/org/mxchange/addressbook/beans/user/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/register/AddressbookUserRegisterWebSessionBean.java index 785070ef..98a2bc29 100644 --- a/src/java/org/mxchange/addressbook/beans/user/register/AddressbookUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/register/AddressbookUserRegisterWebSessionBean.java @@ -16,16 +16,13 @@ */ package org.mxchange.addressbook.beans.user.register; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; @@ -72,6 +69,20 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro @Inject private AddressbookAdminUserWebRequestController adminUserController; + /** + * An event being fired when a user name should be cleared + */ + @Inject + @Any + private Event clearUserNameEvent; + + /** + * An event being fired when a user password should be cleared + */ + @Inject + @Any + private Event clearUserPasswordEvent; + /** * Contact controller */ @@ -87,6 +98,7 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro /** * Remote register session-scoped bean */ + @EJB (lookup = "java:global/addressbook-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") private UserRegistrationSessionBeanRemote registerBean; /** @@ -102,20 +114,6 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro @Any private Event userPasswordChangedEvent; - /** - * An event being fired when a user name should be cleared - */ - @Inject - @Any - private Event clearUserNameEvent; - - /** - * An event being fired when a user password should be cleared - */ - @Inject - @Any - private Event clearUserPasswordEvent; - /** * An event being fired when a new user has registered */ @@ -325,21 +323,4 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro return "user_register_page2"; //NOI18N } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/addressbook-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw - throw new FaceletException(ex); - } - } - } diff --git a/src/java/org/mxchange/addressbook/beans/user/resendlink/AddressbookResendLinkWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/resendlink/AddressbookResendLinkWebSessionBean.java index 3f77190a..6d926c15 100644 --- a/src/java/org/mxchange/addressbook/beans/user/resendlink/AddressbookResendLinkWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/resendlink/AddressbookResendLinkWebSessionBean.java @@ -17,17 +17,13 @@ package org.mxchange.addressbook.beans.user.resendlink; import java.util.Locale; -import javax.annotation.PostConstruct; +import javax.ejb.EJB; import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Event; import javax.enterprise.event.Observes; 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.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.localization.AddressbookLocalizationSessionController; import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; @@ -76,6 +72,7 @@ public class AddressbookResendLinkWebSessionBean extends BaseAddressbookControll /** * EJB for resending confirmation link */ + @EJB (lookup = "java:global/addressbook-ejb/userResendConfirmationLink!org.mxchange.juserlogincore.model.user.resendlink.ResendLinkSessionBeanRemote") private ResendLinkSessionBeanRemote resendLinkBean; /** @@ -214,6 +211,14 @@ public class AddressbookResendLinkWebSessionBean extends BaseAddressbookControll this.emailAddress = emailAddress; } + /** + * Clears email address fields so the user has to re-enter them + */ + private void clear () { + // Clear fields + this.setEmailAddress(null); + } + /** * Getter for locale instance *

@@ -232,30 +237,4 @@ public class AddressbookResendLinkWebSessionBean extends BaseAddressbookControll this.locale = locale; } - /** - * Post-construction method - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.resendLinkBean = (ResendLinkSessionBeanRemote) context.lookup("java:global/addressbook-ejb/userResendConfirmationLink!org.mxchange.juserlogincore.model.user.resendlink.ResendLinkSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - } - - /** - * Clears email address fields so the user has to re-enter them - */ - private void clear () { - // Clear fields - this.setEmailAddress(null); - } - } diff --git a/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java index 4943b513..fa63003b 100644 --- a/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java +++ b/src/java/org/mxchange/addressbook/validator/business/basicdata/FinancialsCompanyNameValidator.java @@ -85,7 +85,7 @@ public class FinancialsCompanyNameValidator extends BaseStringValidator { Context initialContext = new InitialContext(); // ... and user controller - FinancialsCompanyNameValidator.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N + FinancialsCompanyNameValidator.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N diff --git a/web/WEB-INF/beans.xml b/web/WEB-INF/beans.xml index 0f4e2aab..604563e4 100644 --- a/web/WEB-INF/beans.xml +++ b/web/WEB-INF/beans.xml @@ -1,4 +1,20 @@ +