From df259233d5897c5a0ef085c26fc959323e110b24 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 --- .../AddressbookAdminBusinessDataWebRequestBean.java | 2 +- .../AddressbookAdminBusinessDataWebRequestController.java | 2 +- .../basicdata}/AddressbookBusinessDataWebSessionBean.java | 4 ++-- .../AddressbookBusinessDataWebSessionController.java | 2 +- .../AddressbookAdminCompanyEmployeeWebRequestBean.java | 2 +- .../employee/AddressbookCompanyEmployeeWebRequestBean.java | 2 +- .../phone/AddressbookAdminContactPhoneWebRequestBean.java | 2 +- .../beans/user/AddressbookAdminUserWebRequestBean.java | 4 ++-- .../addressbook/beans/user/AddressbookUserWebSessionBean.java | 2 +- .../activity/AddressbookUserActivityWebApplicationBean.java | 2 +- .../AddressbookConfirmationLinkWebRequestBean.java | 2 +- .../basicdata}/AddressbookBusinessContactConverter.java | 2 +- .../company_employee/AddressbookCompanyEmployeeConverter.java | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) rename src/java/org/mxchange/addressbook/beans/{businessdata => business/basicdata}/AddressbookAdminBusinessDataWebRequestBean.java (99%) rename src/java/org/mxchange/addressbook/beans/{businessdata => business/basicdata}/AddressbookAdminBusinessDataWebRequestController.java (94%) rename src/java/org/mxchange/addressbook/beans/{businessdata => business/basicdata}/AddressbookBusinessDataWebSessionBean.java (98%) rename src/java/org/mxchange/addressbook/beans/{businessdata => business/basicdata}/AddressbookBusinessDataWebSessionController.java (94%) rename src/java/org/mxchange/addressbook/converter/{businesscontact => business/basicdata}/AddressbookBusinessContactConverter.java (98%) rename src/java/org/mxchange/addressbook/converter/{ => business}/company_employee/AddressbookCompanyEmployeeConverter.java (96%) diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java similarity index 99% rename from src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java rename to src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java index b82851d9..94c31480 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.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.addressbook.beans.businessdata; +package org.mxchange.addressbook.beans.business.basicdata; import javax.annotation.PostConstruct; import javax.enterprise.context.RequestScoped; diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestController.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestController.java rename to src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestController.java index dbc3d9b0..3e0dccba 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookAdminBusinessDataWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestController.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.addressbook.beans.businessdata; +package org.mxchange.addressbook.beans.business.basicdata; import java.io.Serializable; diff --git a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java rename to src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java index e00cdca1..d817be12 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.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.addressbook.beans.businessdata; +package org.mxchange.addressbook.beans.business.basicdata; import java.util.List; import javax.annotation.PostConstruct; @@ -307,7 +307,7 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro this.businessDataBean = (BusinessDataSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook-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/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionController.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionController.java rename to src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionController.java index b02a65cc..ca46bea6 100644 --- a/src/java/org/mxchange/addressbook/beans/businessdata/AddressbookBusinessDataWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionController.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.addressbook.beans.businessdata; +package org.mxchange.addressbook.beans.business.basicdata; import java.io.Serializable; diff --git a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java index 87f52726..250859f1 100644 --- a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookAdminCompanyEmployeeWebRequestBean.java @@ -64,7 +64,7 @@ public class AddressbookAdminCompanyEmployeeWebRequestBean extends BaseAddressbo 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/addressbook-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/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java index 24ae8e8d..b292995d 100644 --- a/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/business/employee/AddressbookCompanyEmployeeWebRequestBean.java @@ -85,7 +85,7 @@ public class AddressbookCompanyEmployeeWebRequestBean extends BaseAddressbookCon 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/addressbook-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/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java index f70f25a5..58d2a9af 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java @@ -794,7 +794,7 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookC 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/addressbook-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/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java index f27ff9fe..40dc2811 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java @@ -650,8 +650,8 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle 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/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index 7fed770c..23a577c3 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -838,7 +838,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp 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.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java index 9c17a283..7d8407f1 100644 --- a/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/activity/AddressbookUserActivityWebApplicationBean.java @@ -557,7 +557,7 @@ public class AddressbookUserActivityWebApplicationBean extends BaseAddressbookCo 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/addressbook-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/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java index 31e288d8..720f6430 100644 --- a/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/confirmlink/AddressbookConfirmationLinkWebRequestBean.java @@ -132,7 +132,7 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo 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.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/converter/businesscontact/AddressbookBusinessContactConverter.java b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java similarity index 98% rename from src/java/org/mxchange/addressbook/converter/businesscontact/AddressbookBusinessContactConverter.java rename to src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java index d09a21ad..723afd6e 100644 --- a/src/java/org/mxchange/addressbook/converter/businesscontact/AddressbookBusinessContactConverter.java +++ b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.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.addressbook.converter.businesscontact; +package org.mxchange.addressbook.converter.business.basicdata; import java.text.MessageFormat; import javax.faces.component.UIComponent; diff --git a/src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java similarity index 96% rename from src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java rename to src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java index 72132301..10a93662 100644 --- a/src/java/org/mxchange/addressbook/converter/company_employee/AddressbookCompanyEmployeeConverter.java +++ b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.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.addressbook.converter.company_employee; +package org.mxchange.addressbook.converter.business.company_employee; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -68,7 +68,7 @@ public class AddressbookCompanyEmployeeConverter implements Converter { Context initialContext = new InitialContext(); // ... and user controller - AddressbookCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N + AddressbookCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/addressbook-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