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

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

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 78ce92c646caeaa9e856612690699f94d346feb4..2477ad804a76b394ed8c80ce01950dddcc2443ad 100644 (file)
--- 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 7260182a96ebce97d969f82d45bbe1c634680df0..62a871ba89708029c7d32d95b46a37329ce02b91 100644 (file)
--- 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 c7a06ae5690c5c0cb47e6f13fc5312373c3a62cf..f0dbb587e9a5faf4e5505699fe0a7e74c57b1067 100644 (file)
--- 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 bd13f5af6e9cce09c30000013fab14dd86f31742..1b6883d42c734d4a38abe31e61425102af44c31f 100644 (file)
--- 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 4d661a8646dd7d79d667c08b4d01761554418a5a..f0a580450adb78206ef1d1452f743e553388093d 100644 (file)
--- 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 b27d76975e0d50ca4b53c34c7ef6d7aa6c5bddb5..91fc885cefff9bfcfae341cb0b07d1455eb31b9f 100644 (file)
--- 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 e852b0b922bb8b37f39484883cb8f64d1db219d4..24a6bcd855053d27819219b91ee197e1f5c22dff 100644 (file)
--- 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 727df524f027bfff9a949dbf382e861b79be8aec..0ad989d00c950cb109801bbea41c6c2e443bd235 100644 (file)
--- 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 3637d12ef35a87e9c453bf81efb815a314e7bbf1..912a133b9c34b9b4ea95fc8b96bdf59541a682e5 100644 (file)
--- 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 188e6e8544eddd11fb15495c02f6873edd2a84fa..70e28f6c75ab25fb3fb5ca51b9e6f87ba9df272a 100644 (file)
--- 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 a766f0c61bff9639a9cf5a6e5114c48cdd9cf486..66b22de5456e05523b7b792de813cdf5f37e566a 100644 (file)
--- 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 46550ff4c86d45f811e29b34a5a08f27d0a74219..7698ce6667269ca6fe38d607f3cc94004cb11938 100644 (file)
--- 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 0ee37a8fb25527937f4d69204a42bf0281980600..17731bba6614fa9e2c36a69a5cd81548d70f1c94 100644 (file)
--- 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 398ee0aba54926589e3799634df3ddd2dba72b64..9ce6c2394685d1ce104798262d635b024f5cdf39 100644 (file)
--- 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 3084b531dcd29435a3e0292278521c8b292e27d9..6d3140cc8a5c8ce17340de4a9488afaed3cabccc 100644 (file)
--- 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<BusinessBa
        /**
         * Business contact EJB
         */
-       private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
+       private static BasicCompanyDataSessionBeanRemote BASIC_DATA_BEAN;
 
        @Override
        public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
@@ -52,7 +52,7 @@ public class AddressbookBusinessContactConverter implements Converter<BusinessBa
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
+                               BASIC_DATA_BEAN = (BasicCompanyDataSessionBeanRemote) initial.lookup("java:global/jfinancials-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote");
                        } 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/company_employee/AddressbookCompanyEmployeeConverter.java b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
index 0cd2a20a8518d62ad62498519df50ed05fc178f6..d0768cf71ddf52aaae0c365ab38607a36a13e35f 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
@@ -52,7 +52,7 @@ public class AddressbookCompanyEmployeeConverter implements Converter<Employee>
                                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 e48a565364c496732e9f9acce85976062b4616a8..9d01fe5a1d7dcf19e561df8482e0613da76171a8 100644 (file)
--- 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<Headqu
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote");
+                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.headquarters.CompanyHeadquartersSessionBeanRemote");
                        } 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/contact/AddressbookContactConverter.java b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
