From: Roland Häder <roland@mxchange.org>
Date: Sun, 29 Oct 2017 12:42:57 +0000 (+0100)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e51fee515272ded16d316cf739ef53ddac88271f;p=jfinancials-war.git

Please cherry-pick:
- fixed JNDI names for java:module, must be: java:module/<SimpleClassName>

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

diff --git a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
index 913a2a39..73a5b3d6 100644
--- a/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/business/basicdata/FinancialsBusinessDataWebRequestBean.java
@@ -61,7 +61,7 @@ public class FinancialsBusinessDataWebRequestBean extends BaseFinancialsBean imp
 	/**
 	 * List of all basic company data
 	 */
-	private List<BasicData> allBasicData;
+	private final List<BasicData> allBasicData;
 
 	/**
 	 * A list of all registered companies (globally)
diff --git a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
index c88510f8..df40a8c2 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
+import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean;
 import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController;
 
 /**
@@ -52,7 +53,7 @@ public class FinancialsBasicCompanyDataConverter implements Converter<BasicData>
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup("java:module/basicCompanyDataController!org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController"); //NOI18N
+				BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
diff --git a/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java
index 627e1912..04e514c7 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/branchoffice/FinancialsBranchOfficeConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice;
+import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestBean;
 import org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestController;
 
 /**
@@ -52,10 +53,10 @@ public class FinancialsBranchOfficeConverter implements Converter<BranchOffice>
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				BRANCH_OFFICE_CONTROLLER = (FinancialsBranchOfficeWebRequestController) initial.lookup("java:module/branchOfficeController!org.mxchange.jfinancials.beans.business.branchoffice.FinancialsBranchOfficeWebRequestController");
+				BRANCH_OFFICE_CONTROLLER = (FinancialsBranchOfficeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBranchOfficeWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
+				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
 			}
 		}
 
diff --git a/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java b/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java
index a2cb5030..a09d3996 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/department/FinancialsDepartmentConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.department.DepartmentNotFoundException;
 import org.mxchange.jcontactsbusiness.model.department.Department;
+import org.mxchange.jfinancials.beans.business.department.FinancialsDepartmentWebRequestBean;
 import org.mxchange.jfinancials.beans.business.department.FinancialsDepartmentWebRequestController;
 
 /**
@@ -52,7 +53,7 @@ public class FinancialsDepartmentConverter implements Converter<Department> {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				DEPARTMENT_CONTROLLER = (FinancialsDepartmentWebRequestController) initial.lookup("java:module/departmentController!org.mxchange.jfinancials.beans.business.department.FinancialsDepartmentWebRequestController"); //NOI18N
+				DEPARTMENT_CONTROLLER = (FinancialsDepartmentWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsDepartmentWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
diff --git a/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java
index f18ded90..1e30c5c4 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/employee/FinancialsEmployeeConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.employee.Employable;
+import org.mxchange.jfinancials.beans.business.employee.FinancialsEmployeeWebRequestBean;
 import org.mxchange.jfinancials.beans.business.employee.FinancialsEmployeeWebRequestController;
 
 /**
@@ -52,7 +53,7 @@ public class FinancialsEmployeeConverter implements Converter<Employable> {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				EMPLOYEE_CONTROLLER = (FinancialsEmployeeWebRequestController) initial.lookup("java:module/!.FinancialsEmployeeWebRequestController"); //NOI18N
+				EMPLOYEE_CONTROLLER = (FinancialsEmployeeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsEmployeeWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
diff --git a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java
index 7434163c..fc2040e4 100644
--- a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException;
 import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime;
+import org.mxchange.jfinancials.beans.business.opening_time.FinancialsOpeningTimeWebRequestBean;
 import org.mxchange.jfinancials.beans.business.opening_time.FinancialsOpeningTimeWebRequestController;
 
 /**
@@ -41,18 +42,18 @@ public class FinancialsCompanyOpeningTimeConverter implements Converter<OpeningT
 	/**
 	 * Opening time backing bean
 	 */
-	private static FinancialsOpeningTimeWebRequestController DEPARTMENT_CONTROLLER;
+	private static FinancialsOpeningTimeWebRequestController OPENING_TIMES_CONTROLLER;
 
 	@Override
 	public OpeningTime getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the instance there?
