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/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java
index 77ff94c027f2065c213af5c8c18a20ae8f00d191..066d7964c506d8af0be730878c848e55ca7d02a3 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java
@@ -23,7 +23,7 @@ import javax.enterprise.inject.Any;
 import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
-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 JobsAdminBusinessDataWebRequestBean extends BaseJobsController impl
        /**
         * EJB for administrative purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote")
-       private AdminBusinessDataSessionBeanRemote adminBusinessDataBean;
+       @EJB (lookup = "java:global/jjobs-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 JobsAdminBusinessDataWebRequestBean extends BaseJobsController impl
                // 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/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
index a7b0c9f00c60e74874e5296fa976cbdf65d38874..c740a847fea5fe91cf0aeb5ac572deead7617a66 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebRequestBean.java
@@ -28,9 +28,9 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.inject.Named;
-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.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcountry.model.data.Country;
 import org.mxchange.jjobs.beans.BaseJobsController;
@@ -53,8 +53,8 @@ public class JobsBusinessDataWebRequestBean extends BaseJobsController implement
        /**
         * EJB for administrative basic business data purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote", description = "A stateless session bean for administrative purposes.")
-       private AdminBusinessDataSessionBeanRemote adminBusinessDataBean;
+       @EJB (lookup = "java:global/jjobs-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 JobsBusinessDataWebRequestBean extends BaseJobsController implement
        /**
         * EJB for general basic business data purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote", description = "A stateless session bean for general purposes.")
-       private BusinessDataSessionBeanRemote businessDataBean;
+       @EJB (lookup = "java:global/jjobs-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/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java
index 32d020d30bffd05604e2d6932ce66cb29b4ebfa5..29674be7a7f1bb7ff6b118405b1e994e7abf7c45 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/branchoffice/JobsBranchOfficeWebRequestBean.java
@@ -50,7 +50,7 @@ public class JobsBranchOfficeWebRequestBean extends BaseJobsController implement
        /**
         * EJB for administrative purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.branchoffice.BranchOfficeSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote")
        private BranchOfficeSessionBeanRemote branchOfficeBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java
index dffb8bedd002988becabec8dc6055ec2184409fa..7c19776c21c3c2fb14c17c69b5ce8bc4de7e71f9 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java
@@ -39,7 +39,7 @@ public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsController i
        /**
         * EJB for administrative company employee purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.model.employee.AdminCompanyEmployeeSessionBeanRemote")
        private AdminCompanyEmployeeSessionBeanRemote adminCompanyEmployeeBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java
index 6ddc915d33fd50aebeec128ec996c6db52cc0ece..cfcd1acf3f317e3e511b1f6a47fbdba3f76e620f 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java
@@ -47,7 +47,7 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsController implem
        /**
         * EJB for general company employee purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.model.employee.CompanyEmployeeSessionBeanRemote")
        private CompanyEmployeeSessionBeanRemote companyEmployeeBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
index 9d7a5ec4d4fd8c2902b9df89931be0657145c843..3897d86abf37db317745f513bec825cf6eef6308 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
@@ -79,7 +79,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
        /**
         * Administrative contact EJB
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminContact!org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminContact!org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote")
        private AdminContactSessionBeanRemote adminContactBean;
 
        /**
@@ -100,7 +100,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsController implement
        /**
         * EJB for general contact purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote")
        private ContactSessionBeanRemote contactBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
index e50b85b9659e42c1f579b4920f931371aa3e302c..f9651136cff9481d3d1b4864d9005a6b5bcaadd6 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
@@ -95,7 +95,7 @@ public class JobsContactWebRequestBean extends BaseJobsController implements Job
        /**
         * EJB for general contact purposes
         */
-       @EJB (lookup = "java:global/jjobs-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote")
        private ContactSessionBeanRemote contactBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
index 89811d9fedeffb6405ee1c0e434a649a97ff148d..17b3857eddf95e8a156ee628e530dd6502c56900 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java
@@ -81,7 +81,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl
        /**
         * Administrative EJB for phone number
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminContactPhone!org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote")
        private AdminContactsPhoneSessionBeanRemote adminContactPhoneBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
index ba6f29448a91fc1492dcf5ae984bfeb12d803a9d..9dcd1fed493185dc75fc6292a2ec68f79e399680 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
@@ -63,7 +63,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsController implement
        /**
         * Remote country EJB
         */
-       @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote")
        private CountrySingletonBeanRemote countryBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java
index 925ae794feca9d5ce454134354f516ac00d42201..c00e3b241195ed77abcdde32807e78c6e3eebc95 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebRequestBean.java
@@ -50,7 +50,7 @@ public class JobsCountryWebRequestBean extends BaseJobsController implements Job
        /**
         * Remote country EJB
         */
-       @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/country!org.mxchange.jcountry.model.data.CountrySingletonBeanRemote")
        private CountrySingletonBeanRemote countryBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
index b953a94cb3a573e80e09c86c59c9b60583405a1c..069c63431750c4e78f00db4886ea2479c612099b 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
@@ -52,7 +52,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsController im
        /**
         * Remote EJB for mobile providers (administrative)
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminMobileProvider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminMobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote")
        private AdminMobileProviderSessionBeanRemote adminRemoteBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
index dad65ec0ee12fd7ca3d26bdbd1acd9e4f243bdab..e14b8a0391543d39f4a224980f7e13c9d677b72c 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsMobileProviderWebRequestBean.java
@@ -50,7 +50,7 @@ public class JobsMobileProviderWebRequestBean extends BaseJobsController impleme
        /**
         * Remote EJB for mobile providers (regular)
         */
-       @EJB (lookup = "java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote")
        private MobileProviderSingletonBeanRemote mobileProviderBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
