From bb4a832c18cb6c8a50372e3bfd908a3ff1b3fd03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 19 Aug 2017 22:34:30 +0200 Subject: [PATCH] Fixed JNDI names + moved converter to proper packages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../basicdata/JobsAdminBusinessDataWebRequestBean.java | 2 +- .../business/basicdata/JobsBusinessDataWebSessionBean.java | 4 ++-- .../employee/JobsAdminCompanyEmployeeWebRequestBean.java | 2 +- .../business/employee/JobsCompanyEmployeeWebRequestBean.java | 2 +- .../contact/phone/JobsAdminContactPhoneWebRequestBean.java | 2 +- .../jjobs/beans/user/JobsAdminUserWebRequestBean.java | 4 ++-- .../user/activity/JobsUserActivityWebApplicationBean.java | 2 +- .../basicdata}/JobsBusinessContactConverter.java | 2 +- .../company_employee/JobsCompanyEmployeeConverter.java | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename src/java/org/mxchange/jjobs/converter/{businesscontact => business/basicdata}/JobsBusinessContactConverter.java (98%) rename src/java/org/mxchange/jjobs/converter/{ => business}/company_employee/JobsCompanyEmployeeConverter.java (95%) 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 c687ae2f..df17c2f2 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsAdminBusinessDataWebRequestBean.java @@ -390,7 +390,7 @@ public class JobsAdminBusinessDataWebRequestBean extends BaseJobsController impl Context context = new InitialContext(); // Try to lookup - this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote"); //NOI18N + this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebSessionBean.java index 77cf7ae1..d4eaa8ce 100644 --- a/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/basicdata/JobsBusinessDataWebSessionBean.java @@ -304,10 +304,10 @@ public class JobsBusinessDataWebSessionBean extends BaseJobsController implement Context context = new InitialContext(); // Try to lookup - this.businessDataBean = (BusinessDataSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N + this.businessDataBean = (BusinessDataSessionBeanRemote) context.lookup("java:global/jjobs-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N // Try to lookup - this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote"); //NOI18N + this.adminBusinessDataBean = (AdminBusinessDataSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminBusinessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataAdminSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); 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 bd5ef8c0..60fd2ecd 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminCompanyEmployeeWebRequestBean.java @@ -64,7 +64,7 @@ public class JobsAdminCompanyEmployeeWebRequestBean extends BaseJobsController i Context context = new InitialContext(); // Try to lookup - this.adminCompanyEmployeeBean = (AdminCompanyEmployeeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote"); //NOI18N + this.adminCompanyEmployeeBean = (AdminCompanyEmployeeSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.AdminCompanyEmployeeSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); 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 7930c801..8929dee7 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsCompanyEmployeeWebRequestBean.java @@ -85,7 +85,7 @@ public class JobsCompanyEmployeeWebRequestBean extends BaseJobsController implem Context context = new InitialContext(); // Try to lookup - this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + this.companyEmployeeBean = (CompanyEmployeeSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminCompanyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); 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 bcb263bd..89df3198 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsAdminContactPhoneWebRequestBean.java @@ -794,7 +794,7 @@ public class JobsAdminContactPhoneWebRequestBean extends BaseJobsController impl Context context = new InitialContext(); // Try to lookup the beans - this.adminContactPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + this.adminContactPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminContactPhone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index ef8fde62..9a68e2d3 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -650,8 +650,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java index 50efcbe3..fc9dc8c7 100644 --- a/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/activity/JobsUserActivityWebApplicationBean.java @@ -558,7 +558,7 @@ public class JobsUserActivityWebApplicationBean extends BaseJobsController imple Context context = new InitialContext(); // Try to lookup - this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N + this.userActivityBean = (UserActivityLogSessionBeanRemote) context.lookup("java:global/jjobs-ejb/userActivity!org.mxchange.jusercore.model.user.activity.UserActivityLogSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/jjobs/converter/businesscontact/JobsBusinessContactConverter.java b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java similarity index 98% rename from src/java/org/mxchange/jjobs/converter/businesscontact/JobsBusinessContactConverter.java rename to src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java index daa143e0..062f765a 100644 --- a/src/java/org/mxchange/jjobs/converter/businesscontact/JobsBusinessContactConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/basicdata/JobsBusinessContactConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jjobs.converter.businesscontact; +package org.mxchange.jjobs.converter.business.basicdata; import java.text.MessageFormat; import javax.faces.component.UIComponent; diff --git a/src/java/org/mxchange/jjobs/converter/company_employee/JobsCompanyEmployeeConverter.java b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java similarity index 95% rename from src/java/org/mxchange/jjobs/converter/company_employee/JobsCompanyEmployeeConverter.java rename to src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java index f4d4ed65..3b1a967c 100644 --- a/src/java/org/mxchange/jjobs/converter/company_employee/JobsCompanyEmployeeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsCompanyEmployeeConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jjobs.converter.company_employee; +package org.mxchange.jjobs.converter.business.company_employee; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -68,7 +68,7 @@ public class JobsCompanyEmployeeConverter implements Converter { Context initialContext = new InitialContext(); // ... and user controller - JobsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + JobsCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jjobs-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N -- 2.39.5