-		if (DEPARTMENT_CONTROLLER == null) {
+		if (OPENING_TIMES_CONTROLLER == null) {
 			try {
 				// Not yet, attempt lookup
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				DEPARTMENT_CONTROLLER = (FinancialsOpeningTimeWebRequestController) initial.lookup("java:module/openingTimeController!org.mxchange.jfinancials.beans.business.opening_time.FinancialsOpeningTimeWebRequestController"); //NOI18N
+				OPENING_TIMES_CONTROLLER = (FinancialsOpeningTimeWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsOpeningTimeWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
@@ -76,7 +77,7 @@ public class FinancialsCompanyOpeningTimeConverter implements Converter<OpeningT
 			final Long openingId = Long.valueOf(submittedValue);
 
 			// Try to get user instance from it
-			openingTime = DEPARTMENT_CONTROLLER.findOpeningTimeById(openingId);
+			openingTime = OPENING_TIMES_CONTROLLER.findOpeningTimeById(openingId);
 		} catch (final NumberFormatException ex) {
 			// Throw again
 			throw new ConverterException(ex);
diff --git a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
index 6e8adf10..90afef45 100644
--- a/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/contact/FinancialsContactConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcontacts.model.contact.Contact;
+import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestBean;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
 
 /**
@@ -52,7 +53,7 @@ public class FinancialsContactConverter implements Converter<Contact> {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup("java:module/contactController!org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController");
+				CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName()));
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
index 70171e4d..522a15df 100644
--- a/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/country/FinancialsCountryConverter.java
@@ -28,6 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcountry.exceptions.CountryNotFoundException;
 import org.mxchange.jcountry.model.data.Country;
+import org.mxchange.jfinancials.beans.country.FinancialsCountryWebRequestBean;
 import org.mxchange.jfinancials.beans.country.FinancialsCountryWebRequestController;
 
 /**
@@ -52,10 +53,10 @@ public class FinancialsCountryConverter implements Converter<Country> {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				COUNTRY_CONTROLLER = (FinancialsCountryWebRequestController) initial.lookup("java:module/countryController!org.mxchange.jfinancials.beans.country.FinancialsCountryWebRequestController");
+				COUNTRY_CONTROLLER = (FinancialsCountryWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsCountryWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
+				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
 			}
 		}
 
diff --git a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
index ec77d49b..4a053f09 100644
--- a/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
@@ -26,6 +26,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber;
@@ -52,10 +53,10 @@ public class FinancialsFaxNumberConverter implements Converter<DialableFaxNumber
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup("java:module/phoneController!org.mxchange.jphone.model.phonenumbers.phone.FinancialsPhoneWebRequestController");
+				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
+				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
 			}
 		}
 
diff --git a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
index 467ed152..e5e627b8 100644
--- a/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
@@ -26,6 +26,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber;
@@ -52,10 +53,10 @@ public class FinancialsLandLineNumberConverter implements Converter<DialableLand
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup("java:module/phoneController!org.mxchange.jphone.model.phonenumbers.phone.FinancialsPhoneWebRequestController");
+				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
+				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
 			}
 		}
 
diff --git a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
index 0b6d1d01..35809f49 100644
--- a/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
@@ -26,6 +26,7 @@ import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestBean;
 import org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController;
 import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber;
@@ -52,7 +53,7 @@ public class FinancialsMobileNumberConverter implements Converter<DialableMobile
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup("java:module/phoneController!org.mxchange.jfinancials.beans.phone.FinancialsPhoneWebRequestController");
+				PHONE_CONTROLLER = (FinancialsPhoneWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsPhoneWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
index f349e9c8..db73183b 100644
--- a/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java
@@ -25,6 +25,7 @@ import javax.faces.convert.FacesConverter;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jfinancials.beans.mobileprovider.FinancialsMobileProviderWebRequestBean;
 import org.mxchange.jfinancials.beans.mobileprovider.FinancialsMobileProviderWebRequestController;
 import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException;
 import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider;
@@ -51,10 +52,10 @@ public class FinancialsMobileProviderConverter implements Converter<MobileProvid
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				MOBILE_PROVIDER_CONTROLLER = (FinancialsMobileProviderWebRequestController) initial.lookup("java:module/mobileProviderController!org.mxchange.jfinancials.beans.mobileprovider.FinancialsMobileProviderWebRequestController");
+				MOBILE_PROVIDER_CONTROLLER = (FinancialsMobileProviderWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsMobileProviderWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
-				throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
+				throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex); //NOI18N
 			}
 		}
 
diff --git a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
index b10d1d82..829bd6f7 100644
--- a/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java
@@ -25,6 +25,7 @@ import javax.faces.convert.FacesConverter;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestBean;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
@@ -51,7 +52,7 @@ public class FinancialsUserConverter implements Converter<User> {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup("java:module/userController!org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController");
+				USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName()));
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ConverterException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
index c10dadae..8d34d0cd 100644
--- a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
@@ -26,6 +26,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
+import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean;
 import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController;
 
 /**
@@ -55,7 +56,7 @@ public class FinancialsCompanyNameValidator extends BaseStringValidator {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup("java:module/basicCompanyDataController!org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController"); //NOI18N
+				BASIC_DATA_CONTROLLER = (FinancialsBusinessDataWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsBusinessDataWebRequestBean.class.getSimpleName())); //NOI18N
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
index 36f8cc53..7241549a 100644
--- a/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java
@@ -27,6 +27,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
+import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestBean;
 import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController;
 
 /**
@@ -66,7 +67,7 @@ public class FinancialsEmailAddressValidator extends BaseStringValidator {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup("java:module/contactController!org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController");
+				CONTACT_CONTROLLER = (FinancialsContactWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsContactWebRequestBean.class.getSimpleName()));
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);
diff --git a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
index dbac7b31..8ef3cd9d 100644
--- a/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
+++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java
@@ -26,6 +26,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestBean;
 import org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController;
 
 /**
@@ -55,7 +56,7 @@ public class FinancialsUserIdValidator extends BaseNumberValidator {
 				final Context initial = new InitialContext();
 
 				// Lookup EJB
-				USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup("java:module/userController!org.mxchange.jfinancials.beans.user.FinancialsUserWebRequestController");
+				USER_CONTROLLER = (FinancialsUserWebRequestController) initial.lookup(String.format("java:module/%s", FinancialsUserWebRequestBean.class.getSimpleName()));
 			} catch (final NamingException ex) {
 				// Throw it again
 				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup backing bean", ex.getMessage()), ex);