index ce8506039eb088a169ce84336c9b49cd20ab4ee4..3d0adcaf2da1aa968e005a18817f96269ce206e6 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java
@@ -81,7 +81,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements
        /**
         * Remote EJB for phone number (administrative)
         */
-       @EJB (lookup = "java:global/jjobs-ejb/adminPhone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/adminPhone!org.mxchange.jphone.model.phonenumbers.phone.AdminPhoneSessionBeanRemote")
        private AdminPhoneSessionBeanRemote adminPhoneBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
index f23b921b452bd79d0b97e5bacc1e937f6d89e2cb..1793e1efa65dd1421089f4d447b610f4bbfff6e8 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/phone/JobsPhoneWebRequestBean.java
@@ -86,7 +86,7 @@ public class JobsPhoneWebRequestBean extends BaseJobsController implements JobsP
        /**
         * General EJB for phone numbers
         */
-       @EJB (lookup = "java:global/jjobs-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote")
+       @EJB (lookup = "java:global/jjobs-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote")
        private PhoneSessionBeanRemote phoneBean;
 
        /**

diff --git a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
index cde35a52e4ffdf7d8ebfae0e00ddce1fa19100f7..d06504ee11962bfba223a96d92642a10f8268079 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java
@@ -27,7 +27,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
-import org.mxchange.jcontactsbusiness.model.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
 
 /**
@@ -41,7 +41,7 @@ public class JobsBusinessContactConverter implements Converter<BusinessBasicData
        /**
         * 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 JobsBusinessContactConverter implements Converter<BusinessBasicData
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
+                               BASIC_DATA_BEAN = (BasicCompanyDataSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java
index c38a799054887afd97b24a2c001e497119c968f9..4be6d3fc8a57fdb7d072d088d6c3c28b9f409996 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java
@@ -52,7 +52,7 @@ public class JobsCompanyEmployeeConverter implements Converter<Employee> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote");
+                               COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java b/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
index 1a4d4ecbacc66adf19458b837fc0ad39351dbf19..6c2aca22ca5d1f6fe6e544bbb03531eaf7092aab 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
@@ -52,7 +52,7 @@ public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersD
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.headquarters.CompanyHeadquartersSessionBeanRemote");
+                               COMPANY_HEADQUARTERS_BEAN = (CompanyHeadquartersSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/contact/JobsContactConverter.java b/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java
index a6bc0a3821d8c8c76b25aa9225dea3341b1ec0d1..a80cf0530ba99970fab20d32d6a9f1896dbaeb90 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/contact/JobsContactConverter.java
@@ -52,7 +52,7 @@ public class JobsContactConverter implements Converter<Contact> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote");
+                               CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/country/JobsCountryConverter.java b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java
index ce7729fb3e7d102b4eb98d8193e28b74f740ec60..7c28c5cc21221b4dad734f054ebb2c2ee6fcf298 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java
@@ -53,7 +53,7 @@ public class JobsCountryConverter implements Converter<Country> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               COUNTRY_BEAN = (CountrySingletonBeanRemote) initial.lookup("java:global/jjobs-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote");
+                               COUNTRY_BEAN = (CountrySingletonBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/fax/JobsFaxNumberConverter.java b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java
index 701022dbe3dc86624e75967348761431801ef1ae..fdf6542ba4800cc3a9dba8d0b55f2ea2ab99a1e6 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java
@@ -52,7 +52,7 @@ public class JobsFaxNumberConverter implements Converter<DialableFaxNumber> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/landline/JobsLandLineNumberConverter.java b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java
index 3cd3cb1dda5d4366f60553ade23d2464defed64e..fe72af86a4caffdee251832ae3f61cca59ced1d3 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java
@@ -52,7 +52,7 @@ public class JobsLandLineNumberConverter implements Converter<DialableLandLineNu
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/mobile/JobsMobileNumberConverter.java b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
index 1521c727bf430146410ee23a32026e21100954a5..47ba8d280bd718f0b4d27686827df3bab9d23360 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/mobile/JobsMobileNumberConverter.java
@@ -52,7 +52,7 @@ public class JobsMobileNumberConverter implements Converter<DialableMobileNumber
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote");
+                               PHONE_BEAN = (PhoneSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java
index 5336f291b413fca1cf6309de8a0eede919d273e5..7b1423c927621269a4b4a40159760cdc03e6e3db 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/mobileprovider/JobsMobileProviderConverter.java
@@ -52,7 +52,7 @@ public class JobsMobileProviderConverter implements Converter<MobileProvider> {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jjobs-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote");
+                               MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/validator/business/basicdata/JobsCompanyNameValidator.java b/src/java/org/mxchange/jjobs/validator/business/basicdata/JobsCompanyNameValidator.java
index ba6297bdf0c2fa55dd505a10920ab42d0c0d5822..f92341b81f2a2ce8754ede9955ce81d7ea374ea9 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/business/basicdata/JobsCompanyNameValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/business/basicdata/JobsCompanyNameValidator.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 JobsCompanyNameValidator 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 JobsCompanyNameValidator extends BaseStringValidator {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote");
+                               BASIC_DATA_BEAN = (BasicCompanyDataSessionBeanRemote) initial.lookup("java:global/jjobs-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/jjobs/validator/emailaddress/JobsEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java
index 5399f2950086a6bbbd04b2362c71603cab6ee9c6..695cb34b92bcc98eac787686d9b3f5410bfb4226 100644 (file)
--- a/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java
@@ -66,7 +66,7 @@ public class JobsEmailAddressValidator extends BaseStringValidator {
                                final Context initial = new InitialContext();
 
                                // Lookup EJB
-                               CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/jjobs-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote");
+                               CONTACT_BEAN = (ContactSessionBeanRemote) initial.lookup("java:global/jjobs-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>