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 913a2a398a257657cf23c645b712c8fd6eb684c0..73a5b3d601a764bade71d05c83ba7e14902efd5f 100644 (file)
--- 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 c88510f8e6664613a9c036a3043e7d4a74473800..df40a8c28b43702ebb216877d163a7f88004e5c0 100644 (file)
--- 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 627e191216f4d1e4f83bbf527f36d1f2ae7df7a4..04e514c7958cc47974eb98723eca4dca1eae3653 100644 (file)
--- 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 a2cb503006027fd95d4295c0da5b22f69b196d51..a09d39962aaecddc0c98955d6a3e7bb364b66b7f 100644 (file)
--- 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 f18ded90413af13504c9e29c2a7eb2416fef2d00..1e30c5c47b38f35ef03f7899944abea9b3e3b266 100644 (file)
--- 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 7434163c67a547ef2fa1210bbdc69f706eeaa04b..fc2040e489e046b32d9ab42d0692a98f9a3e6b87 100644 (file)
--- 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 6e8adf10a552a5cd4de97961ca3115c29215c5ab..90afef45eba2cb418d248c2ac7620adef1ba4543 100644 (file)
--- 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 70171e4d404cccfda79eb9ea1373a0c6118d913b..522a15df1e53c274961d3ad9ba354b751982cfe1 100644 (file)
--- 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 ec77d49b54ad4d3d05ea52117c8e19a9fa344021..4a053f09e7f44f051011c0990df6ccfe3e55890c 100644 (file)
--- 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 467ed1522234afc4415de3b5e6fd5506675c3295..e5e627b8146f75312f519a3baa4c679a8f01693b 100644 (file)
--- 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 0b6d1d01d8e9f24f8442b2ada295f56c2d88ab9d..35809f49bb640821dcad7e439d657f2d31e000e9 100644 (file)
--- 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 f349e9c876c0e8474019071f527c251279df4232..db73183b4188bb158eb46ab67f836ea721965d49 100644 (file)
--- 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 b10d1d82e7bee01ff36fc475b7c5d4596b9842d9..829bd6f75bfbaac48e7983935719066c9595aa0f 100644 (file)
--- 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 c10dadae6cfba0986edd4818f6aaa4117369ac2e..8d34d0cdaa8018b7de3d1806aa0a967e3db8af10 100644 (file)
--- 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 36f8cc533039985b3f2c9a0d37b7f225154c3499..7241549adbf8115b49ecfd28f8ce310da26eb8e3 100644 (file)
--- 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 dbac7b31cd79be437f2e6e857192ef167b9879c1..8ef3cd9dc2360ac3aa2b910e4c32424cdbdbfbd2 100644 (file)
--- 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);