From edc9e2d450c604dd065a20ffa43d4e909c0d262a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 20:05:58 +0200 Subject: [PATCH] Please cherry-pick: - renamed (admin)BusinessDataBean to (admin)BasicCompanyDataBean as this is basic company data and not any "business data" - fixed/sorted imports - also JSF tags need to be fixed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ssbookAdminBusinessDataWebRequestBean.java | 8 ++--- ...AddressbookBusinessDataWebRequestBean.java | 12 ++++---- ...AddressbookBranchOfficeWebRequestBean.java | 2 +- ...ookAdminCompanyEmployeeWebRequestBean.java | 2 +- ...ressbookCompanyEmployeeWebRequestBean.java | 2 +- ...AddressbookAdminContactWebRequestBean.java | 4 +-- .../AddressbookContactWebRequestBean.java | 2 +- ...ssbookAdminContactPhoneWebRequestBean.java | 2 +- ...AddressbookAdminCountryWebRequestBean.java | 2 +- .../AddressbookCountryWebRequestBean.java | 2 +- ...bookAdminMobileProviderWebRequestBean.java | 2 +- ...dressbookMobileProviderWebRequestBean.java | 2 +- .../AddressbookAdminPhoneWebRequestBean.java | 2 +- .../phone/AddressbookPhoneWebRequestBean.java | 2 +- .../AddressbookBusinessContactConverter.java | 6 ++-- .../AddressbookCompanyEmployeeConverter.java | 2 +- ...dressbookCompanyHeadquartersConverter.java | 2 +- .../contact/AddressbookContactConverter.java | 2 +- .../country/AddressbookCountryConverter.java | 2 +- .../fax/AddressbookFaxNumberConverter.java | 2 +- .../AddressbookLandLineNumberConverter.java | 2 +- .../AddressbookMobileNumberConverter.java | 2 +- .../AddressbookMobileProviderConverter.java | 2 +- .../AddressbookCompanyNameValidator.java | 6 ++-- .../AddressbookEmailAddressValidator.java | 2 +- web/WEB-INF/widgets.jsf.taglib.xml | 30 +++++++++---------- 26 files changed, 53 insertions(+), 53 deletions(-) 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 78ce92c6..2477ad80 100644 --- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java @@ -24,7 +24,7 @@ import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import org.mxchange.jcontactsbusiness.model.basicdata.CompanyBasicData; import org.mxchange.jcontactsbusiness.model.employee.Employee; @@ -56,8 +56,8 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC /** * EJB for administrative purposes */ - @EJB (lookup = "java:global/addressbook-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote") - private AdminBusinessDataSessionBeanRemote adminBusinessDataBean; + @EJB (lookup = "java:global/addressbook-ejb/adminBasicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote") + private AdminBasicCompanyDataSessionBeanRemote adminBasicCompanyDataBean; /** * An event being fired when basic business data has been added @@ -228,7 +228,7 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC // Now try to send to EJB and get an updated version back try { // Try it - BusinessBasicData updatedBasicData = this.adminBusinessDataBean.addCompanyBasicData(basicData); + BusinessBasicData updatedBasicData = this.adminBasicCompanyDataBean.addCompanyBasicData(basicData); // Fire event this.businessDataAddedEvent.fire(new AdminAddedBusinessBasicDataEvent(updatedBasicData)); diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java index 7260182a..62a871ba 100644 --- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebRequestBean.java @@ -31,9 +31,9 @@ import javax.inject.Named; import org.mxchange.addressbook.beans.BaseAddressbookController; import org.mxchange.addressbook.beans.user.login.AddressbookUserLoginWebSessionController; import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent; -import org.mxchange.jcontactsbusiness.model.basicdata.AdminBusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote; import org.mxchange.jcountry.model.data.Country; /** @@ -53,8 +53,8 @@ public class AddressbookBusinessDataWebRequestBean extends BaseAddressbookContro /** * 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; + @EJB (lookup = "java:global/addressbook-ejb/adminBasicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.AdminBasicCompanyDataSessionBeanRemote", description = "A stateless session bean for administrative purposes.") + private AdminBasicCompanyDataSessionBeanRemote adminBasicCompanyDataBean; /** * A list of all registered companies (globally) @@ -66,8 +66,8 @@ public class AddressbookBusinessDataWebRequestBean extends BaseAddressbookContro /** * 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; + @EJB (lookup = "java:global/addressbook-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote", description = "A stateless session bean for general purposes.") + private BasicCompanyDataSessionBeanRemote businessDataBean; /** * Comments for this company diff --git a/src/java/org/mxchange/addressbook/beans/business/branchoffice/AddressbookBranchOfficeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/branchoffice/AddressbookBranchOfficeWebRequestBean.java index c7a06ae5..f0dbb587 100644 --- a/src/java/org/mxchange/addressbook/beans/business/branchoffice/AddressbookBranchOfficeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/branchoffice/AddressbookBranchOfficeWebRequestBean.java @@ -50,7 +50,7 @@ public class AddressbookBranchOfficeWebRequestBean extends BaseAddressbookContro /** * EJB for administrative purposes */ - @EJB (lookup = "java:global/jfinancials-ejb/branchOffice!org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote") private BranchOfficeSessionBeanRemote branchOfficeBean; /** 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 bd13f5af..1b6883d4 100644 --- a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java @@ -39,7 +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") + @EJB (lookup = "java:global/addressbook-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote") private AdminCompanyEmployeeSessionBeanRemote adminCompanyEmployeeBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java index 4d661a86..f0a58045 100644 --- a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java @@ -47,7 +47,7 @@ public class AddressbookCompanyEmployeeWebRequestBean extends BaseAddressbookCon /** * EJB for general company employee purposes */ - @EJB (lookup = "java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote") private CompanyEmployeeSessionBeanRemote companyEmployeeBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java index b27d7697..91fc885c 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java @@ -79,7 +79,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro /** * Administrative contact EJB */ - @EJB (lookup = "java:global/addressbook-ejb/adminContact!org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/adminContact!org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote") private AdminContactSessionBeanRemote adminContactBean; /** @@ -100,7 +100,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro /** * EJB for general contact purposes */ - @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java index e852b0b9..24a6bcd8 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java @@ -95,7 +95,7 @@ public class AddressbookContactWebRequestBean extends BaseAddressbookController /** * EJB for general contact purposes */ - @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** 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 727df524..0ad989d0 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java @@ -81,7 +81,7 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookC /** * Administrative EJB for phone number */ - @EJB (lookup = "java:global/addressbook-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/adminContactPhone!org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote") private AdminContactsPhoneSessionBeanRemote adminContactPhoneBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java index 3637d12e..912a133b 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java @@ -63,7 +63,7 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro /** * Remote country EJB */ - @EJB (lookup = "java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote") private CountrySingletonBeanRemote countryBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebRequestBean.java index 188e6e85..70e28f6c 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebRequestBean.java @@ -50,7 +50,7 @@ public class AddressbookCountryWebRequestBean extends BaseAddressbookController /** * Remote country EJB */ - @EJB (lookup = "java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote") private CountrySingletonBeanRemote countryBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java index a766f0c6..66b22de5 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java @@ -52,7 +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") + @EJB (lookup = "java:global/addressbook-ejb/adminMobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote") private AdminMobileProviderSessionBeanRemote adminRemoteBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java index 46550ff4..7698ce66 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java @@ -50,7 +50,7 @@ public class AddressbookMobileProviderWebRequestBean extends BaseAddressbookCont /** * Remote EJB for mobile providers (regular) */ - @EJB (lookup = "java:global/addressbook-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote") private MobileProviderSingletonBeanRemote mobileProviderBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java index 0ee37a8f..17731bba 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java @@ -81,7 +81,7 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll /** * Remote EJB for phone number (administrative) */ - @EJB (lookup = "java:global/addressbook-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/adminPhone!org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote") private AdminPhoneSessionBeanRemote adminPhoneBean; /** diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java index 398ee0ab..9ce6c239 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/phone/AddressbookPhoneWebRequestBean.java @@ -86,7 +86,7 @@ public class AddressbookPhoneWebRequestBean extends BaseAddressbookController im /** * General EJB for phone numbers */ - @EJB (lookup = "java:global/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote") + @EJB (lookup = "java:global/addressbook-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote") private PhoneSessionBeanRemote phoneBean; /** diff --git a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java index 3084b531..6d3140cc 100644 --- a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java +++ b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java @@ -28,7 +28,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; -import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote; +import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote; /** * Converter for contact id <-> valid business contact instance @@ -41,7 +41,7 @@ public class AddressbookBusinessContactConverter implements Converter final Context initial = new InitialContext(); // Lookup EJB - COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); + COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote"); } catch (final NamingException ex) { // Throw it again throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); diff --git a/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java index e48a5653..9d01fe5a 100644 --- a/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java +++ b/src/java/org/mxchange/addressbook/converter/business/headquarters/AddressbookCompanyHeadquartersConverter.java @@ -52,7 +52,7 @@ public class AddressbookCompanyHeadquartersConverter implements Converter { final Context initial = new InitialContext(); // Lookup EJB - CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); + CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote"); } catch (final NamingException ex) { // Throw it again throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); diff --git a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java index 69b56e96..d49b644c 100644 --- a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java +++ b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java @@ -53,7 +53,7 @@ public class AddressbookCountryConverter implements Converter { final Context initial = new InitialContext(); // Lookup EJB - COUNTRY_BEAN = (CountrySingletonBeanRemote) initial.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); + COUNTRY_BEAN = (CountrySingletonBeanRemote) initial.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote"); } catch (final NamingException ex) { // Throw it again throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); diff --git a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java index 7d703fc7..da73c9f7 100644 --- a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java +++ b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java @@ -52,7 +52,7 @@ public class AddressbookFaxNumberConverter implements Converter. faxNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber rendered @@ -169,7 +169,7 @@ along with this program. If not, see . landLineNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber rendered @@ -186,7 +186,7 @@ along with this program. If not, see . mobileNumber The mobile instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber rendered @@ -231,13 +231,13 @@ along with this program. If not, see . faxNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered @@ -266,13 +266,13 @@ along with this program. If not, see . landLineNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered @@ -301,13 +301,13 @@ along with this program. If not, see . mobileNumber The mobile instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered @@ -384,13 +384,13 @@ along with this program. If not, see . faxNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered @@ -413,13 +413,13 @@ along with this program. If not, see . landLineNumber The fax instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered @@ -442,13 +442,13 @@ along with this program. If not, see . mobileNumber The mobile instance that provides the data for this tag. true - org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber contact The contact instance that provides contact data for additional JSF links. false - org.mxchange.jcontacts.contact.Contact + org.mxchange.jcontacts.model.contact.Contact rendered -- 2.39.5