From e51fee515272ded16d316cf739ef53ddac88271f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 29 Oct 2017 13:42:57 +0100 Subject: [PATCH] Please cherry-pick: - fixed JNDI names for java:module, must be: java:module/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../basicdata/FinancialsBusinessDataWebRequestBean.java | 2 +- .../basicdata/FinancialsBasicCompanyDataConverter.java | 3 ++- .../branchoffice/FinancialsBranchOfficeConverter.java | 5 +++-- .../department/FinancialsDepartmentConverter.java | 3 ++- .../business/employee/FinancialsEmployeeConverter.java | 3 ++- .../FinancialsCompanyOpeningTimeConverter.java | 9 +++++---- .../converter/contact/FinancialsContactConverter.java | 3 ++- .../converter/country/FinancialsCountryConverter.java | 5 +++-- .../converter/fax/FinancialsFaxNumberConverter.java | 5 +++-- .../landline/FinancialsLandLineNumberConverter.java | 5 +++-- .../mobile/FinancialsMobileNumberConverter.java | 3 ++- .../FinancialsMobileProviderConverter.java | 5 +++-- .../converter/user/FinancialsUserConverter.java | 3 ++- .../basicdata/FinancialsCompanyNameValidator.java | 3 ++- .../emailaddress/FinancialsEmailAddressValidator.java | 3 ++- .../validator/user/FinancialsUserIdValidator.java | 3 ++- 16 files changed, 39 insertions(+), 24 deletions(-) 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 allBasicData; + private final List 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 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 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 { 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 { 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 { 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 { 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 { 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); -- 2.39.5