index 995b88ded2c120fcae446ce52eac1d9f57b5ab39..fe5300b2ce4fad171a7492663b05ad9d31d2298a 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
@@ -52,7 +52,7 @@ public class AddressbookContactConverter implements Converter<Contact> {
                                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 69b56e963ba947f4d5b49208bdd77627c57b6af8..d49b644cb3fb6dc686012fa7bcb4930f6fa65604 100644 (file)
--- 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<Country> {
                                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 7d703fc70090f93b1914bb3ba133080983f35820..da73c9f7690bf046682f41586c9e5173bf0ddf04 100644 (file)
--- 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<DialableFaxNumbe
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote");
                        } 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/landline/AddressbookLandLineNumberConverter.java b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
index 7583c7337e2ea6fe83f3edb7b065515ab85a0b84..273e46ac2bd2d1d548d40da2a9ef815cb3d683ef 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
@@ -52,7 +52,7 @@ public class AddressbookLandLineNumberConverter implements Converter<DialableLan
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote");
                        } 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/mobile/AddressbookMobileNumberConverter.java b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
index fa26fdb439ea1f618b605f63b7b7ca145eae25a8..0b6a52420339c02cdaf34088d83044718d09cf3b 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
@@ -52,7 +52,7 @@ public class AddressbookMobileNumberConverter implements Converter<DialableMobil
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote");
                        } 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/mobileprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
index a40a9c53992b4080f5e3979c8f02a2f50b27b84a..3f0277fe1ef0b7b5f47d5f3a97d5630e2d907726 100644 (file)
--- a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
@@ -52,7 +52,7 @@ public class AddressbookMobileProviderConverter implements Converter<MobileProvi
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
+                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
                        } catch (final NamingException ex) {
                                // Throw it again
                                throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex);

diff --git a/src/java/org/mxchange/addressbook/validator/business/basicdata/AddressbookCompanyNameValidator.java b/src/java/org/mxchange/addressbook/validator/business/basicdata/AddressbookCompanyNameValidator.java
index 70982ea476651bc418ad9f0b750bc578c0b5692c..58e60ca71430d444c5939c1efe3cce9be5502b37 100644 (file)
--- a/src/java/org/mxchange/addressbook/validator/business/basicdata/AddressbookCompanyNameValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/business/basicdata/AddressbookCompanyNameValidator.java
@@ -25,7 +25,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
 /**
@@ -39,7 +39,7 @@ public class AddressbookCompanyNameValidator extends BaseStringValidator {
        /**
         * Business contact EJB
         */
-       private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
+       private static BasicCompanyDataSessionBeanRemote BASIC_DATA_BEAN;
 
        /**
         * Serial number
@@ -55,7 +55,7 @@ public class AddressbookCompanyNameValidator extends BaseStringValidator {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
+                               BASIC_DATA_BEAN = (BasicCompanyDataSessionBeanRemote) initial.lookup("java:global/addressbook-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote");
                        } 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/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index db5a8cd42594c4697204ef6befbbb2de80bdc497..e30cacf9ea465ede283012ddd112026ac5005260 100644 (file)
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -66,7 +66,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
                                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/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index cd5476569d45fc4601956e94225bde13f295ba88..07a5078825556fbc9af878f9b27fc44e46cff13a 100644 (file)
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -152,7 +152,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>faxNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -169,7 +169,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>landLineNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -186,7 +186,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>mobileNumber</name>
                        <description>The mobile instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -231,13 +231,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>faxNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -266,13 +266,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>landLineNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -301,13 +301,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>mobileNumber</name>
                        <description>The mobile instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -384,13 +384,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>faxNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -413,13 +413,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>landLineNumber</name>
                        <description>The fax instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>
@@ -442,13 +442,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <name>mobileNumber</name>
                        <description>The mobile instance that provides the data for this tag.</description>
                        <required>true</required>
-                       <type>org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber</type>
+                       <type>org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber</type>
                </attribute>
                <attribute>
                        <name>contact</name>
                        <description>The contact instance that provides contact data for additional JSF links.</description>
                        <required>false</required>
-                       <type>org.mxchange.jcontacts.contact.Contact</type>
+                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
                </attribute>
                <attribute>
                        <name>rendered</name>