From f388623f8643b99d43a20d3ca6bfd1424d90abf5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 10 Sep 2017 15:47:54 +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 <roland@mxchange.org>
---
.../JobsAdminBusinessDataWebRequestBean.java | 8 ++---
.../JobsBusinessDataWebRequestBean.java | 12 ++++----
.../JobsBranchOfficeWebRequestBean.java | 2 +-
...obsAdminCompanyEmployeeWebRequestBean.java | 2 +-
.../JobsCompanyEmployeeWebRequestBean.java | 2 +-
.../JobsAdminContactWebRequestBean.java | 4 +--
.../contact/JobsContactWebRequestBean.java | 2 +-
.../JobsAdminContactPhoneWebRequestBean.java | 2 +-
.../JobsAdminCountryWebRequestBean.java | 2 +-
.../country/JobsCountryWebRequestBean.java | 2 +-
...JobsAdminMobileProviderWebRequestBean.java | 2 +-
.../JobsMobileProviderWebRequestBean.java | 2 +-
.../phone/JobsAdminPhoneWebRequestBean.java | 2 +-
.../beans/phone/JobsPhoneWebRequestBean.java | 2 +-
.../JobsBusinessContactConverter.java | 6 ++--
.../JobsCompanyEmployeeConverter.java | 2 +-
.../JobsCompanyHeadquartersConverter.java | 2 +-
.../contact/JobsContactConverter.java | 2 +-
.../country/JobsCountryConverter.java | 2 +-
.../converter/fax/JobsFaxNumberConverter.java | 2 +-
.../landline/JobsLandLineNumberConverter.java | 2 +-
.../mobile/JobsMobileNumberConverter.java | 2 +-
.../JobsMobileProviderConverter.java | 2 +-
.../basicdata/JobsCompanyNameValidator.java | 6 ++--
.../JobsEmailAddressValidator.java | 2 +-
web/WEB-INF/widgets.jsf.taglib.xml | 30 +++++++++----------
26 files changed, 53 insertions(+), 53 deletions(-)
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 77ff94c0..066d7964 100644
--- 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 a7b0c9f0..c740a847 100644
--- 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 32d020d3..29674be7 100644
--- 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 dffb8bed..7c19776c 100644
--- 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 6ddc915d..cfcd1acf 100644
--- 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 9d7a5ec4..3897d86a 100644
--- 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 e50b85b9..f9651136 100644
--- 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 89811d9f..17b3857e 100644
--- 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 ba6f2944..9dcd1fed 100644
--- 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 925ae794..c00e3b24 100644
--- 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 b953a94c..069c6343 100644
--- 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 dad65ec0..e14b8a03 100644
--- 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 ce850603..3d0adcaf 100644
--- 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 f23b921b..1793e1ef 100644
--- 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 cde35a52..d06504ee 100644
--- 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 c38a7990..4be6d3fc 100644
--- 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 1a4d4ecb..6c2aca22 100644
--- 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 a6bc0a38..a80cf053 100644
--- 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 ce7729fb..7c28c5cc 100644
--- 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 701022db..fdf6542b 100644
--- 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 3cd3cb1d..fe72af86 100644
--- 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 1521c727..47ba8d28 100644
--- 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 5336f291..7b1423c9 100644
--- 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 ba6297bd..f92341b8 100644
--- 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 5399f295..695cb34b 100644
--- 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 cd547656..07a50788 100644
--- 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>
--
2.39.5